OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/public/renderer/media_stream_utils.h" | 5 #include "content/public/renderer/media_stream_utils.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 } | 36 } |
37 | 37 |
38 blink::WebMediaStreamSource web_media_stream_source; | 38 blink::WebMediaStreamSource web_media_stream_source; |
39 MediaStreamVideoSource* const media_stream_source = | 39 MediaStreamVideoSource* const media_stream_source = |
40 new MediaStreamVideoCapturerSource( | 40 new MediaStreamVideoCapturerSource( |
41 MediaStreamSource::SourceStoppedCallback(), std::move(video_source)); | 41 MediaStreamSource::SourceStoppedCallback(), std::move(video_source)); |
42 const blink::WebString track_id = | 42 const blink::WebString track_id = |
43 blink::WebString::fromUTF8(base::GenerateGUID()); | 43 blink::WebString::fromUTF8(base::GenerateGUID()); |
44 web_media_stream_source.initialize(track_id, | 44 web_media_stream_source.initialize(track_id, |
45 blink::WebMediaStreamSource::TypeVideo, | 45 blink::WebMediaStreamSource::TypeVideo, |
46 track_id, is_remote, is_readonly); | 46 track_id, is_remote); |
47 // Takes ownership of |media_stream_source|. | 47 // Takes ownership of |media_stream_source|. |
48 web_media_stream_source.setExtraData(media_stream_source); | 48 web_media_stream_source.setExtraData(media_stream_source); |
49 | 49 |
50 blink::WebMediaConstraints constraints; | 50 blink::WebMediaConstraints constraints; |
51 constraints.initialize(); | 51 constraints.initialize(); |
52 web_media_stream->addTrack(MediaStreamVideoTrack::CreateVideoTrack( | 52 web_media_stream->addTrack(MediaStreamVideoTrack::CreateVideoTrack( |
53 media_stream_source, constraints, | 53 media_stream_source, constraints, |
54 MediaStreamVideoSource::ConstraintsCallback(), true)); | 54 MediaStreamVideoSource::ConstraintsCallback(), true)); |
55 return true; | 55 return true; |
56 } | 56 } |
(...skipping 18 matching lines...) Expand all Loading... |
75 if (!params.IsValid()) { | 75 if (!params.IsValid()) { |
76 DLOG(ERROR) << "Invalid audio parameters."; | 76 DLOG(ERROR) << "Invalid audio parameters."; |
77 return false; | 77 return false; |
78 } | 78 } |
79 | 79 |
80 blink::WebMediaStreamSource web_media_stream_source; | 80 blink::WebMediaStreamSource web_media_stream_source; |
81 const blink::WebString track_id = | 81 const blink::WebString track_id = |
82 blink::WebString::fromUTF8(base::GenerateGUID()); | 82 blink::WebString::fromUTF8(base::GenerateGUID()); |
83 web_media_stream_source.initialize(track_id, | 83 web_media_stream_source.initialize(track_id, |
84 blink::WebMediaStreamSource::TypeAudio, | 84 blink::WebMediaStreamSource::TypeAudio, |
85 track_id, is_remote, is_readonly); | 85 track_id, is_remote); |
86 | 86 |
87 MediaStreamAudioSource* media_stream_source(new MediaStreamAudioSource( | 87 MediaStreamAudioSource* media_stream_source(new MediaStreamAudioSource( |
88 -1, StreamDeviceInfo(), MediaStreamSource::SourceStoppedCallback(), | 88 -1, StreamDeviceInfo(), MediaStreamSource::SourceStoppedCallback(), |
89 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory())); | 89 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory())); |
90 | 90 |
91 blink::WebMediaConstraints constraints; | 91 blink::WebMediaConstraints constraints; |
92 constraints.initialize(); | 92 constraints.initialize(); |
93 { | 93 { |
94 // TODO(miu): In an upcoming change, a source purposed for passing audio | 94 // TODO(miu): In an upcoming change, a source purposed for passing audio |
95 // directly (i.e., without modification) will replace this "hacky" use of | 95 // directly (i.e., without modification) will replace this "hacky" use of |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 const blink::WebMediaStreamTrack& video_track) { | 130 const blink::WebMediaStreamTrack& video_track) { |
131 if (video_track.isNull()) | 131 if (video_track.isNull()) |
132 return; | 132 return; |
133 MediaStreamVideoSource* const source = | 133 MediaStreamVideoSource* const source = |
134 MediaStreamVideoSource::GetVideoSource(video_track.source()); | 134 MediaStreamVideoSource::GetVideoSource(video_track.source()); |
135 if (source) | 135 if (source) |
136 source->RequestRefreshFrame(); | 136 source->RequestRefreshFrame(); |
137 } | 137 } |
138 | 138 |
139 } // namespace content | 139 } // namespace content |
OLD | NEW |