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

Unified Diff: media/cast/test/fake_media_source.h

Issue 2113783002: Refactoring: Merge VideoSenderConfig and AudioSenderConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed mek's comment. Created 4 years, 5 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
« no previous file with comments | « media/cast/test/end2end_unittest.cc ('k') | media/cast/test/fake_media_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/test/fake_media_source.h
diff --git a/media/cast/test/fake_media_source.h b/media/cast/test/fake_media_source.h
index 8fb9fab518f1d9b674e01b143bb087bf7f2ba118..f8affbd70f5911cef28624297a6da88f769ed89a 100644
--- a/media/cast/test/fake_media_source.h
+++ b/media/cast/test/fake_media_source.h
@@ -55,8 +55,8 @@ class FakeMediaSource : public media::AudioConverter::InputCallback {
// |keep_frames| is true if all VideoFrames are saved in a queue.
FakeMediaSource(scoped_refptr<base::SingleThreadTaskRunner> task_runner,
base::TickClock* clock,
- const AudioSenderConfig& audio_config,
- const VideoSenderConfig& video_config,
+ const FrameSenderConfig& audio_config,
+ const FrameSenderConfig& video_config,
bool keep_frames);
~FakeMediaSource() final;
@@ -71,7 +71,7 @@ class FakeMediaSource : public media::AudioConverter::InputCallback {
void Start(scoped_refptr<AudioFrameInput> audio_frame_input,
scoped_refptr<VideoFrameInput> video_frame_input);
- const VideoSenderConfig& get_video_config() const { return video_config_; }
+ const FrameSenderConfig& get_video_config() const { return video_config_; }
scoped_refptr<media::VideoFrame> PopOldestInsertedVideoFrame();
@@ -118,7 +118,7 @@ class FakeMediaSource : public media::AudioConverter::InputCallback {
const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
const media::AudioParameters output_audio_params_;
- const VideoSenderConfig video_config_;
+ const FrameSenderConfig video_config_;
const bool keep_frames_;
bool variable_frame_size_mode_;
gfx::Size current_frame_size_;
« no previous file with comments | « media/cast/test/end2end_unittest.cc ('k') | media/cast/test/fake_media_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698