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

Unified Diff: media/audio/audio_input_controller.cc

Issue 2531333005: Unit tests of AudioInputRendererHost. Some cleanups. (Closed)
Patch Set: Small comments describing tests. Created 4 years 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/audio/audio_input_controller.h ('k') | media/audio/test_audio_input_controller_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_input_controller.cc
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc
index 6391c9e10b2a6b30be28d8ce6d99952ac7a1a9ee..6bef6873d6ed8ba16cebc1f971ee5f76a88d4f8e 100644
--- a/media/audio/audio_input_controller.cc
+++ b/media/audio/audio_input_controller.cc
@@ -128,9 +128,11 @@ scoped_refptr<AudioInputController> AudioInputController::Create(
return nullptr;
if (factory_) {
- return factory_->Create(
- audio_manager, event_handler, params, user_input_monitor);
+ return factory_->Create(audio_manager->GetTaskRunner(),
+ /*sync_writer*/ nullptr, audio_manager,
+ event_handler, params, user_input_monitor);
}
+
scoped_refptr<AudioInputController> controller(new AudioInputController(
event_handler, nullptr, nullptr, user_input_monitor, false));
@@ -167,6 +169,12 @@ scoped_refptr<AudioInputController> AudioInputController::CreateLowLatency(
if (!params.IsValid() || (params.channels() > kMaxInputChannels))
return nullptr;
+ if (factory_) {
+ return factory_->Create(audio_manager->GetTaskRunner(), sync_writer,
+ audio_manager, event_handler, params,
+ user_input_monitor);
+ }
+
// Create the AudioInputController object and ensure that it runs on
// the audio-manager thread.
scoped_refptr<AudioInputController> controller(new AudioInputController(
@@ -200,6 +208,12 @@ scoped_refptr<AudioInputController> AudioInputController::CreateForStream(
DCHECK(sync_writer);
DCHECK(stream);
+ if (factory_) {
+ return factory_->Create(
+ task_runner, sync_writer, AudioManager::Get(), event_handler,
+ media::AudioParameters::UnavailableDeviceParams(), user_input_monitor);
+ }
+
// Create the AudioInputController object and ensure that it runs on
// the audio-manager thread.
scoped_refptr<AudioInputController> controller(new AudioInputController(
« no previous file with comments | « media/audio/audio_input_controller.h ('k') | media/audio/test_audio_input_controller_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698