media/video/capture/mac/video_capture_device_avfoundation_mac.mm - 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/mac/video_capture_device_avfoundation_mac.mm

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: rsesek@ comments 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/mac/avfoundation_glue.h ('k') | media/video/capture/mac/video_capture_device_factory_mac.mm » ('j') | media/video/capture/mac/video_capture_device_factory_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/mac/video_capture_device_avfoundation_mac.mm

diff --git a/media/video/capture/mac/video_capture_device_avfoundation_mac.mm b/media/video/capture/mac/video_capture_device_avfoundation_mac.mm

index 2412aac91d483384a6bc990a57f2243224a807cb..f29edc11d5e43f6fac43c3b0c90c3109eb03bd95 100644

--- a/media/video/capture/mac/video_capture_device_avfoundation_mac.mm

+++ b/media/video/capture/mac/video_capture_device_avfoundation_mac.mm

@@ -23,7 +23,11 @@

if (([device hasMediaType:AVFoundationGlue::AVMediaTypeVideo()] ||

[device hasMediaType:AVFoundationGlue::AVMediaTypeMuxed()]) &&

![device isSuspended]) {

- [deviceNames setObject:[device localizedName]

+ DeviceNameAndTransportType* name_and_transport_type =

Robert Sesek 2014/07/01 16:23:57 naming: nameAndTransportType, since this is in an

mcasas 2014/07/02 07:37:35 Done.

+ [[[DeviceNameAndTransportType alloc]

+ initWithName:[device localizedName]

+ transportType:[device transportType]] autorelease];

+ [deviceNames setObject:name_and_transport_type

forKey:[device uniqueID]];

}