Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Unified Diff: content/renderer/media/webrtc_audio_device_impl.cc

Issue 8491044: Link things together and enable the device selection for linux and mac. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: rebase2 Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/webrtc_audio_device_impl.h ('k') | content/renderer/pepper_plugin_delegate_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 bb56b7369ebf0fe8ed0caec88685eed99f815109..6e1e2186763c5bdeab3580a64123e54a1abd89c8 100644
--- a/content/renderer/media/webrtc_audio_device_impl.cc
+++ b/content/renderer/media/webrtc_audio_device_impl.cc
@@ -165,11 +165,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_);
@@ -398,7 +398,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
« no previous file with comments | « content/renderer/media/webrtc_audio_device_impl.h ('k') | content/renderer/pepper_plugin_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698