| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "content/common/media/media_stream_messages.h" | 10 #include "content/common/media/media_stream_messages.h" |
| 11 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" | 11 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" |
| 12 #include "content/renderer/render_thread_impl.h" | 12 #include "content/renderer/render_thread_impl.h" |
| 13 #include "media/base/audio_parameters.h" | 13 #include "media/base/audio_parameters.h" |
| 14 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h" | |
| 15 #include "url/origin.h" | 14 #include "url/origin.h" |
| 16 | 15 |
| 17 namespace content { | 16 namespace content { |
| 18 | 17 |
| 19 namespace { | 18 namespace { |
| 20 | 19 |
| 21 bool RemoveStreamDeviceFromArray(const StreamDeviceInfo device_info, | 20 bool RemoveStreamDeviceFromArray(const StreamDeviceInfo device_info, |
| 22 StreamDeviceInfoArray* array) { | 21 StreamDeviceInfoArray* array) { |
| 23 for (StreamDeviceInfoArray::iterator device_it = array->begin(); | 22 for (StreamDeviceInfoArray::iterator device_it = array->begin(); |
| 24 device_it != array->end(); ++device_it) { | 23 device_it != array->end(); ++device_it) { |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 : RenderFrameObserver(render_frame), | 66 : RenderFrameObserver(render_frame), |
| 68 next_ipc_id_(0) { | 67 next_ipc_id_(0) { |
| 69 } | 68 } |
| 70 | 69 |
| 71 MediaStreamDispatcher::~MediaStreamDispatcher() {} | 70 MediaStreamDispatcher::~MediaStreamDispatcher() {} |
| 72 | 71 |
| 73 void MediaStreamDispatcher::GenerateStream( | 72 void MediaStreamDispatcher::GenerateStream( |
| 74 int request_id, | 73 int request_id, |
| 75 const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler, | 74 const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler, |
| 76 const StreamControls& controls, | 75 const StreamControls& controls, |
| 77 const url::Origin& security_origin) { | 76 const url::Origin& security_origin, |
| 77 bool is_processing_user_gesture) { |
| 78 DCHECK(thread_checker_.CalledOnValidThread()); | 78 DCHECK(thread_checker_.CalledOnValidThread()); |
| 79 DVLOG(1) << "MediaStreamDispatcher::GenerateStream(" << request_id << ")"; | 79 DVLOG(1) << "MediaStreamDispatcher::GenerateStream(" << request_id << ")"; |
| 80 | 80 |
| 81 requests_.push_back(Request(event_handler, request_id, next_ipc_id_)); | 81 requests_.push_back(Request(event_handler, request_id, next_ipc_id_)); |
| 82 Send(new MediaStreamHostMsg_GenerateStream( | 82 Send(new MediaStreamHostMsg_GenerateStream(routing_id(), next_ipc_id_++, |
| 83 routing_id(), next_ipc_id_++, controls, security_origin, | 83 controls, security_origin, |
| 84 blink::WebUserGestureIndicator::isProcessingUserGesture())); | 84 is_processing_user_gesture)); |
| 85 } | 85 } |
| 86 | 86 |
| 87 void MediaStreamDispatcher::CancelGenerateStream( | 87 void MediaStreamDispatcher::CancelGenerateStream( |
| 88 int request_id, | 88 int request_id, |
| 89 const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler) { | 89 const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler) { |
| 90 DCHECK(thread_checker_.CalledOnValidThread()); | 90 DCHECK(thread_checker_.CalledOnValidThread()); |
| 91 DVLOG(1) << "MediaStreamDispatcher::CancelGenerateStream" | 91 DVLOG(1) << "MediaStreamDispatcher::CancelGenerateStream" |
| 92 << ", {request_id = " << request_id << "}"; | 92 << ", {request_id = " << request_id << "}"; |
| 93 | 93 |
| 94 RequestList::iterator it = requests_.begin(); | 94 RequestList::iterator it = requests_.begin(); |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 DCHECK(thread_checker_.CalledOnValidThread()); | 350 DCHECK(thread_checker_.CalledOnValidThread()); |
| 351 LabelStreamMap::iterator it = label_stream_map_.find(label); | 351 LabelStreamMap::iterator it = label_stream_map_.find(label); |
| 352 if (it == label_stream_map_.end() || | 352 if (it == label_stream_map_.end() || |
| 353 it->second.video_array.size() <= static_cast<size_t>(index)) { | 353 it->second.video_array.size() <= static_cast<size_t>(index)) { |
| 354 return StreamDeviceInfo::kNoId; | 354 return StreamDeviceInfo::kNoId; |
| 355 } | 355 } |
| 356 return it->second.video_array[index].session_id; | 356 return it->second.video_array[index].session_id; |
| 357 } | 357 } |
| 358 | 358 |
| 359 } // namespace content | 359 } // namespace content |
| OLD | NEW |