content/renderer/media/mock_media_stream_video_source.cc - Issue 528783002: Change MediaStreamVideoSource::StartSourceImpl to use VideoCaptureFormat instead of VideoCapturePar…

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/mock_media_stream_video_source.cc

Issue 528783002: Change MediaStreamVideoSource::StartSourceImpl to use VideoCaptureFormat instead of VideoCapturePar… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 6 years, 3 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/mock_media_stream_video_source.h ('k') | content/renderer/media/webrtc/media_stream_remote_video_source.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/mock_media_stream_video_source.cc

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

index 790d1355d0a120306eae2a61f0fc1f58c26fd815..19f7b6f74d1f815817e33c037fffe4fecc562082 100644

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

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

@@ -62,10 +62,10 @@ void MockMediaStreamVideoSource::GetCurrentSupportedFormats(

}

void MockMediaStreamVideoSource::StartSourceImpl(

- const media::VideoCaptureParams& params,

+ const media::VideoCaptureFormat& format,

const VideoCaptureDeliverFrameCB& frame_callback) {

DCHECK(frame_callback_.is_null());

- params_ = params;

+ format_ = format;

attempted_to_start_ = true;

frame_callback_ = frame_callback;

}

@@ -79,7 +79,7 @@ void MockMediaStreamVideoSource::DeliverVideoFrame(

io_message_loop()->PostTask(

FROM_HERE,

base::Bind(&MockMediaStreamVideoSource::DeliverVideoFrameOnIO,

- base::Unretained(this), frame, params_.requested_format,

+ base::Unretained(this), frame, format_,

base::TimeTicks(), frame_callback_));

}