Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: content/renderer/media/media_stream_video_track.cc

Issue 1233033002: MediaStream: Adding VideoTrackRecorder class and unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved |track_index| and timestamp mgmt from VideoTrackRecorder into WebmMuxer Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 enabled_ ? frame : GetBlackFrame(frame); 160 enabled_ ? frame : GetBlackFrame(frame);
161 for (const auto& entry : callbacks_) 161 for (const auto& entry : callbacks_)
162 entry.second.Run(video_frame, estimated_capture_time); 162 entry.second.Run(video_frame, estimated_capture_time);
163 } 163 }
164 164
165 scoped_refptr<media::VideoFrame> 165 scoped_refptr<media::VideoFrame>
166 MediaStreamVideoTrack::FrameDeliverer::GetBlackFrame( 166 MediaStreamVideoTrack::FrameDeliverer::GetBlackFrame(
167 const scoped_refptr<media::VideoFrame>& reference_frame) { 167 const scoped_refptr<media::VideoFrame>& reference_frame) {
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 // 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
175 // returned from this function may still be in use. 176 // returned from this function may still be in use.
176 scoped_refptr<media::VideoFrame> wrapped_black_frame = 177 scoped_refptr<media::VideoFrame> wrapped_black_frame =
177 media::VideoFrame::WrapVideoFrame( 178 media::VideoFrame::WrapVideoFrame(
178 black_frame_, black_frame_->visible_rect(), 179 black_frame_, black_frame_->visible_rect(),
179 black_frame_->natural_size()); 180 black_frame_->natural_size());
180 wrapped_black_frame->AddDestructionObserver( 181 wrapped_black_frame->AddDestructionObserver(
181 base::Bind(&ReleaseOriginalFrame, black_frame_)); 182 base::Bind(&ReleaseOriginalFrame, black_frame_));
182 183
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 } 266 }
266 267
267 void MediaStreamVideoTrack::OnReadyStateChanged( 268 void MediaStreamVideoTrack::OnReadyStateChanged(
268 blink::WebMediaStreamSource::ReadyState state) { 269 blink::WebMediaStreamSource::ReadyState state) {
269 DCHECK(main_render_thread_checker_.CalledOnValidThread()); 270 DCHECK(main_render_thread_checker_.CalledOnValidThread());
270 for (auto* sink : sinks_) 271 for (auto* sink : sinks_)
271 sink->OnReadyStateChanged(state); 272 sink->OnReadyStateChanged(state);
272 } 273 }
273 274
274 } // namespace content 275 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698