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 efbee0fd08a36ac19dc42a74155fb423bc30f5f1..055236fecd4763ad91d7f0c374caca3c0488b293 100644 |
--- a/media/video/capture/mac/video_capture_device_qtkit_mac.mm |
+++ b/media/video/capture/mac/video_capture_device_qtkit_mac.mm |
@@ -14,8 +14,17 @@ |
#pragma mark Class methods |
-+ (NSArray *)deviceNames { |
- return [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo]; |
++ (NSDictionary *)deviceNames { |
+ NSArray *captureDevices = |
+ [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo]; |
+ NSMutableDictionary *device_names = [[NSMutableDictionary alloc] init]; |
mflodman_chromium_OOO
2012/04/25 05:57:09
'device_names' -> 'deviceNames'
mflodman_chromium_OOO
2012/04/25 05:57:09
|device_names| is never released.
|
+ |
+ for (QTCaptureDevice* device in captureDevices) { |
+ NSString* qt_device_name = [device localizedDisplayName]; |
mflodman_chromium_OOO
2012/04/25 05:57:09
'qt_device_name' -> 'qtDeviceName'
|
+ NSString* qt_unique_id = [device uniqueID]; |
mflodman_chromium_OOO
2012/04/25 05:57:09
'qt_unique_id' -> 'qtUniqueId'
|
+ [device_names setObject:qt_device_name forKey:qt_unique_id]; |
+ } |
+ return device_names; |
} |
#pragma mark Public methods |