Add support for audio input mute detection on all platforms

media/audio/audio_input_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/audio_input_controller.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 565 matching lines @@
     handler_->OnData(this, data.get());
 }
 
 void AudioInputController::DoLogAudioLevels(float level_dbfs,
                                             int microphone_volume_percent) {
 #if defined(AUDIO_POWER_MONITORING)
   DCHECK(task_runner_->BelongsToCurrentThread());
   if (!handler_)
     return;
 
-  std::string log_string = base::StringPrintf(
+  std::string log_string;

[tommi (sloooow) - chröme, 2014/10/15 17:00:48]

nit: move this down to where you need it (where print the audio levels)

[henrika (OOO until Aug 14), 2014/10/16 09:58:00]

Done.

+
+  // Detect if the user has enabled hardware mute by pressing the mute
+  // button in audio settings for the selected microphone.
+  const bool microphone_is_muted = stream_->IsMuted();
+  if (microphone_is_muted) {

[tommi (sloooow) - chröme, 2014/10/15 17:00:48]

nit: you don't really need this variable.

[henrika (OOO until Aug 14), 2014/10/16 09:58:00]

Done.

+    LogMicrophoneMuteResult(MICROPHONE_IS_MUTED);
+    log_string = base::StringPrintf(

[tommi (sloooow) - chröme, 2014/10/15 17:00:48]

no need for StringPrintf

[henrika (OOO until Aug 14), 2014/10/16 09:58:00]

Done.

+        "AIC::OnData: microphone is muted!");
+    handler_->OnLog(this, log_string);
+    // Return early if microphone is muted. No idea adding logs and UMA stats

[tommi (sloooow) - chröme, 2014/10/15 17:00:48]

nit: "No idea" -> "No need to" (etc)

[henrika (OOO until Aug 14), 2014/10/16 09:58:00]

Done.

+    // of audio levels if we know that the micropone is muted.
+    return;
+  } else {

[tommi (sloooow) - chröme, 2014/10/15 17:00:48]

nit: no need for else since there's an early return above

[henrika (OOO until Aug 14), 2014/10/16 09:58:00]

Done.

+    LogMicrophoneMuteResult(MICROPHONE_IS_NOT_MUTED);
+  }
+
+  log_string = base::StringPrintf(
       "AIC::OnData: average audio level=%.2f dBFS", level_dbfs);
   static const float kSilenceThresholdDBFS = -72.24719896f;
   if (level_dbfs < kSilenceThresholdDBFS)
     log_string += " <=> no audio input!";
   handler_->OnLog(this, log_string);
 
   UpdateSilenceState(level_dbfs < kSilenceThresholdDBFS);
 
   UMA_HISTOGRAM_PERCENTAGE("Media.MicrophoneVolume", microphone_volume_percent);
   log_string = base::StringPrintf(
       "AIC::OnData: microphone volume=%d%%", microphone_volume_percent);
   if (microphone_volume_percent < kLowLevelMicrophoneLevelPercent)
     log_string += " <=> low microphone level!";
   handler_->OnLog(this, log_string);
-
-  // Try to detect if the user has enabled hardware mute by pressing the mute
-  // button in audio settings for the selected microphone. The idea here is to
-  // detect when all input samples are zeros but the actual volume slider is
-  // larger than zero. It should correspond to a hardware mute state.
-  if (level_dbfs == -std::numeric_limits<float>::infinity() &&
-      microphone_volume_percent > 0) {
-    LogMicrophoneMuteResult(MICROPHONE_IS_MUTED);
-    log_string = base::StringPrintf(
-        "AIC::OnData: microphone is muted!");
-    handler_->OnLog(this, log_string);
-  } else {
-    LogMicrophoneMuteResult(MICROPHONE_IS_NOT_MUTED);
-  }
 #endif
 }
 
 void AudioInputController::OnError(AudioInputStream* stream) {
   // Handle error on the audio-manager thread.
   task_runner_->PostTask(FROM_HERE, base::Bind(
       &AudioInputController::DoReportError, this));
 }
 
 void AudioInputController::DoStopCloseAndClearStream() {
@@ skipping 42 matching lines @@
 }
 
 void AudioInputController::LogSilenceState(SilenceState value) {
   UMA_HISTOGRAM_ENUMERATION("Media.AudioInputControllerSessionSilenceReport",
                             value,
                             SILENCE_STATE_MAX + 1);
 }
 #endif
 
 }  // namespace media