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/renderer/media/media_stream_dispatcher.h" | 5 #include "content/renderer/media/media_stream_dispatcher.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/common/media/media_stream_messages.h" | 8 #include "content/common/media/media_stream_messages.h" |
9 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" | 9 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" |
10 #include "content/renderer/render_view_impl.h" | 10 #include "content/renderer/render_view_impl.h" |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 } | 233 } |
234 } | 234 } |
235 } | 235 } |
236 | 236 |
237 void MediaStreamDispatcher::OnDevicesEnumerationFailed(int request_id) { | 237 void MediaStreamDispatcher::OnDevicesEnumerationFailed(int request_id) { |
238 for (RequestList::iterator it = requests_.begin(); | 238 for (RequestList::iterator it = requests_.begin(); |
239 it != requests_.end(); ++it) { | 239 it != requests_.end(); ++it) { |
240 Request& request = *it; | 240 Request& request = *it; |
241 if (request.ipc_request == request_id) { | 241 if (request.ipc_request == request_id) { |
242 if (request.handler) { | 242 if (request.handler) { |
243 request.handler->OnStreamGenerationFailed(request.request_id); | 243 request.handler->OnDevicesEnumerationFailed(request.request_id); |
244 DVLOG(1) << "MediaStreamDispatcher::OnDevicesEnumerationFailed(" | 244 DVLOG(1) << "MediaStreamDispatcher::OnDevicesEnumerationFailed(" |
245 << request.request_id << ")\n"; | 245 << request.request_id << ")\n"; |
246 } | 246 } |
247 requests_.erase(it); | 247 requests_.erase(it); |
248 break; | 248 break; |
249 } | 249 } |
250 } | 250 } |
251 } | 251 } |
252 | 252 |
253 void MediaStreamDispatcher::OnDeviceOpened( | 253 void MediaStreamDispatcher::OnDeviceOpened( |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
311 | 311 |
312 int MediaStreamDispatcher::video_session_id(const std::string& label, | 312 int MediaStreamDispatcher::video_session_id(const std::string& label, |
313 int index) { | 313 int index) { |
314 LabelStreamMap::iterator it = label_stream_map_.find(label); | 314 LabelStreamMap::iterator it = label_stream_map_.find(label); |
315 if (it == label_stream_map_.end()) | 315 if (it == label_stream_map_.end()) |
316 return media_stream::StreamDeviceInfo::kNoId; | 316 return media_stream::StreamDeviceInfo::kNoId; |
317 | 317 |
318 DCHECK_GT(it->second.video_array.size(), static_cast<size_t>(index)); | 318 DCHECK_GT(it->second.video_array.size(), static_cast<size_t>(index)); |
319 return it->second.video_array[index].session_id; | 319 return it->second.video_array[index].session_id; |
320 } | 320 } |
OLD | NEW |