media/video/capture/win/sink_filter_win.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: media/video/capture/win/sink_filter_win.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') | « media/video/capture/video_capture_types.h ('k') | media/video/capture/win/sink_filter_win.cc » ('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.h

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

index 5145cd4fc8b641479e062cf029d36f84581bd7be..c2ff55e092667b335076a5bc6af9c6f0165f4e2a 100644

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

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

@@ -12,6 +12,7 @@

#include "base/memory/scoped_ptr.h"

#include "media/video/capture/video_capture_device.h"

+#include "media/video/capture/video_capture_types.h"

#include "media/video/capture/win/filter_base_win.h"

#include "media/video/capture/win/sink_filter_observer_win.h"

@@ -32,10 +33,10 @@ class __declspec(uuid("88cdbbdc-a73b-4afa-acbf-15d5e2ce12c3"))

virtual ~SinkFilter();

void SetRequestedMediaCapability(

- const VideoCaptureDevice::Capability& capability);

+ const VideoCaptureCapability& capability);

// Returns the capability that is negotiated when this

// filter is connected to a media filter.

- const VideoCaptureDevice::Capability& ResultingCapability();

+ const VideoCaptureCapability& ResultingCapability();

// Implement FilterBase.

virtual size_t NoOfPins();