Chromium Code Reviews| 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 0781d069d742d3f0b7d831c8c083ffc198b8b324..b9306c32b3797785ae2cce687ecd53f23a9bdf56 100644 |
| --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc |
| +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc |
| @@ -125,6 +125,8 @@ 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, |
| @@ -164,10 +166,10 @@ void MediaStreamDispatcherHost::OnGenerateStream( |
| const GURL& security_origin) { |
| DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream(" |
| << render_view_id << ", " |
| - << page_request_id << ", [ " |
| - << (components.audio ? "audio " : "") |
| - << (components.video ? "video " : "") |
| - << "], " |
| + << page_request_id << ", [" |
| + << " audio:" << components.audio_type |
| + << " video:" << components.video_type |
| + << " ], " |
| << security_origin.spec() << ")"; |
| std::string label; |
| @@ -177,6 +179,29 @@ void MediaStreamDispatcherHost::OnGenerateStream( |
| streams_[label] = StreamRequest(render_view_id, page_request_id); |
| } |
| +void MediaStreamDispatcherHost::OnGenerateStreamForDevice( |
| + int render_view_id, |
| + int page_request_id, |
| + const media_stream::StreamOptions& components, |
| + const std::string& device_id, |
|
no longer working on chromium
2012/09/10 09:11:04
add a DCHECK to make sure device_id is not empty?
miu
2012/09/10 21:24:38
Done.
|
| + const GURL& security_origin) { |
| + DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStreamForDevice(" |
| + << render_view_id << ", " |
| + << page_request_id << ", [" |
| + << " audio:" << components.audio_type |
| + << " video:" << components.video_type |
| + << " ], " |
| + << device_id << ", " |
| + << security_origin.spec() << ")"; |
| + |
| + std::string label; |
| + GetManager()->GenerateStreamForDevice( |
|
no longer working on chromium
2012/09/10 09:11:04
why not have the GenerateStreamForDevice return a
miu
2012/09/10 21:24:38
Google C++ style discourages returning non-POD typ
|
| + 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); |
| +} |
| + |
| void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id, |
| int page_request_id) { |
| DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream(" |