trunk/src/media/video/capture/win/video_capture_device_factory_win.cc - Issue 336183004: Revert 278314 "Revert 276260 "Win Video Capture: Add support for..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 336183004: Revert 278314 "Revert 276260 "Win Video Capture: Add support 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:

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 278314)

+++ trunk/src/media/video/capture/win/video_capture_device_factory_win.cc (working copy)

@@ -220,6 +220,7 @@

continue;

}

+ std::string id;

device_id.Reset();

hr = prop_bag->Read(L"DevicePath", device_id.Receive(), 0);

if (FAILED(hr) || device_id.type() != VT_BSTR) {

@@ -235,7 +236,8 @@

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();

}