media/video/capture/win/video_capture_device_mf_win.cc - Issue 17402002: Reconnect support for DirectShow video capture devices in parallel to MediaFoundation ones.

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: media/video/capture/win/video_capture_device_mf_win.cc

Issue 17402002: Reconnect support for DirectShow video capture devices in parallel to MediaFoundation ones. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added check for Windows version in unittests, Capture Driver Api is DS if Windows version < 7 Created 7 years, 5 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_mf_win.cc

diff --git a/media/video/capture/win/video_capture_device_mf_win.cc b/media/video/capture/win/video_capture_device_mf_win.cc

index 7776574a34e66dcaa73f5dfe16f723b82e9956eb..b2f47bc31bf92cd68fa9e4aa46aebdeef655fea4 100644

--- a/media/video/capture/win/video_capture_device_mf_win.cc

+++ b/media/video/capture/win/video_capture_device_mf_win.cc

@@ -268,7 +268,8 @@ void VideoCaptureDeviceMFWin::GetDeviceNames(Names* device_names) {

MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK, &id,

&id_size))) {

std::wstring name_w(name, name_size), id_w(id, id_size);

- Name device(base::SysWideToUTF8(name_w), base::SysWideToUTF8(id_w));

+ Name device(base::SysWideToUTF8(name_w), base::SysWideToUTF8(id_w),

+ Name::MEDIA_FOUNDATION);

device_names->push_back(device);

} else {

DLOG(WARNING) << "GetAllocatedString failed: " << std::hex << hr;

« no previous file with comments | « media/video/capture/video_capture_device_unittest.cc ('k') | media/video/capture/win/video_capture_device_win.cc » ('j') | no next file with comments »