diff options
| author | pbos <pbos@webrtc.org> | 2015-10-19 02:39:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-19 09:39:15 +0000 |
| commit | 22993e1a0c114122fc1b9de0fc74d4096ec868bd (patch) | |
| tree | 7512c1e0449b2abd4e8d9ef0051b9f8a6a6728a7 /webrtc/modules/video_coding/codecs/interface/mock | |
| parent | 4306fc70d778887d8a2ea71b6f4bc6a12d1d9447 (diff) | |
| download | webrtc-22993e1a0c114122fc1b9de0fc74d4096ec868bd.tar.gz | |
Unify FrameType and VideoFrameType.
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}
Diffstat (limited to 'webrtc/modules/video_coding/codecs/interface/mock')
| -rw-r--r-- | webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h b/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h index 5710446f16..5243d9afb8 100644 --- a/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h +++ b/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h @@ -35,7 +35,7 @@ class MockVideoEncoder : public VideoEncoder { MOCK_METHOD3(Encode, int32_t(const VideoFrame& inputImage, const CodecSpecificInfo* codecSpecificInfo, - const std::vector<VideoFrameType>* frame_types)); + const std::vector<FrameType>* frame_types)); MOCK_METHOD1(RegisterEncodeCompleteCallback, int32_t(EncodedImageCallback* callback)); MOCK_METHOD0(Release, int32_t()); |