content/renderer/media/media_stream_impl.cc - Issue 10108009: Move VideoCapture::VideoCaptureCapability to video_capture_types.h

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/media_stream_impl.cc

Issue 10108009: Move VideoCapture::VideoCaptureCapability to video_capture_types.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « content/renderer/media/capture_video_decoder_unittest.cc ('k') | content/renderer/media/video_capture_impl.h » ('j') | content/renderer/media/video_capture_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 49404339748fb18cfbc84c9533155c84a84b19af..68fe267d1a08be7558b97dfc8c18a74f361ff264 100644

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

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

@@ -237,12 +237,12 @@ scoped_refptr<media::VideoDecoder> MediaStreamImpl::GetVideoDecoder(

// It's a local stream.

int video_session_id =

media_stream_dispatcher_->video_session_id(msm_label, 0);

- media::VideoCapture::VideoCaptureCapability capability;

+ media::VideoCaptureCapability capability;

capability.width = kVideoCaptureWidth;

capability.height = kVideoCaptureHeight;

- capability.max_fps = kVideoCaptureFramePerSecond;

+ capability.frame_rate = kVideoCaptureFramePerSecond;

capability.expected_capture_delay = 0;

- capability.raw_type = media::VideoFrame::I420;

+ capability.color = media::VideoFrame::I420;

capability.interlaced = false;

decoder = new CaptureVideoDecoder(

message_loop_factory->GetMessageLoopProxy("CaptureVideoDecoderThread"),