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

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

Issue 333643009: Revert 276260 "Win Video Capture: Add support for HDYC pixel for..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
Index: trunk/src/media/video/capture/win/video_capture_device_factory_win.cc
===================================================================
--- trunk/src/media/video/capture/win/video_capture_device_factory_win.cc (revision 278313)
+++ trunk/src/media/video/capture/win/video_capture_device_factory_win.cc (working copy)
@@ -220,7 +220,6 @@
continue;
}
- std::string id;
Dominik Grewe 2014/06/19 10:17:38 Removing this line is causing a compile failure. C
device_id.Reset();
hr = prop_bag->Read(L"DevicePath", device_id.Receive(), 0);
if (FAILED(hr) || device_id.type() != VT_BSTR) {
@@ -236,8 +235,7 @@
DCHECK_EQ(device_id.type(), VT_BSTR);
id = base::SysWideToUTF8(V_BSTR(&device_id));
}
-
- if (device.id() == id)
+ if (device.id() == base::SysWideToUTF8(V_BSTR(&device_id)))
break;
moniker.Release();
}
« no previous file with comments | « trunk/src/media/video/capture/win/sink_filter_win.cc ('k') | trunk/src/media/video/capture/win/video_capture_device_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698