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

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

Issue 1039383002: Video Capture Win: Adds support for Analog Capture Devices such as the USB2-Live and Avermedia Card. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 9 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
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 d1b1af48dadf0cdf19ec8309362ee9f8c40b87eb..f758c2c188395d0c40ac0abc4aca6705fecf3817 100644
--- a/media/video/capture/win/video_capture_device_win.h
+++ b/media/video/capture/win/video_capture_device_win.h
@@ -87,8 +87,6 @@ class VideoCaptureDeviceWin
bool CreateCapabilityMap();
void SetAntiFlickerInCaptureFilter();
- HRESULT InstantiateWDMFiltersAndPins();
- HRESULT AddWDMCrossbarFilterToGraphAndConnect();
void SetErrorState(const std::string& reason);
Name device_name_;
@@ -96,17 +94,14 @@ class VideoCaptureDeviceWin
scoped_ptr<VideoCaptureDevice::Client> client_;
base::win::ScopedComPtr<IBaseFilter> capture_filter_;
+
base::win::ScopedComPtr<IGraphBuilder> graph_builder_;
+ base::win::ScopedComPtr<ICaptureGraphBuilder2> capture_graph_builder_;
+
base::win::ScopedComPtr<IMediaControl> media_control_;
base::win::ScopedComPtr<IPin> input_sink_pin_;
base::win::ScopedComPtr<IPin> output_capture_pin_;
- // Used for WDM devices as specified by |device_name_|. These devices need a
- // WDM Crossbar Filter upstream from the Capture filter.
- base::win::ScopedComPtr<IBaseFilter> crossbar_filter_;
- base::win::ScopedComPtr<IPin> crossbar_video_output_pin_;
- base::win::ScopedComPtr<IPin> analog_video_input_pin_;
-
scoped_refptr<SinkFilter> sink_filter_;
// Map of all capabilities this device support.
« no previous file with comments | « media/video/capture/win/video_capture_device_factory_win.cc ('k') | media/video/capture/win/video_capture_device_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698