Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1624)

Unified Diff: content/renderer/media/capture_video_decoder.cc

Issue 10108009: Move VideoCapture::VideoCaptureCapability to video_capture_types.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix content_unittests build failure 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: 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 24fe43f2e40b05ba5a7ab03cf147f5d550d0d1fa..0309c0484b04caf40c186ae2f837e11bd41d9c42 100644
--- a/content/renderer/media/capture_video_decoder.cc
+++ b/content/renderer/media/capture_video_decoder.cc
@@ -19,7 +19,7 @@ CaptureVideoDecoder::CaptureVideoDecoder(
base::MessageLoopProxy* message_loop_proxy,
media::VideoCaptureSessionId video_stream_id,
VideoCaptureImplManager* vc_manager,
- const media::VideoCapture::VideoCaptureCapability& capability)
+ const media::VideoCaptureCapability& capability)
: message_loop_proxy_(message_loop_proxy),
vc_manager_(vc_manager),
capability_(capability),
@@ -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_.raw_type, media::VideoFrame::I420);
+ DCHECK_EQ(capability_.color, media::VideoFrame::I420);
int y_width = buf->width;
int y_height = buf->height;
int uv_width = buf->width / 2;
« no previous file with comments | « content/renderer/media/capture_video_decoder.h ('k') | content/renderer/media/capture_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698