From 552bd035d55c0df237f99e27e9ce827b129d2d84 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Wed, 20 Jan 2021 12:44:16 -0800 Subject: [PATCH] Revert "mac-avcapture: Add additional capture presets" This reverts commit b1efb005ab24715a117839e5fdc26185bd0405e5. This needs to be a runtime check, not a compile-time check. --- plugins/mac-avcapture/av-capture.mm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/plugins/mac-avcapture/av-capture.mm b/plugins/mac-avcapture/av-capture.mm index 0602842f3..c44313622 100644 --- a/plugins/mac-avcapture/av-capture.mm +++ b/plugins/mac-avcapture/av-capture.mm @@ -1,4 +1,3 @@ -#import #import #import #import @@ -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];