media/video/capture/file_video_capture_device_factory.cc - Issue 366593003: Mac VideoCapture: return empty GetModel() for non-USB non-built-in cameras.

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/file_video_capture_device_factory.cc

Issue 366593003: Mac VideoCapture: return empty GetModel() for non-USB non-built-in cameras. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: FakeVCD and FileVCD specify AVFoundation API type. Created 6 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/file_video_capture_device_factory.cc

diff --git a/media/video/capture/file_video_capture_device_factory.cc b/media/video/capture/file_video_capture_device_factory.cc

index ae7845064e958f1d8bf40bc2fa73407e49863a37..059ae2dedcf17d99fa84834cd996fcf8f7c0c9f2 100644

--- a/media/video/capture/file_video_capture_device_factory.cc

+++ b/media/video/capture/file_video_capture_device_factory.cc

@@ -45,6 +45,11 @@ void FileVideoCaptureDeviceFactory::GetDeviceNames(

device_names->push_back(VideoCaptureDevice::Name(

base::SysWideToUTF8(command_line_file_path.value()),

kFileVideoCaptureDeviceName));

+#elif defined(OS_MACOSX)

+ device_names->push_back(VideoCaptureDevice::Name(

+ command_line_file_path.value(),

+ kFileVideoCaptureDeviceName,

+ VideoCaptureDevice::Name::AVFOUNDATION));

#else

device_names->push_back(VideoCaptureDevice::Name(

command_line_file_path.value(),

« no previous file with comments | « media/video/capture/fake_video_capture_device_factory.cc ('k') | media/video/capture/mac/avfoundation_glue.h » ('j') | no next file with comments »