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 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
646 ProcessedLocalAudioSource* source = new ProcessedLocalAudioSource( | 646 ProcessedLocalAudioSource* source = new ProcessedLocalAudioSource( |
647 RenderFrameObserver::routing_id(), device, dependency_factory_); | 647 RenderFrameObserver::routing_id(), device, dependency_factory_); |
648 source->SetSourceConstraints(constraints); | 648 source->SetSourceConstraints(constraints); |
649 return source; | 649 return source; |
650 } | 650 } |
651 | 651 |
652 MediaStreamVideoSource* UserMediaClientImpl::CreateVideoSource( | 652 MediaStreamVideoSource* UserMediaClientImpl::CreateVideoSource( |
653 const StreamDeviceInfo& device, | 653 const StreamDeviceInfo& device, |
654 const MediaStreamSource::SourceStoppedCallback& stop_callback) { | 654 const MediaStreamSource::SourceStoppedCallback& stop_callback) { |
655 content::MediaStreamVideoCapturerSource* ret = | 655 content::MediaStreamVideoCapturerSource* ret = |
656 new content::MediaStreamVideoCapturerSource(stop_callback, device); | 656 new content::MediaStreamVideoCapturerSource(stop_callback, device, |
| 657 render_frame()); |
657 return ret; | 658 return ret; |
658 } | 659 } |
659 | 660 |
660 void UserMediaClientImpl::CreateVideoTracks( | 661 void UserMediaClientImpl::CreateVideoTracks( |
661 const StreamDeviceInfoArray& devices, | 662 const StreamDeviceInfoArray& devices, |
662 const blink::WebMediaConstraints& constraints, | 663 const blink::WebMediaConstraints& constraints, |
663 blink::WebVector<blink::WebMediaStreamTrack>* webkit_tracks, | 664 blink::WebVector<blink::WebMediaStreamTrack>* webkit_tracks, |
664 UserMediaRequestInfo* request) { | 665 UserMediaRequestInfo* request) { |
665 DCHECK_EQ(devices.size(), webkit_tracks->size()); | 666 DCHECK_EQ(devices.size(), webkit_tracks->size()); |
666 | 667 |
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1178 return; | 1179 return; |
1179 } | 1180 } |
1180 } | 1181 } |
1181 } | 1182 } |
1182 | 1183 |
1183 bool UserMediaClientImpl::UserMediaRequestInfo::HasPendingSources() const { | 1184 bool UserMediaClientImpl::UserMediaRequestInfo::HasPendingSources() const { |
1184 return !sources_waiting_for_callback_.empty(); | 1185 return !sources_waiting_for_callback_.empty(); |
1185 } | 1186 } |
1186 | 1187 |
1187 } // namespace content | 1188 } // namespace content |
OLD | NEW |