content/renderer/media/mock_media_stream_video_source.h - 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.h

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/media_stream_video_source_unittest.cc ('k') | content/renderer/media/mock_media_stream_video_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/mock_media_stream_video_source.h

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

index 867201409af8aeadcfe06082b9ada8acc37442a4..ff70fb556141723f885c1db03b8b0fc78de027e2 100644

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

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

@@ -39,7 +39,7 @@ class MockMediaStreamVideoSource : public MediaStreamVideoSource {

void CompleteGetSupportedFormats();

- const media::VideoCaptureParams& start_params() const { return params_; }

+ const media::VideoCaptureFormat& start_format() const { return format_; }

int max_requested_height() const { return max_requested_height_; }

int max_requested_width() const { return max_requested_width_; }

double max_requested_frame_rate() const { return max_requested_frame_rate_; }

@@ -62,12 +62,12 @@ class MockMediaStreamVideoSource : public MediaStreamVideoSource {

double max_requested_frame_rate,

const VideoCaptureDeviceFormatsCB& callback) OVERRIDE;

virtual void StartSourceImpl(

- const media::VideoCaptureParams& params,

+ const media::VideoCaptureFormat& format,

const VideoCaptureDeliverFrameCB& frame_callback) OVERRIDE;

virtual void StopSourceImpl() OVERRIDE;

private:

- media::VideoCaptureParams params_;

+ media::VideoCaptureFormat format_;

media::VideoCaptureFormats supported_formats_;

bool manual_get_supported_formats_;

int max_requested_height_;