| 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 b4579f88571f4a2ba666c1c1d2587e2b9d0cd778..14bd4706fc38d73025068bc3162226fe0e5967d1 100644
|
| --- a/content/browser/renderer_host/media/audio_input_device_manager.cc
|
| +++ b/content/browser/renderer_host/media/audio_input_device_manager.cc
|
| @@ -12,6 +12,8 @@
|
| #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 {
|
|
|
| @@ -154,8 +156,17 @@ void AudioInputDeviceManager::EnumerateOnDeviceThread(
|
| scoped_ptr<StreamDeviceInfoArray> devices(new StreamDeviceInfoArray());
|
| 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.
|
| + int sample_rate =
|
| + media::GetAudioInputHardwareSampleRate(it->unique_id);
|
| + media::ChannelLayout 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
|
|
|