| Index: media/audio/audio_manager_base.cc
|
| diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
|
| index 670820dc3a6ad0f446d429cd97b4e3a7484f5c67..163de14064a7ce4444f7444da71920730253f70b 100644
|
| --- a/media/audio/audio_manager_base.cc
|
| +++ b/media/audio/audio_manager_base.cc
|
| @@ -78,17 +78,21 @@ class AudioManagerBase::CompareByParams {
|
| AudioManagerBase::AudioManagerBase(
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
|
| - AudioLogFactory* audio_log_factory)
|
| + AudioLogFactory* audio_log_factory,
|
| + CreateAudioFileWriterCallback create_audio_file_writer_callback)
|
| : AudioManager(std::move(task_runner), std::move(worker_task_runner)),
|
| max_num_output_streams_(kDefaultMaxOutputStreams),
|
| max_num_input_streams_(kDefaultMaxInputStreams),
|
| num_output_streams_(0),
|
| // TODO(dalecurtis): Switch this to an base::ObserverListThreadSafe, so we
|
| - // don't
|
| - // block the UI thread when swapping devices.
|
| + // don't block the UI thread when swapping devices.
|
| output_listeners_(
|
| base::ObserverList<AudioDeviceListener>::NOTIFY_EXISTING_ONLY),
|
| - audio_log_factory_(audio_log_factory) {}
|
| + audio_log_factory_(audio_log_factory),
|
| + output_debug_recording_manager_(
|
| + std::move(create_audio_file_writer_callback),
|
| + "output",
|
| + GetTaskRunner()) {}
|
|
|
| AudioManagerBase::~AudioManagerBase() {
|
| DCHECK(GetTaskRunner()->BelongsToCurrentThread());
|
| @@ -286,7 +290,9 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
|
| std::unique_ptr<AudioOutputDispatcher> dispatcher;
|
| if (output_params.format() != AudioParameters::AUDIO_FAKE) {
|
| dispatcher = base::MakeUnique<AudioOutputResampler>(
|
| - this, params, output_params, output_device_id, kCloseDelay);
|
| + this, params, output_params, output_device_id, kCloseDelay,
|
| + base::Bind(&AudioDebugRecordingManager::RegisterDebugRecordingSource,
|
| + base::Unretained(&output_debug_recording_manager_)));
|
| } else {
|
| dispatcher = base::MakeUnique<AudioOutputDispatcherImpl>(
|
| this, output_params, output_device_id, kCloseDelay);
|
| @@ -433,6 +439,17 @@ std::unique_ptr<AudioLog> AudioManagerBase::CreateAudioLog(
|
| return audio_log_factory_->CreateAudioLog(component);
|
| }
|
|
|
| +void AudioManagerBase::EnableOutputDebugRecording(
|
| + const base::FilePath& base_file_name) {
|
| + DCHECK(GetTaskRunner()->BelongsToCurrentThread());
|
| + output_debug_recording_manager_.EnableDebugRecording(base_file_name);
|
| +}
|
| +
|
| +void AudioManagerBase::DisableOutputDebugRecording() {
|
| + DCHECK(GetTaskRunner()->BelongsToCurrentThread());
|
| + output_debug_recording_manager_.DisableDebugRecording();
|
| +}
|
| +
|
| void AudioManagerBase::SetMaxStreamCountForTesting(int max_input,
|
| int max_output) {
|
| max_num_output_streams_ = max_output;
|
|
|