Index: content/browser/renderer_host/media/media_stream_dispatcher_host.cc |
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc |
index 6c212bac1d697d9f1d974670e940e09312c452f5..fa23bec30bab909cf5df5b908ba46902c210f515 100644 |
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc |
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc |
@@ -125,8 +125,6 @@ bool MediaStreamDispatcherHost::OnMessageReceived( |
bool handled = true; |
IPC_BEGIN_MESSAGE_MAP_EX(MediaStreamDispatcherHost, message, *message_was_ok) |
IPC_MESSAGE_HANDLER(MediaStreamHostMsg_GenerateStream, OnGenerateStream) |
- IPC_MESSAGE_HANDLER(MediaStreamHostMsg_GenerateStreamForDevice, |
- OnGenerateStreamForDevice) |
IPC_MESSAGE_HANDLER(MediaStreamHostMsg_CancelGenerateStream, |
OnCancelGenerateStream) |
IPC_MESSAGE_HANDLER(MediaStreamHostMsg_StopGeneratedStream, |
@@ -173,8 +171,19 @@ void MediaStreamDispatcherHost::OnGenerateStream( |
<< security_origin.spec() << ")"; |
std::string label; |
- GetManager()->GenerateStream(this, render_process_id_, render_view_id, |
- components, security_origin, &label); |
+ if (components.audio_type == content::MEDIA_TAB_AUDIO_CAPTURE || |
+ components.video_type == content::MEDIA_TAB_VIDEO_CAPTURE) { |
+ const std::string& device_id = components.video_device_id; |
+ DCHECK(!device_id.empty()); |
+ // TODO(justinlin): Cleanup/get rid of GenerateStreamForDevice and merge |
miu
2012/10/12 01:10:50
Please remember to file a bug for this.
justinlin
2012/10/12 03:02:31
Done. http://code.google.com/p/chromium/issues/det
|
+ // with the regular GenerateStream. |
+ GetManager()->GenerateStreamForDevice( |
+ this, render_process_id_, render_view_id, |
+ components, device_id, security_origin, &label); |
+ } else { |
+ GetManager()->GenerateStream(this, render_process_id_, render_view_id, |
+ components, security_origin, &label); |
+ } |
DCHECK(!label.empty()); |
streams_[label] = StreamRequest(render_view_id, page_request_id); |
} |
@@ -193,12 +202,8 @@ void MediaStreamDispatcherHost::OnGenerateStreamForDevice( |
<< " ], " |
<< device_id << ", " |
<< security_origin.spec() << ")"; |
- DCHECK(!device_id.empty()); |
std::string label; |
- GetManager()->GenerateStreamForDevice( |
- this, render_process_id_, render_view_id, |
- components, device_id, security_origin, &label); |
DCHECK(!label.empty()); |
streams_[label] = StreamRequest(render_view_id, page_request_id); |
} |