From patchwork Wed Dec 22 00:07:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 32814 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5916713iog; Tue, 21 Dec 2021 16:08:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJwNV+ynfSmkmRoEw4uZWnW2B46fzDm1EDZ68KwwFmbfOBxl+MDwR+uBqRAAHaK5lZHgSAel X-Received: by 2002:a05:6402:438a:: with SMTP id o10mr579893edc.353.1640131696507; Tue, 21 Dec 2021 16:08:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640131696; cv=none; d=google.com; s=arc-20160816; b=q2j1tCC35f7xvsmp6/5vid7c8rw6i9u5ugwcCyaQUK+lny/N2LeOI8Vp/nfQxoW+tb uwnle/vkygHXGUm8rTUMafPdAuI3pc4NprX0iBL+6TqX4xsWgQ08smzOrrEBf6ZaKIIK cUI+4850bLC0vUAqsiqvVDaonKYtaNC7y0cDxvSkIduVd68kebG2OnxrpyUOlEQzXIhT jp3zBB78xyDN6lwZ2r94+AaNnGEkbWV6QNn+CB7cOcjpjmWzgZd3vrI4ln2SEPmpES0/ DMHgqZJlJx+On6iRrszEekbFan/nLdp9Jwy2+vTLHVVWW3zhmMQ/9/8PJcfKdowl0554 pK1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=sfp3CxH1U/b8mdfmcLvxX1X44xawZk3ILWqbHp3d9G8=; b=Ndva5TNdrCmPRJq8Z8FH97fUNBTEk21C2yyqUh9VnHCQ2R5WCBTiyB1fxHgY2ipqQp JCoknHI6BZ4fgnnNTelUM1Nnu1uHLU2lCaiJ/u/ShG5M1VA+zSW1G93UchdKiyKPCCgj 0GxbXr5XNWLqUKEejqw+D/2Ne24PDq8/OuQhQ4AqthCu2RVjNe5MzLpy/z1a6E6xyvuR GINMbZlnHjhhcB65FnbyExgbdyeJR+rHz1EsYwn5EarGMrGUai9wj6cHiTYhNLYZWFiP XF+kIFDnf4XAQXszvjDTiQRZbrNGIuXjZJvyB/It665UKL5KlHCcCKSzmMXFAnmO6xOn 1k5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b="rV/pIhRr"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h1si149919ejq.449.2021.12.21.16.08.16; Tue, 21 Dec 2021 16:08:16 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b="rV/pIhRr"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A6A6E68AF6F; Wed, 22 Dec 2021 02:07:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f43.google.com (mail-io1-f43.google.com [209.85.166.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4A4D68AF4C for ; Wed, 22 Dec 2021 02:07:38 +0200 (EET) Received: by mail-io1-f43.google.com with SMTP id m9so754999iop.0 for ; Tue, 21 Dec 2021 16:07:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=AfFwT1vzbvjhMZkqNDhfs9WjzHbghrFvqXrfiJkj8nM=; b=rV/pIhRrf63dxxhpFu+qa5JfpbeN1a82yDG/R5868SWyHAnMzWuu/mg90AEoi8efxA zju93qA+HEueM+ckllZCIeDjY0frtdS7XkWIygjULyjjn2eiVy86kCIcDL+seaoQqOoe 1W5Ah9KQJnZltRmpAfSCWeE8/uM2W1oPiHRdwBlSdXIq95MljkZJZeYpH4DuE73/2m8u WFpcsh/IFsb7GsBKZZn3caAg8N0tT4AlUgxnH3593FPox502rvFv880kTXh7X918UF0T yyDzG8Es3EwcszSw78MUd3avj99U8IIbQZ5EIkbv5EsyOEWrvF7oOhEURLik0xqbnf33 4uOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AfFwT1vzbvjhMZkqNDhfs9WjzHbghrFvqXrfiJkj8nM=; b=Pe66OnKYM2njAv3mJjqBpH7a8mRw49C/dZIVtEv0uB9RqaG9eAr6fvdW3AtdLCHTju Y3BQx34GyoulLN6aNo/bYb5pgMuq7kj60GL/haNa54XEGI17ElgxB7gLYlAta8WALAzs 7CQ+K+K2A+X/smsFm4lUQ6t3f+bf64gZrWuk8UuBhnTuMvgSZARfDRozyAaTSu5yxzHL pwxa71fmZ2k4rOHOcQgR1SX7shKguPd2OnD/I2KV9Ajf8oHanXCbhgZmBBYBV3I3oumw 0zE1R6nptmLfsVHik9PUFM4WA/971KYN6j3y9oOZIEZ0MDtln+ExlgXfF8sb4IeBqvi1 jP4w== X-Gm-Message-State: AOAM532QjaHY7CYuBv0sCbstoeWxlrbP8I0X+IlRE4THxN+q2Ufxl02f Q6a0QLZB7Bm4HMp1Lb0Wjy1oZ40Snmt70pQ= X-Received: by 2002:a02:a88f:: with SMTP id l15mr255654jam.231.1640131657093; Tue, 21 Dec 2021 16:07:37 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:d068:8cb9:95e2:de39]) by smtp.gmail.com with ESMTPSA id a1sm238240ilj.35.2021.12.21.16.07.36 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Dec 2021 16:07:36 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 18:07:24 -0600 Message-Id: <20211222000725.38266-6-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211222000725.38266-1-rcombs@rcombs.me> References: <20211222000725.38266-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/7] lavfi/metal: fix build on pre-10.15 SDKs 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: noQZXVdBX5+s --- libavfilter/metal/utils.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/metal/utils.m b/libavfilter/metal/utils.m index f831502065..f365d3ceea 100644 --- a/libavfilter/metal/utils.m +++ b/libavfilter/metal/utils.m @@ -29,6 +29,8 @@ void ff_metal_compute_encoder_dispatch(id device, NSUInteger h = pipeline.maxTotalThreadsPerThreadgroup / w; MTLSize threadsPerThreadgroup = MTLSizeMake(w, h, 1); BOOL fallback = YES; + // MAC_OS_X_VERSION_10_15 is only defined on SDKs new enough to include its functionality (including iOS, tvOS, etc) +#ifdef MAC_OS_X_VERSION_10_15 if (@available(macOS 10.15, iOS 11, tvOS 14.5, *)) { if ([device supportsFamily:MTLGPUFamilyCommon3]) { MTLSize threadsPerGrid = MTLSizeMake(width, height, 1); @@ -36,6 +38,7 @@ void ff_metal_compute_encoder_dispatch(id device, fallback = NO; } } +#endif if (fallback) { MTLSize threadgroups = MTLSizeMake((width + w - 1) / w, (height + h - 1) / h,