media/video/capture/fake_video_capture_device.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: media/video/capture/fake_video_capture_device.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 | « media/video/capture/android/video_capture_device_android.cc ('k') | media/video/capture/linux/video_capture_device_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/fake_video_capture_device.cc

diff --git a/media/video/capture/fake_video_capture_device.cc b/media/video/capture/fake_video_capture_device.cc

index ae7c07bc042558e63207efad091e35aaedfb656b..8434bc3ebbe67b5c6e865657cecfdee39da82dd4 100644

--- a/media/video/capture/fake_video_capture_device.cc

+++ b/media/video/capture/fake_video_capture_device.cc

@@ -79,7 +79,7 @@ void FakeVideoCaptureDevice::Allocate(

}

observer_ = observer;

- capture_format_.color = VideoCaptureCapability::kI420;

+ capture_format_.color = PIXEL_FORMAT_I420;

capture_format_.expected_capture_delay = 0;

capture_format_.interlaced = false;

if (capture_format.width > 320) { // VGA

@@ -105,7 +105,7 @@ void FakeVideoCaptureDevice::Reallocate() {

DCHECK_EQ(state_, kCapturing);

capture_format_ = capabilities_roster_.at(++capabilities_roster_index_ %

capabilities_roster_.size());

- DCHECK_EQ(capture_format_.color, VideoCaptureCapability::kI420);

+ DCHECK_EQ(capture_format_.color, PIXEL_FORMAT_I420);

DVLOG(3) << "Reallocating FakeVideoCaptureDevice, new capture resolution ("

<< capture_format_.width << "x" << capture_format_.height << ")";

@@ -230,7 +230,7 @@ void FakeVideoCaptureDevice::PopulateCapabilitiesRoster() {

media::VideoCaptureCapability(320,

240,

30,

- VideoCaptureCapability::kI420,

+ PIXEL_FORMAT_I420,

false,

VariableResolutionVideoCaptureDevice));

@@ -238,7 +238,7 @@ void FakeVideoCaptureDevice::PopulateCapabilitiesRoster() {

media::VideoCaptureCapability(640,

480,

30,

- VideoCaptureCapability::kI420,

+ PIXEL_FORMAT_I420,

false,

VariableResolutionVideoCaptureDevice));

@@ -246,7 +246,7 @@ void FakeVideoCaptureDevice::PopulateCapabilitiesRoster() {

media::VideoCaptureCapability(800,

600,

30,

- VideoCaptureCapability::kI420,

+ PIXEL_FORMAT_I420,

false,

VariableResolutionVideoCaptureDevice));