From patchwork Thu Sep 30 13:40:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30757 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp695118iob; Thu, 30 Sep 2021 06:56:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbD8Ch1IU+EwanXiZsET5oiysqOjNRdM6GKyGPQ4CfoYBw0FSuZZcupvM4xNkdABb207ji X-Received: by 2002:a17:906:4482:: with SMTP id y2mr6865517ejo.484.1633010169475; Thu, 30 Sep 2021 06:56:09 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k11si2790436ejk.702.2021.09.30.06.56.09; Thu, 30 Sep 2021 06:56:09 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=J69nYRke; arc=fail (body hash mismatch); 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=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01442689FB4; Thu, 30 Sep 2021 16:47:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075051.outbound.protection.outlook.com [40.92.75.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07EA368A9CA for ; Thu, 30 Sep 2021 16:47:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A64ajT3RYeHHVopMHhPe9NG+f0aIkou7zBGJJJksQ84oB2sT0iwMVVzhZcmtRmx6epPvt88vppRwrW2AFmtib6U+PJr146tn2TrATUbm9yASqE13p1dMDvKhpqWsjw9ldO6192zKRUNKRrj/Qn37WXTtug91svtV8kaI6C8b+ijw+1KizmiNKFDtXQWilZE0UklTWpt4oVjoIDnL4L7zoqV7R6d/IKLUiKmVGLHKMdxTxIKeH3nXbfsHqFd2scmG/cK0yG7lQ0NSMauqnB3KWsQEmrhHsKd8cfHvmbnpgWcGBl0oRBZKCV4r18Aew6T7DgWg6e/+uXqApusjooeK9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=PN9ruyU+xi7JrwjdsHqRLtofH5rpwQrjavOF6/Qy0/E=; b=TBsvFTV+j5fyeS4ABEdXBXtvPLwBz/gv+Edbt+tbejC3Jqu5YS52Q/jwVDbJM4KsaSwOVXATBHAwvtohilbkHTcxzs0JpFTUUvORouOPWiLzjzFrJ04PrhfHUl6/ozlwRK4OL+sSg1iUbml8z/SWK7u2Upys+zeNaGyk5cQzdpr4CZUjngo1KDRRkh67FpNDq716dGfRFfX6djiPw+JElvCSM7sR3zG758jVwS4zyPX/mtZIxIDtVMqOCZzYEKoeRaGZkw4As/j1R8j8p43zFyZxXHqDdlaS/ZgXcmKZ08YYgRSRPmq+6VU5Fm9TnN+yIy1MUkzw1pKw6W4um1HPqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PN9ruyU+xi7JrwjdsHqRLtofH5rpwQrjavOF6/Qy0/E=; b=J69nYRkeqeOZll6pz4tMZUrBjAlyicmwFrSjFxrErko/10cryONeNLC5kkTH29ISNu6Nwz0GO3uBr4HgaI3DkNG/WL59sLE89XYMY25XXkYF4DkPWdDOE49AzS6m/mEiYtwieqoTcz9o7594CGp9OzkJ/OlQLDWO+3J5XALo3UGOFnO2ZwACkPb9uLKBaF4McfJ/OFAO+p1e5mMCiegAcbVZqXyUVp8/guXHmrSYOoajZCfnFcdpVVylwap/dDZVMLlsoVUH/k2mWqqtyGmfJUzCBY1MlNMUaGcUkOdb4QYjSYuh6wkVPwubAxsA7Oq0GXE7nl24b6YI45eJ1Kmp7w== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7071.eurprd03.prod.outlook.com (2603:10a6:102:ed::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:47:12 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4566.015; Thu, 30 Sep 2021 13:47:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:05 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [nGX8XwalcW8P3BkHGLRh5gMeqcIt51Pv] X-ClientProxiedBy: AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210930134239.2672698-63-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AS9PR06CA0306.eurprd06.prod.outlook.com (2603:10a6:20b:45b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15 via Frontend Transport; Thu, 30 Sep 2021 13:47:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6d5b97b1-f72a-4ca5-674c-08d98418cddc X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0bPq8Fe5HKsw18diqdTey+yhBIDY2kfHQfQWLh9ScBddx3ixeiES+CDDwevHlYfYKGJmmPGstpzjcKsPs0nLhRWxixBipx1HooOcb96PyM9wMkDYJEU7ebGzQ5nqCRadASQaEjOAVbj2EfF6uAmopLNKmyCadokxRdsOyUtcsfTVBvH0HoffaHqQwiuM586+grw9FHmf7NsX6rr9fHXw1WKUPOraXnH1j4yKh0iOr54dJmPgyKTROGjZIIvkkxCwt6boFh8dBNPpAsfkzqeF40GdfvxRLf5O6fQQrfXgRWp3eEdQJ9AC5QqFfmXlS/m30sC0HCy+L1szJM8F9yTZVPAucwfqUhdLbAGd9mtDgCPvx0+IWKmmBhrwW6CG3fzajZUVdwYpDP6yyY1GLWiZ0LSnON+D40bfLoSuJ39iQTLT4qPETuMCVZS5aPZJwt5F57XECVuLL39aM8WbMmdNOcuWMBaH7QeVWiEMSnXVjhT4mMqe087SwaYFqQEODx1TdnnOFTiR8ql5DfcmgQQDFw6s/NJBfS/dxbCSLiWJQIl3Ia2KaTEZZa2tAQgm0vQmp4Ocu0ycf50UYBsB/kVIafcLuuZTxMLPJXyH2rfzUDCGynmr4KRyuEan9NUafGSNSXWP2VrXxgrej3FlyDh58Y6/T8VmZdheMC8XJuaDrrcjF9wOxAlCogIA5QE0fF4twM= X-MS-TrafficTypeDiagnostic: PA4PR03MB7071: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nnCn10UA2/p/ARr+mJBu+N479wkSvx3Xw9yrlObTU52ZYRmSNjGlt9qlzJoahDbkuHKRd3iOeewAp5fHN7N+ZRBYJZM+kPVYHzBTY7oik6dUUJs79vEi+Okq76zahlQSyg96PK5PwnZtjuIn0EPWarZ7KyokvteqGkYgZZl96TLSYCpgoKjwCgRbYIGqlQa2j2swJnuJJIvQcIbW4HDZSOiqVqFnaZOtARZV80MIjO9GinZKBqNAEe7G2lIubOjxEyx9eASxdI3cTT1Jump6VFbC+flf4gZvnjPRwF8nrwkAmQk8769C+N/x5Hy/reHvkDRPiKjJoarBm21GKb8GxyU7k19GWLip2ZkthAU9oTr0JKxb/nvayDTeFZbDpa/e02C0U1hs1bfBtYk3WdPTc1hd+Dz1T+1NGXEOhb5rCEQ8+w1uM/XH81gkQNNjPfU7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yahv0Vsx7oopc6JSBjuZW2N1IyZjTqyJmgVu9mnKk5qj0T3zvSQ2zFugcWnRWMZrEadKAJcTdCuFTgW9JxsjzrfLdujXQ9KLcFJYk/WC5gQ4OZL1BCdkfHp2LYcjAWQkCaW46/2wbLnom2RqMmyD8A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d5b97b1-f72a-4ca5-674c-08d98418cddc X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 13:47:11.9691 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB7071 Subject: [FFmpeg-devel] [PATCH 064/218] avfilter/vf_coreimage: Store format in filter, remove query function 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: omGW1vfg3eRn Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_coreimage.m | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_coreimage.m b/libavfilter/vf_coreimage.m index 4e1f89ee71..24f84a5793 100644 --- a/libavfilter/vf_coreimage.m +++ b/libavfilter/vf_coreimage.m @@ -135,15 +135,10 @@ static void list_filters(CoreImageContext *ctx) } } -static int query_formats(AVFilterContext *fctx) -{ - static const enum AVPixelFormat inout_fmts_rgb[] = { - AV_PIX_FMT_ARGB, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(fctx, inout_fmts_rgb); -} +static const enum AVPixelFormat inout_fmts_rgb[] = { + AV_PIX_FMT_ARGB, + AV_PIX_FMT_NONE +}; static int apply_filter(CoreImageContext *ctx, AVFilterLink *link, AVFrame *frame) { @@ -629,7 +624,7 @@ const AVFilter ff_vf_coreimage = { .priv_class = &coreimage_class, FILTER_INPUTS(vf_coreimage_inputs), FILTER_OUTPUTS(vf_coreimage_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_ARGB), }; // definitions for coreimagesrc video source @@ -650,5 +645,5 @@ const AVFilter ff_vsrc_coreimagesrc = { .priv_class = &coreimagesrc_class, .inputs = NULL, FILTER_OUTPUTS(vsrc_coreimagesrc_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_ARGB), };