media/video/capture/win/video_capture_device_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/video_capture_device_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

« media/video/capture/win/sink_input_pin_win.h ('K') | « media/video/capture/win/sink_input_pin_win.cc ('k') | media/video/capture/win/video_capture_device_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/win/video_capture_device_win.h

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

index c016e977584af995deb92385286b3ee1b24f0128..c722d90dab3d32547ca40ce0af1b927d490ae9bf 100644

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

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

@@ -21,6 +21,7 @@

#include "base/win/scoped_com_initializer.h"

#include "base/win/scoped_comptr.h"

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

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

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

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

@@ -54,7 +55,7 @@ class VideoCaptureDeviceWin

kError // Error accessing HW functions.

// User needs to recover by destroying the object.

};

- typedef std::map<int, Capability> CapabilityMap;

+ typedef std::map<int, VideoCaptureCapability> CapabilityMap;

// Implements SinkFilterObserver.

virtual void FrameReceived(const uint8* buffer, int length);