webkit/plugins/ppapi/ppb_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: webkit/plugins/ppapi/ppb_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: fix a namespace issue 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

Index: webkit/plugins/ppapi/ppb_video_capture_impl.cc

diff --git a/webkit/plugins/ppapi/ppb_video_capture_impl.cc b/webkit/plugins/ppapi/ppb_video_capture_impl.cc

index dbadfca16f12f6c4efdd7ebf3abb31a1435e9040..f1eb12c9b489e45723ac696f75a853e6b71d3665 100644

--- a/webkit/plugins/ppapi/ppb_video_capture_impl.cc

+++ b/webkit/plugins/ppapi/ppb_video_capture_impl.cc

@@ -292,7 +292,7 @@ void PPB_VideoCapture_Impl::SetRequestedInfo(

capability_.height = device_info.height;

capability_.frame_rate = device_info.frames_per_second;

capability_.expected_capture_delay = 0; // Ignored.

- capability_.color = media::VideoFrame::I420;

+ capability_.color = media::VideoCaptureCapability::kI420;

capability_.interlaced = false; // Ignored.

}

« no previous file with comments | « media/video/capture/win/video_capture_device_win.cc ('k') | no next file » | no next file with comments »