content/renderer/media/video_capture_impl.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: content/renderer/media/video_capture_impl.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_impl.h ('k') | content/renderer/media/video_capture_impl_unittest.cc » ('j') | media/video/capture/win/sink_input_pin_win.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/video_capture_impl.cc

diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc

index 0479a401712affae844aef5b709c3d1de78256b6..fc2c87c8960f9c30e59118029663ea7b7e8e8e33 100644

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

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

@@ -51,7 +51,7 @@ VideoCaptureImpl::VideoCaptureImpl(

message_filter_(filter),

capture_message_loop_proxy_(capture_message_loop_proxy),

device_id_(0),

- video_type_(media::VideoFrame::I420),

+ video_type_(media::VideoCaptureCapability::kI420),

device_info_available_(false),

state_(video_capture::kStopped) {

DCHECK(filter);

@@ -95,7 +95,7 @@ void VideoCaptureImpl::DoDeInit(base::Closure task) {

void VideoCaptureImpl::StartCapture(

media::VideoCapture::EventHandler* handler,

const media::VideoCaptureCapability& capability) {

- DCHECK_EQ(capability.color, media::VideoFrame::I420);

+ DCHECK_EQ(capability.color, media::VideoCaptureCapability::kI420);

capture_message_loop_proxy_->PostTask(FROM_HERE,

base::Bind(&VideoCaptureImpl::DoStartCapture,