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

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

Issue 317073010: Win Video Capture: Add support for HDYC pixel format. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tommi@s nits Created 6 years, 6 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/video_capture_device_win.cc » ('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 920126df09e2558b16048b0081d1669b68205f2e..4feaea94ab3196d857862d694c7fa17c593daf1f 100644
--- a/media/video/capture/win/video_capture_device_factory_win.cc
+++ b/media/video/capture/win/video_capture_device_factory_win.cc
@@ -219,13 +219,22 @@ static void GetDeviceSupportedFormatsDirectShow(
continue;
}
+ std::string id;
device_id.Reset();
hr = prop_bag->Read(L"DevicePath", device_id.Receive(), 0);
- if (FAILED(hr)) {
- DVLOG(1) << "Couldn't read a device's DevicePath.";
- return;
+ if (FAILED(hr) || device_id.type() != VT_BSTR) {
+ // If there is no clear DevicePath, try with Description and FriendlyName.
+ ScopedVariant name;
+ if (SUCCEEDED(prop_bag->Read(L"Description", name.Receive(), 0)) ||
+ SUCCEEDED(prop_bag->Read(L"FriendlyName", name.Receive(), 0))) {
+ id = base::SysWideToUTF8(V_BSTR(&name));
+ }
+ } else {
+ DCHECK_EQ(device_id.type(), VT_BSTR);
+ id = base::SysWideToUTF8(V_BSTR(&device_id));
}
- if (device.id() == base::SysWideToUTF8(V_BSTR(&device_id)))
+
+ if (device.id() == id)
break;
moniker.Release();
}
« no previous file with comments | « media/video/capture/win/sink_filter_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