content/browser/renderer_host/media/video_capture_controller_unittest.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_controller_unittest.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: Rebased: changed media::VideoCaptureCapability::kI420 -> media::PIXEL_FORMAT_I420 etc. Created 7 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/browser/renderer_host/media/video_capture_controller_event_handler.h ('k') | content/browser/renderer_host/media/video_capture_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c4b716d2e333333b25ba2f535b6fe6fd3b839530..5a0cffa844a2f3399f6826aa3f5ef437f9c05f83 100644

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

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

@@ -119,8 +119,8 @@ class MockVideoCaptureManager : public VideoCaptureManager {

media::VideoCaptureCapability capture_format(

capture_params.width,

capture_params.height,

- capture_params.frame_per_second,

- media::VideoCaptureCapability::kI420,

+ capture_params.frame_rate,

+ media::PIXEL_FORMAT_I420,

false,

media::ConstantResolutionVideoCaptureDevice);

@@ -184,7 +184,7 @@ TEST_F(VideoCaptureControllerTest, StartAndStop) {

capture_params.session_id = vcm_->video_session_id_;

capture_params.width = 320;

capture_params.height = 240;

- capture_params.frame_per_second = 30;

+ capture_params.frame_rate = 30;

InSequence s;

EXPECT_CALL(*vcm_.get(),

@@ -219,7 +219,7 @@ TEST_F(VideoCaptureControllerTest, StopSession) {