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

Unified Diff: media/base/audio_renderer_mixer_unittest.cc

Issue 2067863003: Mixing audio with different latency requirements (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Unit tests, cleanup Created 4 years, 6 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
Index: media/base/audio_renderer_mixer_unittest.cc
diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc
index 7af2b829b068cc298b6e2b830887f900d4469e97..af6aa4a399231f5f2b81b60426482c576a73091d 100644
--- a/media/base/audio_renderer_mixer_unittest.cc
+++ b/media/base/audio_renderer_mixer_unittest.cc
@@ -74,7 +74,8 @@ class AudioRendererMixerTest
EXPECT_CALL(*sink_.get(), Start());
EXPECT_CALL(*sink_.get(), Stop());
- mixer_.reset(new AudioRendererMixer(output_parameters_, sink_));
+ mixer_.reset(
+ new AudioRendererMixer(output_parameters_, sink_, std::string()));
mixer_callback_ = sink_->callback();
audio_bus_ = AudioBus::Create(output_parameters_);
@@ -88,17 +89,14 @@ class AudioRendererMixerTest
AudioRendererMixer* GetMixer(int owner_id,
const AudioParameters& params,
+ AudioLatency::LatencyType latency,
const std::string& device_id,
const url::Origin& security_origin,
OutputDeviceStatus* device_status) final {
return mixer_.get();
};
- MOCK_METHOD4(ReturnMixer,
- void(int,
- const AudioParameters&,
- const std::string&,
- const url::Origin&));
+ MOCK_METHOD1(ReturnMixer, void(const AudioRendererMixer*));
MOCK_METHOD4(
GetOutputDeviceInfo,
@@ -333,7 +331,7 @@ class AudioRendererMixerTest
return new AudioRendererMixerInput(
this,
// Zero frame id, default device ID and security origin.
- 0, std::string(), url::Origin());
+ 0, std::string(), url::Origin(), AudioLatency::LATENCY_PLAYBACK);
}
protected:

Powered by Google App Engine
This is Rietveld 408576698