| 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 5bb18c0772f6616fb463f876e0c6bdb7220794af..0a8a9f6ba3471fc341c40f5ba15f8e1dc0230bf0 100644
|
| --- a/content/renderer/media/webrtc_audio_device_impl.cc
|
| +++ b/content/renderer/media/webrtc_audio_device_impl.cc
|
| @@ -174,11 +174,11 @@ void WebRtcAudioDeviceImpl::Capture(
|
| }
|
| }
|
|
|
| -void WebRtcAudioDeviceImpl::OnDeviceStarted(int device_index) {
|
| - DVLOG(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_);
|
| @@ -406,7 +406,7 @@ int32_t WebRtcAudioDeviceImpl::Init() {
|
| 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
|
|
|