OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_video_track.h" | 5 #include "content/renderer/media/media_stream_video_track.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
222 MediaStreamVideoTrack::MediaStreamVideoTrack( | 222 MediaStreamVideoTrack::MediaStreamVideoTrack( |
223 MediaStreamVideoSource* source, | 223 MediaStreamVideoSource* source, |
224 const blink::WebMediaConstraints& constraints, | 224 const blink::WebMediaConstraints& constraints, |
225 const MediaStreamVideoSource::ConstraintsCallback& callback, | 225 const MediaStreamVideoSource::ConstraintsCallback& callback, |
226 bool enabled) | 226 bool enabled) |
227 : MediaStreamTrack(true), | 227 : MediaStreamTrack(true), |
228 frame_deliverer_( | 228 frame_deliverer_( |
229 new MediaStreamVideoTrack::FrameDeliverer(source->io_task_runner(), | 229 new MediaStreamVideoTrack::FrameDeliverer(source->io_task_runner(), |
230 enabled)), | 230 enabled)), |
231 constraints_(constraints), | 231 constraints_(constraints), |
232 source_(source) { | 232 source_(source), |
233 video_capturing_link_secured_(true) { | |
233 DCHECK(!constraints.isNull()); | 234 DCHECK(!constraints.isNull()); |
234 source->AddTrack(this, | 235 source->AddTrack(this, |
235 base::Bind( | 236 base::Bind( |
236 &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, | 237 &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, |
237 frame_deliverer_), | 238 frame_deliverer_), |
238 constraints, callback); | 239 constraints, callback); |
239 } | 240 } |
240 | 241 |
241 MediaStreamVideoTrack::~MediaStreamVideoTrack() { | 242 MediaStreamVideoTrack::~MediaStreamVideoTrack() { |
242 DCHECK(main_render_thread_checker_.CalledOnValidThread()); | 243 DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
281 OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateEnded); | 282 OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateEnded); |
282 } | 283 } |
283 | 284 |
284 void MediaStreamVideoTrack::OnReadyStateChanged( | 285 void MediaStreamVideoTrack::OnReadyStateChanged( |
285 blink::WebMediaStreamSource::ReadyState state) { | 286 blink::WebMediaStreamSource::ReadyState state) { |
286 DCHECK(main_render_thread_checker_.CalledOnValidThread()); | 287 DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
287 for (auto* sink : sinks_) | 288 for (auto* sink : sinks_) |
288 sink->OnReadyStateChanged(state); | 289 sink->OnReadyStateChanged(state); |
289 } | 290 } |
290 | 291 |
292 void MediaStreamVideoTrack::SetVideoSinkSecured(bool is_secure) { | |
293 DCHECK(main_render_thread_checker_.CalledOnValidThread()); | |
294 video_capturing_link_secured_ &= is_secure; | |
miu
2016/04/16 00:05:29
You need to track these booleans individually. Fo
xjz
2016/04/21 23:50:45
Done.
| |
295 if (source_) | |
296 source_->SetCapturingLinkSecured(video_capturing_link_secured_); | |
297 } | |
298 | |
291 } // namespace content | 299 } // namespace content |
OLD | NEW |