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

Unified Diff: content/renderer/media/media_stream_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: content/renderer/media/media_stream_impl.cc
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
index ee4af5d16268008b0d497cf1dc9c35ea61442282..16c6b8e6e606af9de69631faafcf65898546a94c 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -468,8 +468,8 @@ scoped_refptr<media::VideoDecoder> MediaStreamImpl::CreateLocalVideoDecoder(
capability.width = kVideoCaptureWidth;
capability.height = kVideoCaptureHeight;
capability.frame_rate = kVideoCaptureFramePerSecond;
+ capability.color = media::VideoCaptureCapability::kI420;
capability.expected_capture_delay = 0;
- capability.color = media::VideoFrame::I420;
capability.interlaced = false;
return new CaptureVideoDecoder(
message_loop_factory->GetMessageLoopProxy("CaptureVideoDecoderThread"),
« no previous file with comments | « content/renderer/media/capture_video_decoder_unittest.cc ('k') | content/renderer/media/video_capture_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698