media/video/capture/win/sink_filter_win.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: media/video/capture/win/sink_filter_win.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') | « media/video/capture/win/sink_filter_win.h ('k') | media/video/capture/win/sink_input_pin_win.h » ('j') | media/video/capture/win/sink_input_pin_win.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/win/sink_filter_win.cc

diff --git a/media/video/capture/win/sink_filter_win.cc b/media/video/capture/win/sink_filter_win.cc

index 605d5572a61ef0d1b34f7893a33059347d1116e5..03db4613486f462df371a156743f6d9030c8035b 100644

--- a/media/video/capture/win/sink_filter_win.cc

+++ b/media/video/capture/win/sink_filter_win.cc

@@ -29,11 +29,11 @@ SinkFilter::~SinkFilter() {

}

void SinkFilter::SetRequestedMediaCapability(

- const VideoCaptureDevice::Capability& capability) {

+ const VideoCaptureCapability& capability) {

input_pin_->SetRequestedMediaCapability(capability);

}

-const VideoCaptureDevice::Capability& SinkFilter::ResultingCapability() {

+const VideoCaptureCapability& SinkFilter::ResultingCapability() {

return input_pin_->ResultingCapability();

}