Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(688)

Unified Diff: media/video/capture/win/sink_input_pin_win.h

Issue 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix a namespace issue 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 | « media/video/capture/win/sink_filter_win.cc ('k') | media/video/capture/win/sink_input_pin_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/win/sink_input_pin_win.h
diff --git a/media/video/capture/win/sink_input_pin_win.h b/media/video/capture/win/sink_input_pin_win.h
index 839661daccc1b51a68a613dfa6b3654cabe6aa4b..24b895157a8cd8d347df2ea94953f67c58706b1c 100644
--- a/media/video/capture/win/sink_input_pin_win.h
+++ b/media/video/capture/win/sink_input_pin_win.h
@@ -10,6 +10,7 @@
#pragma once
#include "media/video/capture/video_capture_device.h"
+#include "media/video/capture/video_capture_types.h"
#include "media/video/capture/win/pin_base_win.h"
#include "media/video/capture/win/sink_filter_win.h"
@@ -24,11 +25,10 @@ class SinkInputPin : public PinBase {
SinkInputPin(IBaseFilter* filter, SinkFilterObserver* observer);
virtual ~SinkInputPin();
- void SetRequestedMediaCapability(
- const VideoCaptureDevice::Capability& capability);
+ void SetRequestedMediaCapability(const VideoCaptureCapability& capability);
// Returns the capability that is negotiated when this
// pin is connected to a media filter.
- const VideoCaptureDevice::Capability& ResultingCapability();
+ const VideoCaptureCapability& ResultingCapability();
// Implement PinBase.
virtual bool IsMediaTypeValid(const AM_MEDIA_TYPE* media_type);
@@ -37,8 +37,8 @@ class SinkInputPin : public PinBase {
STDMETHOD(Receive)(IMediaSample* media_sample);
private:
- VideoCaptureDevice::Capability requested_capability_;
- VideoCaptureDevice::Capability resulting_capability_;
+ VideoCaptureCapability requested_capability_;
+ VideoCaptureCapability resulting_capability_;
SinkFilterObserver* observer_;
DISALLOW_IMPLICIT_CONSTRUCTORS(SinkInputPin);
« no previous file with comments | « media/video/capture/win/sink_filter_win.cc ('k') | media/video/capture/win/sink_input_pin_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698