OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" | 5 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" |
6 | 6 |
7 #include "content/browser/browser_main_loop.h" | 7 #include "content/browser/browser_main_loop.h" |
8 #include "content/common/media/media_stream_messages.h" | 8 #include "content/common/media/media_stream_messages.h" |
9 #include "content/common/media/media_stream_options.h" | 9 #include "content/common/media/media_stream_options.h" |
10 #include "googleurl/src/gurl.h" | 10 #include "googleurl/src/gurl.h" |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
118 | 118 |
119 Send(new MediaStreamMsg_DeviceOpened( | 119 Send(new MediaStreamMsg_DeviceOpened( |
120 request.render_view_id, request.page_request_id, label, video_device)); | 120 request.render_view_id, request.page_request_id, label, video_device)); |
121 } | 121 } |
122 | 122 |
123 bool MediaStreamDispatcherHost::OnMessageReceived( | 123 bool MediaStreamDispatcherHost::OnMessageReceived( |
124 const IPC::Message& message, bool* message_was_ok) { | 124 const IPC::Message& message, bool* message_was_ok) { |
125 bool handled = true; | 125 bool handled = true; |
126 IPC_BEGIN_MESSAGE_MAP_EX(MediaStreamDispatcherHost, message, *message_was_ok) | 126 IPC_BEGIN_MESSAGE_MAP_EX(MediaStreamDispatcherHost, message, *message_was_ok) |
127 IPC_MESSAGE_HANDLER(MediaStreamHostMsg_GenerateStream, OnGenerateStream) | 127 IPC_MESSAGE_HANDLER(MediaStreamHostMsg_GenerateStream, OnGenerateStream) |
128 IPC_MESSAGE_HANDLER(MediaStreamHostMsg_GenerateStreamForDevice, | |
129 OnGenerateStreamForDevice) | |
130 IPC_MESSAGE_HANDLER(MediaStreamHostMsg_CancelGenerateStream, | 128 IPC_MESSAGE_HANDLER(MediaStreamHostMsg_CancelGenerateStream, |
131 OnCancelGenerateStream) | 129 OnCancelGenerateStream) |
132 IPC_MESSAGE_HANDLER(MediaStreamHostMsg_StopGeneratedStream, | 130 IPC_MESSAGE_HANDLER(MediaStreamHostMsg_StopGeneratedStream, |
133 OnStopGeneratedStream) | 131 OnStopGeneratedStream) |
134 IPC_MESSAGE_HANDLER(MediaStreamHostMsg_EnumerateDevices, | 132 IPC_MESSAGE_HANDLER(MediaStreamHostMsg_EnumerateDevices, |
135 OnEnumerateDevices) | 133 OnEnumerateDevices) |
136 IPC_MESSAGE_HANDLER(MediaStreamHostMsg_OpenDevice, | 134 IPC_MESSAGE_HANDLER(MediaStreamHostMsg_OpenDevice, |
137 OnOpenDevice) | 135 OnOpenDevice) |
138 IPC_MESSAGE_UNHANDLED(handled = false) | 136 IPC_MESSAGE_UNHANDLED(handled = false) |
139 IPC_END_MESSAGE_MAP_EX() | 137 IPC_END_MESSAGE_MAP_EX() |
(...skipping 26 matching lines...) Expand all Loading... | |
166 const GURL& security_origin) { | 164 const GURL& security_origin) { |
167 DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream(" | 165 DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream(" |
168 << render_view_id << ", " | 166 << render_view_id << ", " |
169 << page_request_id << ", [" | 167 << page_request_id << ", [" |
170 << " audio:" << components.audio_type | 168 << " audio:" << components.audio_type |
171 << " video:" << components.video_type | 169 << " video:" << components.video_type |
172 << " ], " | 170 << " ], " |
173 << security_origin.spec() << ")"; | 171 << security_origin.spec() << ")"; |
174 | 172 |
175 std::string label; | 173 std::string label; |
176 GetManager()->GenerateStream(this, render_process_id_, render_view_id, | 174 if (components.audio_type == content::MEDIA_TAB_AUDIO_CAPTURE || |
177 components, security_origin, &label); | 175 components.video_type == content::MEDIA_TAB_VIDEO_CAPTURE) { |
176 const std::string& device_id = components.video_device_id; | |
177 DCHECK(!device_id.empty()); | |
178 // 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
| |
179 // with the regular GenerateStream. | |
180 GetManager()->GenerateStreamForDevice( | |
181 this, render_process_id_, render_view_id, | |
182 components, device_id, security_origin, &label); | |
183 } else { | |
184 GetManager()->GenerateStream(this, render_process_id_, render_view_id, | |
185 components, security_origin, &label); | |
186 } | |
178 DCHECK(!label.empty()); | 187 DCHECK(!label.empty()); |
179 streams_[label] = StreamRequest(render_view_id, page_request_id); | 188 streams_[label] = StreamRequest(render_view_id, page_request_id); |
180 } | 189 } |
181 | 190 |
182 void MediaStreamDispatcherHost::OnGenerateStreamForDevice( | 191 void MediaStreamDispatcherHost::OnGenerateStreamForDevice( |
wjia(left Chromium)
2012/10/11 22:13:27
You can remove this handler function since the cor
justinlin
2012/10/12 00:50:22
Done.
| |
183 int render_view_id, | 192 int render_view_id, |
184 int page_request_id, | 193 int page_request_id, |
185 const media_stream::StreamOptions& components, | 194 const media_stream::StreamOptions& components, |
186 const std::string& device_id, | 195 const std::string& device_id, |
187 const GURL& security_origin) { | 196 const GURL& security_origin) { |
188 DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStreamForDevice(" | 197 DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStreamForDevice(" |
189 << render_view_id << ", " | 198 << render_view_id << ", " |
190 << page_request_id << ", [" | 199 << page_request_id << ", [" |
191 << " audio:" << components.audio_type | 200 << " audio:" << components.audio_type |
192 << " video:" << components.video_type | 201 << " video:" << components.video_type |
193 << " ], " | 202 << " ], " |
194 << device_id << ", " | 203 << device_id << ", " |
195 << security_origin.spec() << ")"; | 204 << security_origin.spec() << ")"; |
196 DCHECK(!device_id.empty()); | |
197 | 205 |
198 std::string label; | 206 std::string label; |
199 GetManager()->GenerateStreamForDevice( | |
200 this, render_process_id_, render_view_id, | |
201 components, device_id, security_origin, &label); | |
202 DCHECK(!label.empty()); | 207 DCHECK(!label.empty()); |
203 streams_[label] = StreamRequest(render_view_id, page_request_id); | 208 streams_[label] = StreamRequest(render_view_id, page_request_id); |
204 } | 209 } |
205 | 210 |
206 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id, | 211 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id, |
207 int page_request_id) { | 212 int page_request_id) { |
208 DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream(" | 213 DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream(" |
209 << render_view_id << ", " | 214 << render_view_id << ", " |
210 << page_request_id << ")"; | 215 << page_request_id << ")"; |
211 | 216 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
263 device_id, type, security_origin, &label); | 268 device_id, type, security_origin, &label); |
264 DCHECK(!label.empty()); | 269 DCHECK(!label.empty()); |
265 streams_[label] = StreamRequest(render_view_id, page_request_id); | 270 streams_[label] = StreamRequest(render_view_id, page_request_id); |
266 } | 271 } |
267 | 272 |
268 MediaStreamManager* MediaStreamDispatcherHost::GetManager() { | 273 MediaStreamManager* MediaStreamDispatcherHost::GetManager() { |
269 return BrowserMainLoop::GetMediaStreamManager(); | 274 return BrowserMainLoop::GetMediaStreamManager(); |
270 } | 275 } |
271 | 276 |
272 } // namespace media_stream | 277 } // namespace media_stream |
OLD | NEW |