media/video/capture/fake_video_capture_device.cc - Issue 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

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 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: rebased code and addressed scherkus's comments Created 8 years, 8 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

« content/browser/renderer_host/media/media_stream_device_settings.h ('K') | « content/renderer/media/video_capture_module_impl.cc ('k') | media/video/capture/linux/video_capture_device_linux.h » ('j') | media/video/capture/win/sink_input_pin_win.h » ('J')
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 acbd83a74ef5ccba3b2f07cfcb8c6d4480747e96..ec64d60d9db6cc3d18ad25c1c3c8087d7f3b5ff2 100644

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

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

@@ -60,8 +60,10 @@ void FakeVideoCaptureDevice::Allocate(int width,

}

observer_ = observer;

- Capability current_settings;

- current_settings.color = kI420;

+ VideoCaptureCapability current_settings;

+ current_settings.color = VideoCaptureCapability::kI420;

+ current_settings.expected_capture_delay = 0;

+ current_settings.interlaced = false;

if (width > 320) { // VGA

current_settings.width = 640;

current_settings.height = 480;