jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac-capture: Remove codepath for discovering devices pre Mac OS X 10.15

master
PatTheMav 2022-07-28 19:04:40 +02:00 committed by Patrick Heyer
parent 7acf785322
commit 5b7879d9aa
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
plugins/mac-avcapture/av-capture.mm
View File

@ -2210,38 +2210,25 @@ static obs_properties_t *av_capture_properties(void *data)
obs_property_list_add_string(dev_list, "", "");
NSArray *devices = nil;
#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_15)
if (@available(macOS 10.15, *)) {
AVCaptureDeviceDiscoverySession *mediaDeviceDiscoverySession =
[AVCaptureDeviceDiscoverySession
discoverySessionWithDeviceTypes:@[
AVCaptureDeviceTypeBuiltInWideAngleCamera,
AVCaptureDeviceTypeExternalUnknown
]
mediaType:AVMediaTypeVideo
position:AVCaptureDevicePositionUnspecified];
NSArray *mediaDevices = [mediaDeviceDiscoverySession devices];
AVCaptureDeviceDiscoverySession *muxedDeviceDiscoverySession =
[AVCaptureDeviceDiscoverySession
discoverySessionWithDeviceTypes:@[
AVCaptureDeviceTypeExternalUnknown
]
mediaType:AVMediaTypeMuxed
position:AVCaptureDevicePositionUnspecified];
NSArray *muxedDevices = [muxedDeviceDiscoverySession devices];
AVCaptureDeviceDiscoverySession *mediaDeviceDiscoverySession = [AVCaptureDeviceDiscoverySession
discoverySessionWithDeviceTypes:@[
AVCaptureDeviceTypeBuiltInWideAngleCamera,
AVCaptureDeviceTypeExternalUnknown
]
mediaType:AVMediaTypeVideo
position:AVCaptureDevicePositionUnspecified];
NSArray *mediaDevices = [mediaDeviceDiscoverySession devices];
devices = [mediaDevices
arrayByAddingObjectsFromArray:muxedDevices];
} else {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
devices = [AVCaptureDevice devices];
#pragma clang diagnostic pop
}
#else
devices = [AVCaptureDevice devices];
#endif
AVCaptureDeviceDiscoverySession *muxedDeviceDiscoverySession = [AVCaptureDeviceDiscoverySession
discoverySessionWithDeviceTypes:@[
AVCaptureDeviceTypeExternalUnknown
]
mediaType:AVMediaTypeMuxed
position:AVCaptureDevicePositionUnspecified];
NSArray *muxedDevices = [muxedDeviceDiscoverySession devices];
devices = [mediaDevices arrayByAddingObjectsFromArray:muxedDevices];
for (AVCaptureDevice *dev in devices) {
if ([dev hasMediaType:AVMediaTypeVideo] ||