media/video/capture/mac/video_capture_device_qtkit_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_qtkit_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: 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

« media/video/capture/mac/video_capture_device_factory_mac.mm ('K') | « media/video/capture/mac/video_capture_device_mac.mm ('k') | media/video/capture/video_capture_device.h » ('j') | media/video/capture/video_capture_device.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c884c723df5cb0afa5964551163f9ba8480c523a..599cfac59eefb52ba42012ac42b032ad86071f02 100644

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

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

@@ -29,9 +29,15 @@

});

for (QTCaptureDevice* device in captureDevices) {

- if (![[device attributeForKey:QTCaptureDeviceSuspendedAttribute] boolValue])

- [deviceNames setObject:[device localizedDisplayName]

- forKey:[device uniqueID]];

+ if ([[device attributeForKey:QTCaptureDeviceSuspendedAttribute] boolValue])

+ continue;

+ DeviceNameAndTransportType* nameAndTransportType =

+ [[[DeviceNameAndTransportType alloc]

+ initWithName:[device localizedDisplayName]

+ transportType:media::kIOAudioDeviceTransportTypeUnknown]

+ autorelease];

+ [deviceNames setObject:nameAndTransportType

+ forKey:[device uniqueID]];

}