zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unify FrameType and VideoFrameType.

Browse Source 
Prevents some heap allocation and frame-type conversion since interfaces
mismatch. Also it's less confusing to have one type for this.

BUG=webrtc:5042
R=magjed@webrtc.org, mflodman@webrtc.org, henrik.lundin@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1371043003

Cr-Commit-Position: refs/heads/master@{#10320}
This commit is contained in:
pbos
2015-10-19 02:39:06 -07:00
committed by Commit bot
parent 4306fc70d7
commit 22993e1a0c
63 changed files with 179 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/video_coding/main/source/encoded_frame.h
View File

@ -68,7 +68,7 @@ public:
/**
* Get frame type
*/
webrtc::FrameType FrameType() const {return ConvertFrameType(_frameType);}
webrtc::FrameType FrameType() const { return _frameType; }
/**
* Get frame rotation
*/
@ -95,12 +95,6 @@ public:
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.