Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/test/fake_encoder.h

Issue 1371043003: Unify FrameType and VideoFrameType. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webrtc/modules/video_coding/main/source/session_info.cc ('K') | « webrtc/test/configurable_frame_size_encoder.cc ('k') | webrtc/test/fake_encoder.cc » ('j') | webrtc/video/encoded_frame_callback_adapter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/test/fake_encoder.h
diff --git a/webrtc/test/fake_encoder.h b/webrtc/test/fake_encoder.h
index 3dce336da67d9879e89e6b324da0800cb9acb005..dc3a1aef508a9b9808b20a2c49be11dccbafd471 100644
--- a/webrtc/test/fake_encoder.h
+++ b/webrtc/test/fake_encoder.h
@@ -33,7 +33,7 @@ class FakeEncoder : public VideoEncoder {
size_t max_payload_size) override;
int32_t Encode(const VideoFrame& input_image,
const CodecSpecificInfo* codec_specific_info,
- const std::vector<VideoFrameType>* frame_types) override;
+ const std::vector<FrameType>* frame_types) override;
int32_t RegisterEncodeCompleteCallback(
EncodedImageCallback* callback) override;
int32_t Release() override;
@@ -74,7 +74,7 @@ class DelayedEncoder : public test::FakeEncoder {
int32_t Encode(const VideoFrame& input_image,
const CodecSpecificInfo* codec_specific_info,
- const std::vector<VideoFrameType>* frame_types) override;
+ const std::vector<FrameType>* frame_types) override;
private:
const int delay_ms_;
« webrtc/modules/video_coding/main/source/session_info.cc ('K') | « webrtc/test/configurable_frame_size_encoder.cc ('k') | webrtc/test/fake_encoder.cc » ('j') | webrtc/video/encoded_frame_callback_adapter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698