From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 84B1C47640 for ; Fri, 15 Dec 2023 10:11:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F59D68D2A1; Fri, 15 Dec 2023 12:11:21 +0200 (EET) Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8DB468D083 for ; Fri, 15 Dec 2023 12:11:14 +0200 (EET) Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2c9f85eff28so6032381fa.3 for ; Fri, 15 Dec 2023 02:11:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1702635074; x=1703239874; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Oz4MPQNqb/TZdWqxS1vNfZlUmpl4GIEKNGzzUM7QLRg=; b=moIZcY7w/XJavm2mEtNE0r+aPykeqgdPnb0sghBff4QraddevAuFRVUmaRNMyspjJF 811X3Oodu7kVexQS+ee6PsiAqEhyko7fBvr1UGjegKBbaVWIHXatsIfwpn2G8ui3Gltp LQ0g+bQDfa72qNA7jsL0mpG0ay9ZGq8fgwwuf/He2lRUytCOKRSxiiwKlfnXnau4rNh9 OBg80cK8enBzQIcMmAp7gHWqU5EQjJoLztZ+zpSDvorCLXDm2jGcnzc1+YuIzrCihrVz uAQU8eLGyrt1YI+rEnocwLMTF3GOaLrpxy8CHkjnJL2jzmUq5c1YCkbZyM+Fuh4ZWHKk MElg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702635074; x=1703239874; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Oz4MPQNqb/TZdWqxS1vNfZlUmpl4GIEKNGzzUM7QLRg=; b=X1Lwp23KRZpqC32eBdCUms/0C+8v9y5xBugtMqeaRszZI4kGBnOWF4pU80j/m6UfLK n+QJN/N45QWqgRGKjFL4jP5KJwHSwim2P8kwyFg/A/ANIChvrJHfVFCwBOSj2EzQm3Ta vwZH5kg6oZ59xYqV52Yg9rn/4VlrRMzDw6VwT7K9eDnDUYMInEBWtVGxwXEB//cZ7IA2 IFbl0XnxNZicxeI9FKjA8vdTAmxWdh0oVfU2Dq9OdJsBeIKICYZX5S0cYo41pSCMR2uj ox5kaSjgzwQiInZKxeBwBSnzHND06tj6y03p9wqHcG3mReku7JGjzS4zr2BYWiSptFCX TXog== X-Gm-Message-State: AOJu0YzsZZYO6Xh38pTXQ2hl8uKybZkzeQuTW9wS9a7wuEN1+KtvruGc Dx52pkeyfsqVQyM020wK/Vh/X8zXLK8yMaHpvnnCFA== X-Google-Smtp-Source: AGHT+IFtVbT1jLDsoRROZ3LdtmWjVja7eqYidv79b272Tf1zD/OdO0vKufnDJagyFD1pNymaQ9SOPQ== X-Received: by 2002:a2e:b282:0:b0:2cc:45ed:dae8 with SMTP id 2-20020a2eb282000000b002cc45eddae8mr1074326ljx.55.1702635073620; Fri, 15 Dec 2023 02:11:13 -0800 (PST) Received: from localhost (host-97-144.parnet.fi. [77.234.97.144]) by smtp.gmail.com with ESMTPSA id t1-20020a2e7801000000b002cc474c94e7sm339928ljc.22.2023.12.15.02.11.13 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Dec 2023 02:11:13 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Dec 2023 12:11:12 +0200 Message-Id: <20231215101112.83475-1-martin@martin.st> X-Mailer: git-send-email 2.39.3 (Apple Git-145) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfoundation: Fix version checks X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Thilo Borgmann , xufuji456 <839789740@qq.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: _VERSION_MAX_ALLOWED indicates what version is available in the SDK, while _VERSION_MIN_REQUIRED is the version we can assume is available, i.e. similar to what is set with e.g. -miphoneos-version-min on the command line. This fixes build errors like these: src/libavdevice/avfoundation.m:788:37: error: 'AVCaptureDeviceTypeContinuityCamera' is only available on macOS 14.0 or newer [-Werror,-Wunguarded-availability-new] [deviceTypes addObject: AVCaptureDeviceTypeContinuityCamera]; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVFoundation.framework/Headers/AVCaptureDevice.h:551:38: note: 'AVCaptureDeviceTypeContinuityCamera' has been marked as being introduced in macOS 14.0 here, but the deployment target is macOS 13.0.0 AVF_EXPORT AVCaptureDeviceType const AVCaptureDeviceTypeContinuityCamera API_AVAILABLE(macos(14.0), ios(17.0), macCatalyst(17.0), tvos(17.0)) API_UNAVAILABLE(visionos) API_UNAVAILABLE(watchos); ^ Alternatively, we could use these more modern APIs, if enclosed in suitable @available() checks. --- libavdevice/avfoundation.m | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index c1432ec80f..a0ef87edff 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -762,41 +762,41 @@ static int get_audio_config(AVFormatContext *s) } static NSArray* getDevicesWithMediaType(AVMediaType mediaType) { -#if ((TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000) || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500)) +#if ((TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)) NSMutableArray *deviceTypes = nil; if (mediaType == AVMediaTypeVideo) { deviceTypes = [NSMutableArray arrayWithArray:@[AVCaptureDeviceTypeBuiltInWideAngleCamera]]; - #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000) + #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) [deviceTypes addObject: AVCaptureDeviceTypeBuiltInDualCamera]; [deviceTypes addObject: AVCaptureDeviceTypeBuiltInTelephotoCamera]; #endif - #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110100) + #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110100) [deviceTypes addObject: AVCaptureDeviceTypeBuiltInTrueDepthCamera]; #endif - #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000) + #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) [deviceTypes addObject: AVCaptureDeviceTypeBuiltInTripleCamera]; [deviceTypes addObject: AVCaptureDeviceTypeBuiltInDualWideCamera]; [deviceTypes addObject: AVCaptureDeviceTypeBuiltInUltraWideCamera]; #endif - #if (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000) + #if (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000) [deviceTypes addObject: AVCaptureDeviceTypeDeskViewCamera]; #endif - #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= 150400) + #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150400) [deviceTypes addObject: AVCaptureDeviceTypeBuiltInLiDARDepthCamera]; #endif - #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170000 || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000)) + #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000 || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000)) [deviceTypes addObject: AVCaptureDeviceTypeContinuityCamera]; #endif } else if (mediaType == AVMediaTypeAudio) { - #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170000 || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000)) + #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000 || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000)) deviceTypes = [NSMutableArray arrayWithArray:@[AVCaptureDeviceTypeMicrophone]]; #else deviceTypes = [NSMutableArray arrayWithArray:@[AVCaptureDeviceTypeBuiltInMicrophone]]; #endif } else if (mediaType == AVMediaTypeMuxed) { - #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170000 || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000)) + #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000 || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 140000)) deviceTypes = [NSMutableArray arrayWithArray:@[AVCaptureDeviceTypeExternal]]; - #elif (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED < 140000) + #elif (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) deviceTypes = [NSMutableArray arrayWithArray:@[AVCaptureDeviceTypeExternalUnknown]]; #else return nil; -- 2.39.3 (Apple Git-145) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".