|
9 | 9 | std::vector<std::pair<std::string, std::string>> result; |
10 | 10 |
|
11 | 11 | @autoreleasepool { |
12 | | - if (@available(macOS 12.0, *)) { |
13 | | - NSArray *deviceTypes; |
14 | | - if (@available(macOS 13, *)) { |
15 | | - deviceTypes = @[AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeExternalUnknown, AVCaptureDeviceTypeDeskViewCamera]; |
16 | | - } else { |
17 | | - deviceTypes = @[AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeExternalUnknown]; |
18 | | - } |
| 12 | + NSArray *deviceTypes; |
| 13 | + if (@available(macOS 13, *)) { |
| 14 | + deviceTypes = @[AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeExternalUnknown, AVCaptureDeviceTypeDeskViewCamera]; |
| 15 | + } else { |
| 16 | + deviceTypes = @[AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeExternalUnknown]; |
| 17 | + } |
19 | 18 |
|
20 | | - AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:deviceTypes |
21 | | - mediaType:AVMediaTypeVideo |
22 | | - position:AVCaptureDevicePositionUnspecified]; |
| 19 | + AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:deviceTypes |
| 20 | + mediaType:AVMediaTypeVideo |
| 21 | + position:AVCaptureDevicePositionUnspecified]; |
23 | 22 |
|
24 | | - for (AVCaptureDevice *device in session.devices) { |
25 | | - if (!device.localizedName || !device.uniqueID) |
26 | | - continue; |
27 | | - result.push_back({[device.localizedName UTF8String], [device.uniqueID UTF8String]}); |
28 | | - } |
| 23 | + for (AVCaptureDevice *device in session.devices) { |
| 24 | + if (!device.localizedName || !device.uniqueID) |
| 25 | + continue; |
| 26 | + result.push_back({[device.localizedName UTF8String], [device.uniqueID UTF8String]}); |
| 27 | + } |
29 | 28 |
|
30 | | - AVCaptureDeviceDiscoverySession *muxedDiscoverySession = [AVCaptureDeviceDiscoverySession |
31 | | - discoverySessionWithDeviceTypes:deviceTypes |
32 | | - mediaType:AVMediaTypeMuxed |
33 | | - position:AVCaptureDevicePositionUnspecified]; |
34 | | - for (AVCaptureDevice *device in muxedDiscoverySession.devices) { |
35 | | - if (!device.localizedName || !device.uniqueID) |
36 | | - continue; |
37 | | - result.push_back({[device.localizedName UTF8String], [device.uniqueID UTF8String]}); |
38 | | - } |
| 29 | + AVCaptureDeviceDiscoverySession *muxedDiscoverySession = [AVCaptureDeviceDiscoverySession |
| 30 | + discoverySessionWithDeviceTypes:deviceTypes |
| 31 | + mediaType:AVMediaTypeMuxed |
| 32 | + position:AVCaptureDevicePositionUnspecified]; |
| 33 | + for (AVCaptureDevice *device in muxedDiscoverySession.devices) { |
| 34 | + if (!device.localizedName || !device.uniqueID) |
| 35 | + continue; |
| 36 | + result.push_back({[device.localizedName UTF8String], [device.uniqueID UTF8String]}); |
39 | 37 | } |
40 | 38 | } |
41 | 39 |
|
|
0 commit comments