Unify FrameType and VideoFrameType.

webrtc/modules/video_coding/codecs/i420/main/source/i420.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 56 matching lines @@
   _encodedImage._size = newSize;
   _encodedImage._buffer = newBuffer;
 
   // If no memory allocation, no point to init.
   _inited = true;
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 int I420Encoder::Encode(const VideoFrame& inputImage,
                         const CodecSpecificInfo* /*codecSpecificInfo*/,
-                        const std::vector<VideoFrameType>* /*frame_types*/) {
+                        const std::vector<FrameType>* /*frame_types*/) {
   if (!_inited) {
     return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
   }
   if (_encodedCompleteCallback == NULL) {
     return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
   }
 
   _encodedImage._frameType = kKeyFrame;
   _encodedImage._timeStamp = inputImage.timestamp();
   _encodedImage._encodedHeight = inputImage.height();
@@ skipping 143 matching lines @@
     DecodedImageCallback* callback) {
   _decodeCompleteCallback = callback;
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 int I420Decoder::Release() {
   _inited = false;
   return WEBRTC_VIDEO_CODEC_OK;
 }
 }  // namespace webrtc