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..f909bdaba42d65269db56acbc589be2d4c5ccb91 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,18 @@ |
#pragma mark Class methods |
-+ (NSArray *)deviceNames { |
- return [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo]; |
++ (NSDictionary *)deviceNames { |
+ NSArray *captureDevices = |
+ [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo]; |
+ NSMutableDictionary *deviceNames = |
+ [[[NSMutableDictionary alloc] init] autorelease]; |
+ |
+ for (QTCaptureDevice* device in captureDevices) { |
+ NSString* qtDeviceName = [device localizedDisplayName]; |
+ NSString* qtUniqueId = [device uniqueID]; |
+ [deviceNames setObject:qtDeviceName forKey:qtUniqueId]; |
+ } |
+ return deviceNames; |
} |
#pragma mark Public methods |