content/renderer/media/media_stream_video_track.cc - Issue 1233033002: MediaStream: Adding VideoTrackRecorder class and unittests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: Thread cleanup and niklase@ comment Created 5 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/media/media_stream_video_track.h ('k') | content/renderer/media/media_stream_video_track_unittest.cc » ('j') | content/renderer/media/video_track_recorder_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_video_track.cc

diff --git a/content/renderer/media/media_stream_video_track.cc b/content/renderer/media/media_stream_video_track.cc

index 4403260538a83c673614aa4936335a8ac7fbe0c4..725218f93ca6ff04a643755bcbbe0aee9f0b5a77 100644

--- a/content/renderer/media/media_stream_video_track.cc

+++ b/content/renderer/media/media_stream_video_track.cc

@@ -167,9 +167,10 @@ MediaStreamVideoTrack::FrameDeliverer::GetBlackFrame(

const scoped_refptr<media::VideoFrame>& reference_frame) {

DCHECK(io_task_runner_->BelongsToCurrentThread());

if (!black_frame_.get() ||

- black_frame_->natural_size() != reference_frame->natural_size())

+ black_frame_->natural_size() != reference_frame->natural_size()) {

black_frame_ =

media::VideoFrame::CreateBlackFrame(reference_frame->natural_size());

+ }

// Wrap |black_frame_| so we get a fresh timestamp we can modify. Frames

// returned from this function may still be in use.