Unify FrameType and VideoFrameType.

webrtc/video/encoded_frame_callback_adapter.cc

Index: webrtc/video/encoded_frame_callback_adapter.cc
diff --git a/webrtc/video/encoded_frame_callback_adapter.cc b/webrtc/video/encoded_frame_callback_adapter.cc
index 6726a378103b4bfa208f916b4502b78179dc375a..407801fd0c11745bd2887eff2e86fa9c15e2db74 100644
--- a/webrtc/video/encoded_frame_callback_adapter.cc
+++ b/webrtc/video/encoded_frame_callback_adapter.cc
@@ -27,11 +27,8 @@ int32_t EncodedFrameCallbackAdapter::Encoded(
     const CodecSpecificInfo* codecSpecificInfo,
     const RTPFragmentationHeader* fragmentation) {
   RTC_DCHECK(observer_ != nullptr);
-  FrameType frame_type =
-        VCMEncodedFrame::ConvertFrameType(encodedImage._frameType);
-  const EncodedFrame frame(encodedImage._buffer,
-                           encodedImage._length,
-                           frame_type);
+  const EncodedFrame frame(encodedImage._buffer, encodedImage._length,
+                           encodedImage._frameType);

[stefan-webrtc, 2015/10/01 09:21:20]

DCHECK frame type being of video type. (or maybe we should do it in the callback
in generic_encoder.cc instead?)

[pbos-webrtc, 2015/10/06 15:42:46]

Done (in generic_encoder.cc).

   observer_->EncodedFrameCallback(frame);
   return 0;
 }