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/user_media_client_impl.h" | 5 #include "content/renderer/media/user_media_client_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
624 dependency_factory_)); | 624 dependency_factory_)); |
625 webkit_source->setExtraData(audio_source); | 625 webkit_source->setExtraData(audio_source); |
626 } | 626 } |
627 local_sources_.push_back(*webkit_source); | 627 local_sources_.push_back(*webkit_source); |
628 } | 628 } |
629 | 629 |
630 MediaStreamVideoSource* UserMediaClientImpl::CreateVideoSource( | 630 MediaStreamVideoSource* UserMediaClientImpl::CreateVideoSource( |
631 const StreamDeviceInfo& device, | 631 const StreamDeviceInfo& device, |
632 const MediaStreamSource::SourceStoppedCallback& stop_callback) { | 632 const MediaStreamSource::SourceStoppedCallback& stop_callback) { |
633 content::MediaStreamVideoCapturerSource* ret = | 633 content::MediaStreamVideoCapturerSource* ret = |
634 new content::MediaStreamVideoCapturerSource(stop_callback, device); | 634 new content::MediaStreamVideoCapturerSource(stop_callback, device, |
| 635 render_frame()); |
635 return ret; | 636 return ret; |
636 } | 637 } |
637 | 638 |
638 void UserMediaClientImpl::CreateVideoTracks( | 639 void UserMediaClientImpl::CreateVideoTracks( |
639 const StreamDeviceInfoArray& devices, | 640 const StreamDeviceInfoArray& devices, |
640 const blink::WebMediaConstraints& constraints, | 641 const blink::WebMediaConstraints& constraints, |
641 blink::WebVector<blink::WebMediaStreamTrack>* webkit_tracks, | 642 blink::WebVector<blink::WebMediaStreamTrack>* webkit_tracks, |
642 UserMediaRequestInfo* request) { | 643 UserMediaRequestInfo* request) { |
643 DCHECK_EQ(devices.size(), webkit_tracks->size()); | 644 DCHECK_EQ(devices.size(), webkit_tracks->size()); |
644 | 645 |
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1156 return; | 1157 return; |
1157 } | 1158 } |
1158 } | 1159 } |
1159 } | 1160 } |
1160 | 1161 |
1161 bool UserMediaClientImpl::UserMediaRequestInfo::HasPendingSources() const { | 1162 bool UserMediaClientImpl::UserMediaRequestInfo::HasPendingSources() const { |
1162 return !sources_waiting_for_callback_.empty(); | 1163 return !sources_waiting_for_callback_.empty(); |
1163 } | 1164 } |
1164 | 1165 |
1165 } // namespace content | 1166 } // namespace content |
OLD | NEW |