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

Unified Diff: media/audio/audio_manager_base.cc

Issue 2582703003: Audio output debug recording. (Closed)
Patch Set: Code review. Created 3 years, 11 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/audio/audio_manager_base.cc
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index 670820dc3a6ad0f446d429cd97b4e3a7484f5c67..60b0351f31aa85ff865e23774529aaa7c2a19451 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -84,8 +84,7 @@ AudioManagerBase::AudioManagerBase(
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) {}
@@ -285,8 +284,12 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
base::TimeDelta::FromSeconds(kStreamCloseDelaySeconds);
std::unique_ptr<AudioOutputDispatcher> dispatcher;
if (output_params.format() != AudioParameters::AUDIO_FAKE) {
+ // Using unretained is safe since |output_debug_recording_manager_|
+ // outlives the dispatchers (cleared in Shutdown()).
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_.get())));
o1ka 2017/01/31 11:00:11 Check if |output_debug_recording_manager_| is init
Henrik Grunell 2017/02/08 11:29:37 Yes, done.
} else {
dispatcher = base::MakeUnique<AudioOutputDispatcherImpl>(
this, output_params, output_device_id, kCloseDelay);
@@ -433,6 +436,27 @@ std::unique_ptr<AudioLog> AudioManagerBase::CreateAudioLog(
return audio_log_factory_->CreateAudioLog(component);
}
+void AudioManagerBase::InitializeOutputDebugRecording(
+ CreateAudioFileWriterCallback create_audio_file_writer_callback) {
+ DCHECK(GetTaskRunner()->BelongsToCurrentThread());
+ DCHECK(!output_debug_recording_manager_);
+ output_debug_recording_manager_ =
+ base::MakeUnique<AudioDebugRecordingManager>(
+ create_audio_file_writer_callback, "output", GetTaskRunner());
+}
+
+void AudioManagerBase::EnableOutputDebugRecording(
+ const base::FilePath& base_file_name) {
+ DCHECK(GetTaskRunner()->BelongsToCurrentThread());
+ output_debug_recording_manager_->EnableDebugRecording(base_file_name);
o1ka 2017/01/31 11:00:11 Check if |output_debug_recording_manager_| is init
Henrik Grunell 2017/02/08 11:29:37 Enable() should not be called if Initialize() hasn
+}
+
+void AudioManagerBase::DisableOutputDebugRecording() {
+ DCHECK(GetTaskRunner()->BelongsToCurrentThread());
+ if (output_debug_recording_manager_)
+ output_debug_recording_manager_->DisableDebugRecording();
+}
+
void AudioManagerBase::SetMaxStreamCountForTesting(int max_input,
int max_output) {
max_num_output_streams_ = max_output;

Powered by Google App Engine
This is Rietveld 408576698