Unify FrameType and VideoFrameType.

webrtc/modules/video_coding/main/source/encoded_frame.h

 /*
  *  Copyright (c) 2011 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 50 matching lines @@
     *   Get frame timestamp (90kHz)
     */
     uint32_t TimeStamp() const {return _timeStamp;}
     /**
     *   Get render time in milliseconds
     */
     int64_t RenderTimeMs() const {return _renderTimeMs;}
     /**
     *   Get frame type
     */
-    webrtc::FrameType FrameType() const {return ConvertFrameType(_frameType);}
+    webrtc::FrameType FrameType() const { return _frameType; }
     /**
     *   Get frame rotation
     */
     VideoRotation rotation() const { return _rotation; }
     /**
     *   True if this frame is complete, false otherwise
     */
     bool Complete() const { return _completeFrame; }
     /**
     *   True if there's a frame missing before this frame
     */
     bool MissingFrame() const { return _missingFrame; }
     /**
     *   Payload type of the encoded payload
     */
     uint8_t PayloadType() const { return _payloadType; }
     /**
     *   Get codec specific info.
     *   The returned pointer is only valid as long as the VCMEncodedFrame
     *   is valid. Also, VCMEncodedFrame owns the pointer and will delete
     *   the object.
     */
     const CodecSpecificInfo* CodecSpecific() const {return &_codecSpecificInfo;}
 
     const RTPFragmentationHeader* FragmentationHeader() const;
 
-    static webrtc::FrameType ConvertFrameType(VideoFrameType frameType);
-    static VideoFrameType ConvertFrameType(webrtc::FrameType frameType);
-    static void ConvertFrameTypes(
-        const std::vector<webrtc::FrameType>& frame_types,
-        std::vector<VideoFrameType>* video_frame_types);
-
 protected:
     /**
     * Verifies that current allocated buffer size is larger than or equal to the input size.
     * If the current buffer size is smaller, a new allocation is made and the old buffer data
     * is copied to the new buffer.
     * Buffer size is updated to minimumSize.
     */
     void VerifyAndAllocate(size_t minimumSize);
 
     void Reset();
@@ skipping 10 matching lines @@
 
     // Video rotation is only set along with the last packet for each frame
     // (same as marker bit). This |_rotation_set| is only for debugging purpose
     // to ensure we don't set it twice for a frame.
     bool                          _rotation_set;
 };
 
 }  // namespace webrtc
 
 #endif // WEBRTC_MODULES_VIDEO_CODING_ENCODED_FRAME_H_