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

Unified Diff: media/video/capture/win/video_capture_device_factory_win.cc

Issue 546803002: Win Video Capture: add support for WDM capture devices using a WDM Crossbar filter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: perkj@s nits Created 6 years, 3 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 | « no previous file | media/video/capture/win/video_capture_device_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/win/video_capture_device_factory_win.cc
diff --git a/media/video/capture/win/video_capture_device_factory_win.cc b/media/video/capture/win/video_capture_device_factory_win.cc
index 1630baf35730602bffdeaf5287d1c65127df0703..4f68c6edb3841a622246848f9dd42562e1e96d3c 100644
--- a/media/video/capture/win/video_capture_device_factory_win.cc
+++ b/media/video/capture/win/video_capture_device_factory_win.cc
@@ -209,6 +209,7 @@ static void GetDeviceSupportedFormatsDirectShow(const Name& device,
// VFW devices are already skipped previously in GetDeviceNames() enumeration.
base::win::ScopedComPtr<IBaseFilter> capture_filter;
hr = VideoCaptureDeviceWin::GetDeviceFilter(device.capabilities_id(),
+ CLSID_VideoInputDeviceCategory,
capture_filter.Receive());
if (!capture_filter) {
DLOG(ERROR) << "Failed to create capture filter: "
@@ -219,7 +220,8 @@ static void GetDeviceSupportedFormatsDirectShow(const Name& device,
base::win::ScopedComPtr<IPin> output_capture_pin(
VideoCaptureDeviceWin::GetPin(capture_filter,
PINDIR_OUTPUT,
- PIN_CATEGORY_CAPTURE));
+ PIN_CATEGORY_CAPTURE,
+ GUID_NULL));
if (!output_capture_pin) {
DLOG(ERROR) << "Failed to get capture output pin";
return;
« no previous file with comments | « no previous file | media/video/capture/win/video_capture_device_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698