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

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

Issue 9705056: PepperPlatformAudioInputImpl: support audio input device selection. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync&resolve again Created 8 years, 9 months 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 | « no previous file | content/renderer/pepper/pepper_platform_audio_input_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_dispatcher.cc
diff --git a/content/renderer/media/media_stream_dispatcher.cc b/content/renderer/media/media_stream_dispatcher.cc
index e87c2e261ef7953733f567146bf186f2863bbf66..254740a6c31ee0013f48993d2ffe18230d08c7ff 100644
--- a/content/renderer/media/media_stream_dispatcher.cc
+++ b/content/renderer/media/media_stream_dispatcher.cc
@@ -233,7 +233,12 @@ void MediaStreamDispatcher::OnDeviceOpened(
if (request.ipc_request == request_id) {
Stream new_stream;
new_stream.handler = request.handler;
- new_stream.video_array.push_back(device_info);
+ if (device_info.stream_type ==
+ content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE) {
+ new_stream.video_array.push_back(device_info);
+ } else {
+ new_stream.audio_array.push_back(device_info);
+ }
label_stream_map_[label] = new_stream;
request.handler->OnDeviceOpened(request.request_id, label,
device_info);
« no previous file with comments | « no previous file | content/renderer/pepper/pepper_platform_audio_input_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698