content/renderer/media/mock_media_stream_video_source.cc - Issue 442643002: Allow MediaStream constraints to specify higher than 30 FPS tab capture.

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 442643002: Allow MediaStream constraints to specify higher than 30 FPS tab capture. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix compile whoops. Created 6 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 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 b1e58f3957b2233453d02fa3c25ed4a38a1f468b..2e9b6a123775c4fea27001f5406c6336e6c0c8dc 100644

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

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

@@ -15,6 +15,7 @@ MockMediaStreamVideoSource::MockMediaStreamVideoSource(

: manual_get_supported_formats_(manual_get_supported_formats),

max_requested_height_(0),

max_requested_width_(0),

+ max_requested_frame_rate_(0.0),

attempted_to_start_(false) {

supported_formats_.push_back(

media::VideoCaptureFormat(

@@ -46,10 +47,12 @@ void MockMediaStreamVideoSource::CompleteGetSupportedFormats() {

void MockMediaStreamVideoSource::GetCurrentSupportedFormats(

int max_requested_height,

int max_requested_width,

+ double max_requested_frame_rate,

const VideoCaptureDeviceFormatsCB& callback) {

DCHECK(formats_callback_.is_null());

max_requested_height_ = max_requested_height;

max_requested_width_ = max_requested_width;

+ max_requested_frame_rate_ = max_requested_frame_rate;

if (manual_get_supported_formats_) {

formats_callback_ = callback;