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..e74b249e87c8171e87fcf4576601766dbe4b4c4e 100644 |
--- a/media/audio/audio_manager_base.cc |
+++ b/media/audio/audio_manager_base.cc |
@@ -78,17 +78,22 @@ 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), |
+ create_audio_file_writer_callback_( |
+ std::move(create_audio_file_writer_callback)) { |
+ CHECK(!create_audio_file_writer_callback_.Equals( |
+ CreateAudioFileWriterCallback())); |
+} |
AudioManagerBase::~AudioManagerBase() { |
DCHECK(GetTaskRunner()->BelongsToCurrentThread()); |
@@ -285,8 +290,19 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy( |
base::TimeDelta::FromSeconds(kStreamCloseDelaySeconds); |
std::unique_ptr<AudioOutputDispatcher> dispatcher; |
if (output_params.format() != AudioParameters::AUDIO_FAKE) { |
- dispatcher = base::MakeUnique<AudioOutputResampler>( |
- this, params, output_params, output_device_id, kCloseDelay); |
+ std::unique_ptr<AudioOutputResampler> resampler = |
+ base::MakeUnique<AudioOutputResampler>(this, params, output_params, |
+ output_device_id, kCloseDelay); |
+ output_resamplers_.insert(resampler.get()); |
+ |
+ // Debug recording is enabled if the file name is non-empty. If so, also |
+ // enable it on the new resampler. |
+ if (!debug_recording_base_file_name_.empty()) { |
+ resampler->EnableDebugRecording(GetDebugRecordingFileNameWithExtension( |
+ debug_recording_base_file_name_)); |
+ } |
+ |
+ dispatcher = std::move(resampler); |
} else { |
dispatcher = base::MakeUnique<AudioOutputDispatcherImpl>( |
this, output_params, output_device_id, kCloseDelay); |
@@ -332,6 +348,7 @@ void AudioManagerBase::Shutdown() { |
// Close all output streams. |
output_dispatchers_.clear(); |
+ output_resamplers_.clear(); |
#if defined(OS_MACOSX) |
// On mac, AudioManager runs on the main thread, loop for which stops |
@@ -433,6 +450,33 @@ std::unique_ptr<AudioLog> AudioManagerBase::CreateAudioLog( |
return audio_log_factory_->CreateAudioLog(component); |
} |
+std::unique_ptr<AudioFileWriter> AudioManagerBase::CreateAudioFileWriter( |
+ const AudioParameters& params) { |
+ return create_audio_file_writer_callback_.Run(params); |
+} |
+ |
+void AudioManagerBase::EnableOutputDebugRecording( |
+ const base::FilePath& base_file_name) { |
+ DCHECK(GetTaskRunner()->BelongsToCurrentThread()); |
+ for (auto it : output_resamplers_) { |
+ it->EnableDebugRecording( |
+ GetDebugRecordingFileNameWithExtension(base_file_name)); |
+ } |
+ debug_recording_base_file_name_ = base_file_name; |
+} |
+ |
+void AudioManagerBase::DisableOutputDebugRecording() { |
+ DCHECK(GetTaskRunner()->BelongsToCurrentThread()); |
+ for (auto it : output_resamplers_) |
+ it->DisableDebugRecording(); |
+ debug_recording_base_file_name_.clear(); |
+} |
+ |
+base::FilePath AudioManagerBase::GetDebugRecordingFileNameWithExtension( |
+ const base::FilePath& file_name) { |
+ return file_name.AddExtension("output"); |
+} |
+ |
void AudioManagerBase::SetMaxStreamCountForTesting(int max_input, |
int max_output) { |
max_num_output_streams_ = max_output; |