content/renderer/media/video_capture_impl.h - 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/video_capture_impl.h

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/renderer/media/media_stream_impl.cc ('k') | content/renderer/media/video_capture_impl.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/video_capture_impl.h

diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h

index b5c19c036296d716176cb8b14785ae38b9ef9e5d..d7439ec1f3bc8cd6b682d285fd28e134c46b0fba 100644

--- a/content/renderer/media/video_capture_impl.h

+++ b/content/renderer/media/video_capture_impl.h

@@ -98,7 +98,7 @@ class CONTENT_EXPORT VideoCaptureImpl

ClientInfo clients_pending_on_filter_;

ClientInfo clients_pending_on_restart_;

- media::VideoFrame::Format video_type_;

+ media::VideoCaptureCapability::Format video_type_;

// The parameter is being used in current capture session. A capture session

// starts with StartCapture and ends with StopCapture.