OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 09:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac-avcapture: Add DeskCam support

Browse source
This commit is contained in:
Developer-Ecosystem-Engineering 2022-11-08 14:27:42 -06:00 committed by Sebastian Beckmann
parent ca53f16e20
commit faea7fb8b2
1 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
plugins/mac-avcapture/av-capture.mm
View file

@ -2205,34 +2205,32 @@ static obs_properties_t *av_capture_properties(void *data)
OBS_COMBO_FORMAT_STRING);
obs_property_list_add_string(dev_list, "", "");
NSArray *devices = nil;
AVCaptureDeviceDiscoverySession *mediaDeviceDiscoverySession = [AVCaptureDeviceDiscoverySession
discoverySessionWithDeviceTypes:@[
AVCaptureDeviceTypeBuiltInWideAngleCamera,
AVCaptureDeviceTypeExternalUnknown
]
NSMutableArray *device_types = [NSMutableArray
arrayWithObjects:AVCaptureDeviceTypeBuiltInWideAngleCamera,
AVCaptureDeviceTypeExternalUnknown, nil];
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000
if (__builtin_available(macOS 13.0, *)) {
[device_types addObject:AVCaptureDeviceTypeDeskViewCamera];
}
#endif
AVCaptureDeviceDiscoverySession *video_discovery = [AVCaptureDeviceDiscoverySession
discoverySessionWithDeviceTypes:device_types
mediaType:AVMediaTypeVideo
position:AVCaptureDevicePositionUnspecified];
NSArray *mediaDevices = [mediaDeviceDiscoverySession devices];
for (AVCaptureDevice *dev in [video_discovery devices]) {
obs_property_list_add_string(dev_list,
dev.localizedName.UTF8String,
dev.uniqueID.UTF8String);
}
AVCaptureDeviceDiscoverySession *muxedDeviceDiscoverySession = [AVCaptureDeviceDiscoverySession
discoverySessionWithDeviceTypes:@[
AVCaptureDeviceTypeExternalUnknown
]
AVCaptureDeviceDiscoverySession *muxed_discovery = [AVCaptureDeviceDiscoverySession
discoverySessionWithDeviceTypes:device_types
mediaType:AVMediaTypeMuxed
position:AVCaptureDevicePositionUnspecified];
NSArray *muxedDevices = [muxedDeviceDiscoverySession devices];
devices = [mediaDevices arrayByAddingObjectsFromArray:muxedDevices];
for (AVCaptureDevice *dev in devices) {
if ([dev hasMediaType:AVMediaTypeVideo] ||
[dev hasMediaType:AVMediaTypeMuxed]) {
obs_property_list_add_string(
dev_list, dev.localizedName.UTF8String,
dev.uniqueID.UTF8String);
}
for (AVCaptureDevice *dev in [muxed_discovery devices]) {
obs_property_list_add_string(dev_list,
dev.localizedName.UTF8String,
dev.uniqueID.UTF8String);
}
obs_property_set_modified_callback(dev_list, properties_device_changed);