Ensures that WebRTC works for device selection using a different sample rate than default

content/browser/renderer_host/media/audio_input_device_manager.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_device_manager.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager_event_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/media_stream_request.h"
 #include "media/audio/audio_device_name.h"
 #include "media/audio/audio_input_ipc.h"
 #include "media/audio/audio_manager_base.h"
+#include "media/audio/audio_util.h"
+#include "media/base/channel_layout.h"
 
 namespace content {
 
 const int AudioInputDeviceManager::kFakeOpenSessionId = 1;
 
 namespace {
 // Starting id for the first capture session.
 const int kFirstSessionId = AudioInputDeviceManager::kFakeOpenSessionId + 1;
 }
 
@@ skipping 120 matching lines @@
       // BrowserMainloop.
       audio_manager_->GetAudioInputDeviceNames(&device_names);
       break;
 
     default:
       NOTREACHED();
       break;
   }
 
   scoped_ptr<StreamDeviceInfoArray> devices(new StreamDeviceInfoArray());
+  int sample_rate = 0;

[tommi (sloooow) - chröme, 2013/01/15 17:43:49]

define these two variables where they are used

[henrika (OOO until Aug 14), 2013/01/16 16:37:17]

Done.

+  media::ChannelLayout channel_layout = media::CHANNEL_LAYOUT_NONE;
   for (media::AudioDeviceNames::iterator it = device_names.begin();
        it != device_names.end(); ++it) {
+    // Get the preferred sample rate and channel configuration for the
+    // current audio device.
+    sample_rate =
+        media::GetAudioInputHardwareSampleRate(it->unique_id);
+    channel_layout =
+        media::GetAudioInputHardwareChannelLayout(it->unique_id);
+
+    // Add device information to device vector.
     devices->push_back(StreamDeviceInfo(
-        stream_type, it->device_name, it->unique_id, false));
+        stream_type, it->device_name, it->unique_id, sample_rate,
+        channel_layout, false));
   }
 
   // Return the device list through the listener by posting a task on
   // IO thread since MediaStreamManager handles the callback asynchronously.
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&AudioInputDeviceManager::DevicesEnumeratedOnIOThread,
                  this, stream_type, base::Passed(&devices)));
 }
@@ skipping 31 matching lines @@
                           FROM_HERE,
                           base::Bind(&AudioInputDeviceManager::ClosedOnIOThread,
                                      this, stream_type, session_id));
 }
 
 void AudioInputDeviceManager::DevicesEnumeratedOnIOThread(
     MediaStreamType stream_type,
     scoped_ptr<StreamDeviceInfoArray> devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Ensure that |devices| gets deleted on exit.
-  if (listener_)
+  if (listener_) {

[tommi (sloooow) - chröme, 2013/01/15 17:43:49]

nit: revert this change (it's not consistent with the rest of the file)

[henrika (OOO until Aug 14), 2013/01/16 16:37:17]

Done.

     listener_->DevicesEnumerated(stream_type, *devices);
+  }
 }
 
 void AudioInputDeviceManager::OpenedOnIOThread(MediaStreamType stream_type,
                                                int session_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (listener_)
     listener_->Opened(stream_type, session_id);
 }
 
 void AudioInputDeviceManager::ClosedOnIOThread(MediaStreamType stream_type,
                                                int session_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (listener_)
     listener_->Closed(stream_type, session_id);
 }
 
 bool AudioInputDeviceManager::IsOnDeviceThread() const {
   return device_loop_->BelongsToCurrentThread();
 }
 
 }  // namespace content