| 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 "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "content/renderer/media/video_frame_deliverer.h" | 8 #include "content/renderer/media/video_frame_deliverer.h" |
| 9 #include "media/base/bind_to_current_loop.h" | 9 #include "media/base/bind_to_current_loop.h" |
| 10 | 10 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 if (!enabled_) | 58 if (!enabled_) |
| 59 return; | 59 return; |
| 60 VideoFrameDeliverer::DeliverFrameOnIO(frame, format); | 60 VideoFrameDeliverer::DeliverFrameOnIO(frame, format); |
| 61 } | 61 } |
| 62 | 62 |
| 63 const std::vector<MediaStreamVideoSink*>& sinks() const { return sinks_; } | 63 const std::vector<MediaStreamVideoSink*>& sinks() const { return sinks_; } |
| 64 | 64 |
| 65 protected: | 65 protected: |
| 66 virtual ~FrameDeliverer() { | 66 virtual ~FrameDeliverer() { |
| 67 DCHECK(sinks_.empty()); | 67 DCHECK(sinks_.empty()); |
| 68 DCHECK(thread_checker().CalledOnValidThread()); |
| 68 } | 69 } |
| 69 | 70 |
| 70 void SetEnabledOnIO(bool enabled) { | 71 void SetEnabledOnIO(bool enabled) { |
| 71 DCHECK(io_message_loop()->BelongsToCurrentThread()); | 72 DCHECK(io_message_loop()->BelongsToCurrentThread()); |
| 72 enabled_ = enabled; | 73 enabled_ = enabled; |
| 73 } | 74 } |
| 74 | 75 |
| 75 private: | 76 private: |
| 76 // The below members are used on the main render thread. | 77 // The below members are used on the main render thread. |
| 77 std::vector<MediaStreamVideoSink*> sinks_; | 78 std::vector<MediaStreamVideoSink*> sinks_; |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 constraints_(constraints), | 116 constraints_(constraints), |
| 116 source_(source) { | 117 source_(source) { |
| 117 source->AddTrack(this, | 118 source->AddTrack(this, |
| 118 base::Bind( | 119 base::Bind( |
| 119 &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, | 120 &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, |
| 120 frame_deliverer_), | 121 frame_deliverer_), |
| 121 constraints, callback); | 122 constraints, callback); |
| 122 } | 123 } |
| 123 | 124 |
| 124 MediaStreamVideoTrack::~MediaStreamVideoTrack() { | 125 MediaStreamVideoTrack::~MediaStreamVideoTrack() { |
| 126 DCHECK(thread_checker_.CalledOnValidThread()); |
| 125 Stop(); | 127 Stop(); |
| 126 DVLOG(3) << "~MediaStreamVideoTrack()"; | 128 DVLOG(3) << "~MediaStreamVideoTrack()"; |
| 127 } | 129 } |
| 128 | 130 |
| 129 void MediaStreamVideoTrack::AddSink( | 131 void MediaStreamVideoTrack::AddSink( |
| 130 MediaStreamVideoSink* sink, const VideoCaptureDeliverFrameCB& callback) { | 132 MediaStreamVideoSink* sink, const VideoCaptureDeliverFrameCB& callback) { |
| 131 DCHECK(thread_checker_.CalledOnValidThread()); | 133 DCHECK(thread_checker_.CalledOnValidThread()); |
| 132 frame_deliverer_->AddSink(sink, callback); | 134 frame_deliverer_->AddSink(sink, callback); |
| 133 } | 135 } |
| 134 | 136 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 162 blink::WebMediaStreamSource::ReadyState state) { | 164 blink::WebMediaStreamSource::ReadyState state) { |
| 163 DCHECK(thread_checker_.CalledOnValidThread()); | 165 DCHECK(thread_checker_.CalledOnValidThread()); |
| 164 const std::vector<MediaStreamVideoSink*>& sinks = frame_deliverer_->sinks(); | 166 const std::vector<MediaStreamVideoSink*>& sinks = frame_deliverer_->sinks(); |
| 165 for (std::vector<MediaStreamVideoSink*>::const_iterator it = sinks.begin(); | 167 for (std::vector<MediaStreamVideoSink*>::const_iterator it = sinks.begin(); |
| 166 it != sinks.end(); ++it) { | 168 it != sinks.end(); ++it) { |
| 167 (*it)->OnReadyStateChanged(state); | 169 (*it)->OnReadyStateChanged(state); |
| 168 } | 170 } |
| 169 } | 171 } |
| 170 | 172 |
| 171 } // namespace content | 173 } // namespace content |
| OLD | NEW |