content/browser/renderer_host/media/video_capture_manager.cc - Issue 22876027: Consolidate duplicated frame / capability structures in video_capture_types.h

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/browser/renderer_host/media/video_capture_manager.cc

Issue 22876027: Consolidate duplicated frame / capability structures in video_capture_types.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 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/browser/renderer_host/media/video_capture_host_unittest.cc ('k') | content/browser/renderer_host/media/video_capture_manager_unittest.cc » ('j') | media/media.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_manager.cc

diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc

index 79da41260a3ee26cfefbc80a2e8f0263733caf8a..f0662397549bc4246fc593af9b49ecbc4f668103 100644

--- a/content/browser/renderer_host/media/video_capture_manager.cc

+++ b/content/browser/renderer_host/media/video_capture_manager.cc

@@ -260,7 +260,7 @@ void VideoCaptureManager::OnStart(

DCHECK(video_capture_receiver != NULL);

DVLOG(1) << "VideoCaptureManager::OnStart, (" << capture_params.width

<< ", " << capture_params.height

- << ", " << capture_params.frame_per_second

+ << ", " << capture_params.frame_rate

<< ", " << capture_params.session_id

<< ")";

@@ -289,7 +289,7 @@ void VideoCaptureManager::OnStart(

media::VideoCaptureCapability params_as_capability_copy;

params_as_capability_copy.width = capture_params.width;

params_as_capability_copy.height = capture_params.height;

- params_as_capability_copy.frame_rate = capture_params.frame_per_second;

+ params_as_capability_copy.frame_rate = capture_params.frame_rate;

params_as_capability_copy.session_id = capture_params.session_id;

params_as_capability_copy.frame_size_type = capture_params.frame_size_type;

video_capture_device->Allocate(params_as_capability_copy,