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

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

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/fake_media_source.h ('k') | media/cast/test/sender.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.cc
diff --git a/media/cast/test/fake_media_source.cc b/media/cast/test/fake_media_source.cc
index d038eda6908053c8fa2a6d2fcda520412be6d56c..006b12baa43d98cdf388a0e2befdb97a528b950f 100644
--- a/media/cast/test/fake_media_source.cc
+++ b/media/cast/test/fake_media_source.cc
@@ -76,15 +76,15 @@ namespace cast {
FakeMediaSource::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)
: task_runner_(task_runner),
output_audio_params_(AudioParameters::AUDIO_PCM_LINEAR,
media::GuessChannelLayout(audio_config.channels),
- audio_config.frequency,
+ audio_config.rtp_timebase,
32,
- audio_config.frequency / kAudioPacketsPerSecond),
+ audio_config.rtp_timebase / kAudioPacketsPerSecond),
video_config_(video_config),
keep_frames_(keep_frames),
variable_frame_size_mode_(false),
@@ -102,10 +102,9 @@ FakeMediaSource::FakeMediaSource(
video_first_pts_set_(false),
weak_factory_(this) {
CHECK(output_audio_params_.IsValid());
- audio_bus_factory_.reset(new TestAudioBusFactory(audio_config.channels,
- audio_config.frequency,
- kSoundFrequency,
- kSoundVolume));
+ audio_bus_factory_.reset(
+ new TestAudioBusFactory(audio_config.channels, audio_config.rtp_timebase,
+ kSoundFrequency, kSoundVolume));
}
FakeMediaSource::~FakeMediaSource() {
« no previous file with comments | « media/cast/test/fake_media_source.h ('k') | media/cast/test/sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698