Improve logging related to start/stop and failure of audio input streams in Chrome

media/audio/audio_input_controller.cc

Index: media/audio/audio_input_controller.cc
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc
index c49cb34f342a90baf88fa0eac38b70886db84486..d0e7cd6f2e7d31e97d03bb10c18191f69d09a5e4 100644
--- a/media/audio/audio_input_controller.cc
+++ b/media/audio/audio_input_controller.cc
@@ -120,9 +120,13 @@ scoped_refptr<AudioInputController> AudioInputController::Create(
 
   // Create and open a new audio input stream from the existing
   // audio-device thread.
-  if (!controller->task_runner_->PostTask(FROM_HERE,
-          base::Bind(&AudioInputController::DoCreate, controller,
-                     base::Unretained(audio_manager), params, device_id))) {
+  if (!controller->task_runner_->PostTask(
+          FROM_HERE,
+          base::Bind(&AudioInputController::DoCreate,
+                     controller,
+                     base::Unretained(audio_manager),
+                     params,
+                     device_id))) {
     controller = NULL;
   }
 
@@ -151,9 +155,13 @@ scoped_refptr<AudioInputController> AudioInputController::CreateLowLatency(
 
   // Create and open a new audio input stream from the existing
   // audio-device thread. Use the provided audio-input device.
-  if (!controller->task_runner_->PostTask(FROM_HERE,
-          base::Bind(&AudioInputController::DoCreateForLowLatency, controller,
-                     base::Unretained(audio_manager), params, device_id))) {
+  if (!controller->task_runner_->PostTask(
+          FROM_HERE,
+          base::Bind(&AudioInputController::DoCreateForLowLatency,
+                     controller,
+                     base::Unretained(audio_manager),
+                     params,
+                     device_id))) {
     controller = NULL;
   }
 
@@ -220,6 +228,9 @@ void AudioInputController::DoCreate(AudioManager* audio_manager,
                                     const std::string& device_id) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   SCOPED_UMA_HISTOGRAM_TIMER("Media.AudioInputController.CreateTime");
+  if (handler_) {
+    handler_->OnLog(this, "AIC::DoCreate");
+  }
 
 #if defined(AUDIO_POWER_MONITORING)
   // Create the audio (power) level meter given the provided audio parameters.
@@ -253,7 +264,7 @@ void AudioInputController::DoCreateForLowLatency(AudioManager* audio_manager,
 #endif
 
   DoCreate(audio_manager, params, device_id);
-}
+ }

[tommi (sloooow) - chröme, 2014/08/29 11:32:03]

fix

[henrika (OOO until Aug 14), 2014/08/29 12:39:37]

Done.

 
 void AudioInputController::DoCreateForStream(
     AudioInputStream* stream_to_control) {
@@ -315,6 +326,9 @@ void AudioInputController::DoRecord() {
     state_ = RECORDING;
   }
 
+  if (handler_)
+    handler_->OnLog(this, "AIC::DoRecord");
+
   if (no_data_timer_) {
     // Start the data timer. Once |kTimerResetIntervalSeconds| have passed,
     // a callback to FirstCheckForNoData() is made.
@@ -333,6 +347,9 @@ void AudioInputController::DoClose() {
   if (state_ == CLOSED)
     return;
 
+  if (handler_)
+    handler_->OnLog(this, "AIC::DoClose");
+
   // Delete the timer on the same thread that created it.
   no_data_timer_.reset();
 
@@ -400,6 +417,12 @@ void AudioInputController::FirstCheckForNoData() {
   LogCaptureStartupResult(GetDataIsActive() ?
                           CAPTURE_STARTUP_OK :
                           CAPTURE_STARTUP_NO_DATA_CALLBACK);
+  if (handler_) {
+    handler_->OnLog(this,
+                    GetDataIsActive()
+                        ? "AIC::FirstCheckForNoData => data is active"

[tommi (sloooow) - chröme, 2014/08/29 11:32:03]

nit: I think the convention is to have operators at end of the previous line
(see e.g. a couple of lines above).

[henrika (OOO until Aug 14), 2014/08/29 12:39:37]

Actually, it was git cl format which did it ;-)

[tommi (sloooow) - chröme, 2014/08/29 13:12:39]

Ah well, here's an example of where git cl format is going against the
convention.  So, thanks for fixing.

+                        : "AIC::FirstCheckForNoData => data is NOT active");
+  }
   DoCheckForNoData();
 }