Implicit audio output device selection for getUserMedia.

content/browser/renderer_host/media/audio_input_device_manager.cc

Index: content/browser/renderer_host/media/audio_input_device_manager.cc
diff --git a/content/browser/renderer_host/media/audio_input_device_manager.cc b/content/browser/renderer_host/media/audio_input_device_manager.cc
index b4959567a3179f1db9c045dbed6f5c9a9bdd0c39..f429be11f5d29292a470fb40d6b2df7b068930d6 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager.cc
+++ b/content/browser/renderer_host/media/audio_input_device_manager.cc
@@ -34,7 +34,8 @@ AudioInputDeviceManager::AudioInputDeviceManager(
   StreamDeviceInfo fake_device(MEDIA_DEVICE_AUDIO_CAPTURE,
                                media::AudioManagerBase::kDefaultDeviceName,
                                media::AudioManagerBase::kDefaultDeviceId,
-                               44100, media::CHANNEL_LAYOUT_STEREO, false);
+                               44100, media::CHANNEL_LAYOUT_STEREO,
+                               2048, false);

[Jói, 2013/09/06 14:49:26]

Why 2048?

[no longer working on chromium, 2013/09/06 15:17:37]

nit, use 0 as indicating the value is also fake.

[tommi (sloooow) - chröme, 2013/09/06 16:56:54]

Copied from test code that also used a fake device. Here it doesn't matter
though so changed to 0.

[tommi (sloooow) - chröme, 2013/09/06 16:56:54]

Done.

   fake_device.session_id = kFakeOpenSessionId;
   devices_.push_back(fake_device);
 }
@@ -169,19 +170,37 @@ void AudioInputDeviceManager::OpenOnDeviceThread(
   DCHECK(IsOnDeviceThread());
 
   StreamDeviceInfo out(info.device.type, info.device.name, info.device.id,
-                       0, 0, false);
+                       0, 0, 2048, false);

[no longer working on chromium, 2013/09/06 15:17:37]

ditto

[tommi (sloooow) - chröme, 2013/09/06 16:56:54]

Done.

   out.session_id = session_id;
+
+  MediaStreamDevice::AudioDeviceParameters& input_params = out.device.input;
+
   if (use_fake_device_) {
     // Don't need to query the hardware information if using fake device.
-    out.device.sample_rate = 44100;
-    out.device.channel_layout = media::CHANNEL_LAYOUT_STEREO;
+    input_params.sample_rate = 44100;
+    input_params.channel_layout = media::CHANNEL_LAYOUT_STEREO;
   } else {
     // Get the preferred sample rate and channel configuration for the
     // audio device.
     media::AudioParameters params =
         audio_manager_->GetInputStreamParameters(info.device.id);
-    out.device.sample_rate = params.sample_rate();
-    out.device.channel_layout = params.channel_layout();
+    input_params.sample_rate = params.sample_rate();
+    input_params.channel_layout = params.channel_layout();
+    input_params.frames_per_buffer = params.frames_per_buffer();
+
+    // Add preferred output device information if a matching output device
+    // exists.
+    out.device.matched_output_device_id =
+        audio_manager_->GetAssociatedOutputDeviceID(info.device.id);
+    if (!out.device.matched_output_device_id.empty()) {
+      params = audio_manager_->GetOutputStreamParameters(
+          out.device.matched_output_device_id);
+      MediaStreamDevice::AudioDeviceParameters& matched_output_params =
+          out.device.matched_output;
+      matched_output_params.sample_rate = params.sample_rate();
+      matched_output_params.channel_layout = params.channel_layout();
+      matched_output_params.frames_per_buffer = params.frames_per_buffer();
+    }
   }
 
   // Return the |session_id| through the listener by posting a task on
@@ -206,6 +225,7 @@ void AudioInputDeviceManager::OpenedOnIOThread(int session_id,
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK_EQ(session_id, info.session_id);
   DCHECK(GetDevice(session_id) == devices_.end());
+
   devices_.push_back(info);
 
   if (listener_)