Unify FrameType and VideoFrameType.

webrtc/modules/video_coding/codecs/i420/main/interface/i420.h

 /*
  *  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 32 matching lines @@
 //
 // Input:
 //          - inputImage        : Image to be encoded.
 //          - codecSpecificInfo : Pointer to codec specific data.
 //          - frameType         : Frame type to be sent (Key /Delta).
 //
 // Return value                 : WEBRTC_VIDEO_CODEC_OK if OK.
 //                                <0 - Error
   int Encode(const VideoFrame& inputImage,
              const CodecSpecificInfo* /*codecSpecificInfo*/,
-             const std::vector<VideoFrameType>* /*frame_types*/) override;
+             const std::vector<FrameType>* /*frame_types*/) override;
 
 // Register an encode complete callback object.
 //
 // Input:
 //          - callback         : Callback object which handles encoded images.
 //
 // Return value                : WEBRTC_VIDEO_CODEC_OK if OK, < 0 otherwise.
   int RegisterEncodeCompleteCallback(EncodedImageCallback* callback) override;
 
 // Free encoder memory.
@@ skipping 84 matching lines @@
   VideoFrame _decodedImage;
   int                         _width;
   int                         _height;
   bool                        _inited;
   DecodedImageCallback*       _decodeCompleteCallback;
 };  // class I420Decoder
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_I420_MAIN_INTERFACE_I420_H_