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

Revert "mac-avcapture: Add additional capture presets"

Browse Source 
This reverts commit b1efb005ab24715a117839e5fdc26185bd0405e5.

This needs to be a runtime check, not a compile-time check.
This commit is contained in:
jp9000 2021-01-20 12:44:16 -08:00
parent b1efb005ab
commit 552bd035d5
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,3 @@
#import <AvailabilityMacros.h>
#import <AVFoundation/AVFoundation.h>
#import <CoreFoundation/CoreFoundation.h>
#import <CoreMedia/CoreMedia.h>
@ -1231,13 +1230,8 @@ static void *av_capture_create(obs_data_t *settings, obs_source_t *source)
static NSArray *presets(void)
{
return @[
//AVCaptureSessionPresetiFrame1280x720,
//AVCaptureSessionPresetiFrame960x540,
#if defined(MAC_OS_X_VERSION_10_15) && \
MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_15
AVCaptureSessionPreset3840x2160,
AVCaptureSessionPreset1920x1080,
#endif
//AVCaptureSessionPresetiFrame1280x720,
//AVCaptureSessionPresetiFrame960x540,
AVCaptureSessionPreset1280x720, AVCaptureSessionPreset960x540,
AVCaptureSessionPreset640x480, AVCaptureSessionPreset352x288,
AVCaptureSessionPreset320x240, AVCaptureSessionPresetHigh,
@ -1258,11 +1252,6 @@ static NSString *preset_names(NSString *preset)
AVCaptureSessionPreset640x480: @"640x480",
AVCaptureSessionPreset960x540: @"960x540",
AVCaptureSessionPreset1280x720: @"1280x720",
#if defined(MAC_OS_X_VERSION_10_15) && \
MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_15
AVCaptureSessionPreset1920x1080: @"1920x1080",
AVCaptureSessionPreset3840x2160: @"3840x2160",
#endif
AVCaptureSessionPresetHigh: @"High",
};
NSString *name = preset_names[preset];