| Index: content/renderer/media/webrtc_audio_device_impl.cc
|
| diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc
|
| index 240ea8974dc811378b494939b588ac78fb4823b8..cd4aaa914922e33515175d452557ff7524799a0c 100644
|
| --- a/content/renderer/media/webrtc_audio_device_impl.cc
|
| +++ b/content/renderer/media/webrtc_audio_device_impl.cc
|
| @@ -173,11 +173,11 @@ void WebRtcAudioDeviceImpl::Capture(
|
| }
|
| }
|
|
|
| -void WebRtcAudioDeviceImpl::OnDeviceStarted(int device_index) {
|
| - VLOG(1) << "OnDeviceStarted (device_index=" << device_index << ")";
|
| - // -1 is an invalid device index. Do nothing if a valid device has
|
| +void WebRtcAudioDeviceImpl::OnDeviceStarted(const std::string& device_id) {
|
| + VLOG(1) << "OnDeviceStarted (device_id=" << device_id << ")";
|
| + // Empty string is an invalid device id. Do nothing if a valid device has
|
| // been started. Otherwise update the |recording_| state to false.
|
| - if (device_index != -1)
|
| + if (!device_id.empty())
|
| return;
|
|
|
| base::AutoLock auto_lock(lock_);
|
| @@ -366,12 +366,12 @@ int32_t WebRtcAudioDeviceImpl::Init() {
|
| input_buffer_size = 440;
|
| output_buffer_size = 440;
|
| }
|
| -#elif defined(OS_LINUX) || defined(OS_OPENBSD)
|
| +#elif defined(OS_LINUX)
|
| if (output_sample_rate != 48000) {
|
| DLOG(ERROR) << "Only 48kHz sample rate is supported on Linux.";
|
| return -1;
|
| }
|
| - input_channels = 1;
|
| + input_channels = 2;
|
| output_channels = 1;
|
|
|
| // Based on tests using the current ALSA implementation in Chrome, we have
|
|
|