content/renderer/media/capture_video_decoder.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/capture_video_decoder.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/browser/renderer_host/media/video_capture_manager_unittest.cc ('k') | content/renderer/media/capture_video_decoder_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/capture_video_decoder.cc

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

index 0309c0484b04caf40c186ae2f837e11bd41d9c42..8c15a3ba270b1c7c55302c6e1dc80988ea4f686a 100644

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

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

@@ -261,7 +261,7 @@ void CaptureVideoDecoder::OnBufferReadyOnDecoderThread(

// Assume YV12 format. Note that camera gives YUV and media pipeline video

// renderer asks for YVU. The following code did the conversion.

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

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

int y_width = buf->width;

int y_height = buf->height;

int uv_width = buf->width / 2;