| 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 DCHECK(io_task_runner_->BelongsToCurrentThread()); | 168 DCHECK(io_task_runner_->BelongsToCurrentThread()); |
| 169 if (!black_frame_.get() || | 169 if (!black_frame_.get() || |
| 170 black_frame_->natural_size() != reference_frame->natural_size()) { | 170 black_frame_->natural_size() != reference_frame->natural_size()) { |
| 171 black_frame_ = | 171 black_frame_ = |
| 172 media::VideoFrame::CreateBlackFrame(reference_frame->natural_size()); | 172 media::VideoFrame::CreateBlackFrame(reference_frame->natural_size()); |
| 173 } | 173 } |
| 174 | 174 |
| 175 // Wrap |black_frame_| so we get a fresh timestamp we can modify. Frames | 175 // Wrap |black_frame_| so we get a fresh timestamp we can modify. Frames |
| 176 // returned from this function may still be in use. | 176 // returned from this function may still be in use. |
| 177 scoped_refptr<media::VideoFrame> wrapped_black_frame = | 177 scoped_refptr<media::VideoFrame> wrapped_black_frame = |
| 178 media::VideoFrame::WrapVideoFrame( | 178 media::VideoFrame::WrapVideoFrame(black_frame_, black_frame_->format(), |
| 179 black_frame_, black_frame_->visible_rect(), | 179 black_frame_->visible_rect(), |
| 180 black_frame_->natural_size()); | 180 black_frame_->natural_size()); |
| 181 if (!wrapped_black_frame) | 181 if (!wrapped_black_frame) |
| 182 return nullptr; | 182 return nullptr; |
| 183 wrapped_black_frame->AddDestructionObserver( | 183 wrapped_black_frame->AddDestructionObserver( |
| 184 base::Bind(&ReleaseOriginalFrame, black_frame_)); | 184 base::Bind(&ReleaseOriginalFrame, black_frame_)); |
| 185 | 185 |
| 186 wrapped_black_frame->set_timestamp(reference_frame->timestamp()); | 186 wrapped_black_frame->set_timestamp(reference_frame->timestamp()); |
| 187 base::TimeTicks reference_time; | 187 base::TimeTicks reference_time; |
| 188 if (reference_frame->metadata()->GetTimeTicks( | 188 if (reference_frame->metadata()->GetTimeTicks( |
| 189 media::VideoFrameMetadata::REFERENCE_TIME, &reference_time)) { | 189 media::VideoFrameMetadata::REFERENCE_TIME, &reference_time)) { |
| 190 wrapped_black_frame->metadata()->SetTimeTicks( | 190 wrapped_black_frame->metadata()->SetTimeTicks( |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 } | 275 } |
| 276 | 276 |
| 277 void MediaStreamVideoTrack::OnReadyStateChanged( | 277 void MediaStreamVideoTrack::OnReadyStateChanged( |
| 278 blink::WebMediaStreamSource::ReadyState state) { | 278 blink::WebMediaStreamSource::ReadyState state) { |
| 279 DCHECK(main_render_thread_checker_.CalledOnValidThread()); | 279 DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
| 280 for (auto* sink : sinks_) | 280 for (auto* sink : sinks_) |
| 281 sink->OnReadyStateChanged(state); | 281 sink->OnReadyStateChanged(state); |
| 282 } | 282 } |
| 283 | 283 |
| 284 } // namespace content | 284 } // namespace content |
| OLD | NEW |