Adds more logging for audio input issues.

content/browser/renderer_host/media/audio_input_renderer_host.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 "content/browser/renderer_host/media/audio_input_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/memory/shared_memory.h"
 #include "base/metrics/histogram.h"
 #include "base/numerics/safe_math.h"
@@ skipping 164 matching lines @@
     media::AudioInputController* controller) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // TODO(henrika): See crbug.com/115262 for details on why this method
   // should be implemented.
 }
 
 void AudioInputRendererHost::DoHandleError(
     media::AudioInputController* controller,
     media::AudioInputController::ErrorCode error_code) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  // Log all errors even it is ignored later.
   MediaStreamManager::SendMessageToNativeLog(
       base::StringPrintf("AudioInputController error: %d", error_code));
 
+  // This is a fix for crbug.com/357501. The error can be triggered when closing
+  // the lid on Macs, which causes more problems than it fixes.
+  // Also, in crbug.com/357569, the goal is to remove usage of the error since
+  // it was added to solve a crash on Windows that no longer can be reproduced.
+  if (error_code == media::AudioInputController::NO_DATA_ERROR) {
+    DVLOG(1) << "AudioInputRendererHost@" << this << "::DoHandleError: "
+             << "NO_DATA_ERROR ignored.";
+    return;
+  }
+
   AudioEntry* entry = LookupByController(controller);
   if (!entry)
     return;
 
   audio_log_->OnError(entry->stream_id);
   DeleteEntryOnError(entry, AUDIO_INPUT_CONTROLLER_ERROR);
 }
 
 bool AudioInputRendererHost::OnMessageReceived(const IPC::Message& message,
                                                bool* message_was_ok) {
@@ skipping 32 matching lines @@
   if (media_stream_manager_->audio_input_device_manager()->
       ShouldUseFakeDevice()) {
     audio_params.Reset(
         media::AudioParameters::AUDIO_FAKE,
         config.params.channel_layout(), config.params.channels(), 0,
         config.params.sample_rate(), config.params.bits_per_sample(),
         config.params.frames_per_buffer());
   }
 
   // Check if we have the permission to open the device and which device to use.
-  std::string device_id = media::AudioManagerBase::kDefaultDeviceId;
+  media::AudioDeviceName device_name(
+      media::AudioManagerBase::kDefaultDeviceName,
+      media::AudioManagerBase::kDefaultDeviceId);
   if (audio_params.format() != media::AudioParameters::AUDIO_FAKE) {
     const StreamDeviceInfo* info = media_stream_manager_->
         audio_input_device_manager()->GetOpenedDeviceInfoById(session_id);
     if (!info) {
       SendErrorMessage(stream_id, PERMISSION_DENIED);
       DLOG(WARNING) << "No permission has been granted to input stream with "
                     << "session_id=" << session_id;
       return;
     }
 
-    device_id = info->device.id;
+    device_name.unique_id = info->device.id;

[tommi (sloooow) - chröme, 2014/04/10 20:04:30]

ah, I thought that |device| was of type AudioDeviceName.. I guess there was
little to no benefit in my suggestion then :-/

+    device_name.device_name = info->device.name;
   }
 
   // Create a new AudioEntry structure.
   scoped_ptr<AudioEntry> entry(new AudioEntry());
 
   const uint32 segment_size = (sizeof(media::AudioInputBufferParameters) +
                                audio_params.GetBytesPerBuffer());
   entry->shared_memory_segment_count = config.shared_memory_count;
 
   // Create the shared memory and share it with the renderer process
@@ skipping 12 matching lines @@
                                entry->shared_memory_segment_count));
 
   if (!writer->Init()) {
     SendErrorMessage(stream_id, SYNC_WRITER_INIT_FAILED);
     return;
   }
 
   // If we have successfully created the SyncWriter then assign it to the
   // entry and construct an AudioInputController.
   entry->writer.reset(writer.release());
-  if (WebContentsCaptureUtil::IsWebContentsDeviceId(device_id)) {
+  if (WebContentsCaptureUtil::IsWebContentsDeviceId(device_name.unique_id)) {
     entry->controller = media::AudioInputController::CreateForStream(
         audio_manager_->GetTaskRunner(),
         this,
         WebContentsAudioInputStream::Create(
-            device_id,
+            device_name.unique_id,
             audio_params,
             audio_manager_->GetWorkerTaskRunner(),
             audio_mirroring_manager_),
         entry->writer.get(),
         user_input_monitor_);
   } else {
     // TODO(henrika): replace CreateLowLatency() with Create() as soon
     // as satish has ensured that Speech Input also uses the default low-
     // latency path. See crbug.com/112472 for details.
     entry->controller =
         media::AudioInputController::CreateLowLatency(audio_manager_,
                                                       this,
                                                       audio_params,
-                                                      device_id,
+                                                      device_name.unique_id,
                                                       entry->writer.get(),
                                                       user_input_monitor_);
   }
 
   if (!entry->controller.get()) {
     SendErrorMessage(stream_id, STREAM_CREATE_ERROR);
     return;
   }
 
   // Set the initial AGC state for the audio input stream. Note that, the AGC
   // is only supported in AUDIO_PCM_LOW_LATENCY mode.
   if (config.params.format() == media::AudioParameters::AUDIO_PCM_LOW_LATENCY)
     entry->controller->SetAutomaticGainControl(config.automatic_gain_control);
 
   // Since the controller was created successfully, create an entry and add it
   // to the map.
   entry->stream_id = stream_id;
   audio_entries_.insert(std::make_pair(stream_id, entry.release()));
 
   MediaStreamManager::SendMessageToNativeLog(
-      "Audio input stream created successfully.");
-  audio_log_->OnCreated(stream_id, audio_params, device_id);
+      "Audio input stream created successfully. Device name: " +
+      device_name.device_name);
+  audio_log_->OnCreated(stream_id, audio_params, device_name.unique_id);
 }
 
 void AudioInputRendererHost::OnRecordStream(int stream_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   AudioEntry* entry = LookupById(stream_id);
   if (!entry) {
     SendErrorMessage(stream_id, INVALID_AUDIO_ENTRY);
     return;
   }
@@ skipping 90 matching lines @@
   // TODO(hclam): Implement a faster look up method.
   for (AudioEntryMap::iterator i = audio_entries_.begin();
        i != audio_entries_.end(); ++i) {
     if (controller == i->second->controller.get())
       return i->second;
   }
   return NULL;
 }
 
 }  // namespace content