From patchwork Thu Sep 30 13:40:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30851 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp418953yba; Thu, 30 Sep 2021 06:59:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyhYQ3UxcIA2bsOYHu3lLfnQ1bsf0af/GiV6smduQhDbqm+ZL+sTSO8iqr6Dk0Fyd3Ik1J X-Received: by 2002:a17:906:3796:: with SMTP id n22mr7258129ejc.552.1633010350840; Thu, 30 Sep 2021 06:59:10 -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 fj2si4050745ejc.474.2021.09.30.06.59.10; Thu, 30 Sep 2021 06:59:10 -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=Ydv2sqCB; 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 E996468AF0A; Thu, 30 Sep 2021 16:48:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065019.outbound.protection.outlook.com [40.92.65.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C7D968A9D3 for ; Thu, 30 Sep 2021 16:48:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mdAeC9LKJUBdYYn0e3JbSXQqV3F6+xksCHtKHRg9PU9kp3ZajaE6AgV/17eiMaXq6HvO+jqhcrA/sRokN1o5OXqHVmi7sqY/u15Bj96Pxi6krsWCi4YgnqU9psuQcB8m1p8paewVCe0yH2eHrBirj22SqDOzzELKwgVnlOfci0YhujDvyFBMCpHKP+iI6kFLzYQfWXZm5w1f2pcC1j5LfSVzYnnBzb2lFHIGGAypE8oPN44aFq7b9Vks+zDMuhC3IJ2S2daMhdLe9FXnvqD+EZSXgcNH8or6XIgg75+xnmuhguVDlbMQkjrdfoEhNE6VZz0xXV8cxyNTcmHkaB92Rg== 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=u0fZ1QFWyqRQFu0xRNuadb2fbgkNsdFL8mQDBWPZuZg=; b=LArYpxocrXtbOfwg4pT3956hbbEos4iccZbv1DPCvJ8EjTipGBhqxnFiuWdtxW6Lmh9kNS3ySsfqQRBHhyCDJvVUXtfIiJJOBLaylOMVSVidItJko8Mca2zEohhiUIW5LLCxlndA2H5mOSwqf3EJZLeaayfTgcGBvLnjx2Fjssu4STkeC/GEFRQmuMb/JZH9/NcgCA0QPm0jX263Z0yMXA98/H4Fjk3u8PGC+q+ZXcY4S6FVzkE4hDdNwOLkK7fqIsw2AvuRqLf1ToMhNr0CTA5mR7hgCjQotmkrYi/DmmmJYKGii4CjOFTFua5IGObiFfz6y3MA4MAmTLNU/RXOTw== 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=u0fZ1QFWyqRQFu0xRNuadb2fbgkNsdFL8mQDBWPZuZg=; b=Ydv2sqCBKm/lWQwDaiWReUvNyiY15F7oJAyURyLez3bm2x2wbrokYC5QC3JEyBN6G1Jnfg5/+8WZnPaJg2PtLOkjpNTDZlad+F5C6in4rLqFusCMQWh7AfDbq7iZ7a607UPs9j0RpGF++lPB/IDVpBC5bI6m9gQHj1WpCH/XziHaGjEzD90VOR3tIRjJzlhX31O9xuLTcDQxNl1fAWUZux6aEc9ZowcnglaTT2OeRpf8NZaw3lcUCBxgQaPSMzxcV9JJXZ1IAjqjfWj/REJksvh+iuGS92k2hDPQhoUgnAEbda2w3o7OBfL9cNvlKclwXkq7DT2v6Bfet9mFpFENpg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6379.eurprd03.prod.outlook.com (2603:10a6:102:71::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:48:22 +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:48:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:19 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Scgk5DJfsuKLTY9ggGIdGT10wruFIrI2] 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-77-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:48:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f24205f6-4480-46b0-b0d1-08d98418f805 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbN6ihUoa1XKENyZzoOq1vXa7lF22yaYkdZMW+noRz/7wrZNpstG8WnTGIBo4t9vLE1I1AoMUcqex5Ug/wVfmMcq/Yy9rUDggmx2TUBITzGXMnLcixaf59ZMrt2dzaMgDt3efDBlGCmGY8y/q6CZoew3mkuJsr3ul5eZqnD9GFCxChXVqdO+s1KWoJv51Y+5LaX9PBYlB3Mg8JL7ahD3jTeS+z3jG7yBzOc8fs70/e0GXls20oMengC6ZW5kPLSBzgT09at8QsRrl0oBCMU7O0sRh/AM9vvAKsLbD8o9NF7Rn2BO6QNWO8XcEpm+fPVH+erLEY9sQvZ+NXj8Rw92yFhBTdM+ULLvvAX06eNp2uMWVpkHVUX4u7mqkAkcV821hVSJEN7iw2CLMXAwgRN9uG0jbzhyZPaEfsgQlTYKXN7n2GyzeynG8nB+qQ5IL3RsjBGFNIIVarhGPkYmVXfVXfXvEzqUMj5HhU7R03xGjzBHjxfm875MLSs7310IIGT4NE3hWyBrvOzz3xoN654WSnKe0Y7ZHCGjHtpmDZNPvRiu56WzWvERTuedPQS3+BAq2cNIUF7hJh2NZMien/Fp16aN8NRc0IK9shCNVcfoiavBlafSn5RV3qD+UDSGpQ4rNd98Vs3ABunxZmUlrSNaEyi5AYFnAn5VqayOolvP4QimlRF1HYqinp0OZocJUesqUXGaAKrgrOyTv57kx7afg2zCqjvHxV7VvHo= X-MS-TrafficTypeDiagnostic: PR3PR03MB6379: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pcpjCfP9zKQ+AE/iBC9orj5Ch0XKTx4zOGcrg0v1aX3vsukFX6W4mpgPWWf89AyZMVxrneIDV5r7gMUVl5iDgFZzmUGc1ye4F8JqpyRBFkv6xnuVpsSbjeDmCn3F3Seei77D7XSU3D1kRfxPGsbXRT56PhP1B8MBYvkDdOYbzznEefeT33SXWQemJvPQLJiR+kgGrtb5oejAQC4bwtSqTiswDbdqnl0YmV12QApwAiLQyb8NHc46Q4fbcNwtwAW1USMZNIMfVoxPq7akwXBE6XCxiJdFgQ6ryAnSjGgiGqZvSxdPAj65XnTzLoZs5XF2tFuunGP38lS1rBZvfcQflFi7YHWFmpDlJr8IrkUjmqVvHYR3cXYSb06X5lDuTHk4FscS8uileiyfllmPmkEG7cMHcNsdeJjlV0TseiRHXFD1cevya2zqmNielC4nie1Z X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0B6pLVOdKlZWMtNmWA6g+0I3W6h8oAViyvIFMRNNK1sLwPWWWF0mPItbsuU0lwirZfLa1p/K1xWVjJ9txKuhUiJowgkojrxoR7/20/Z1Md+SLCQRsVsdQJrAanODu4ZcKWY1jhBrRNK95tA5r4XqrQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f24205f6-4480-46b0-b0d1-08d98418f805 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:48:22.7040 (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: PR3PR03MB6379 Subject: [FFmpeg-devel] [PATCH 078/218] avfilter/vf_hsvkey: Use formats list instead of 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: Ov+4hhhHlaX9 Content-Length: 2277 In this case it also allows to avoid a runtime check to which filter an AVFilterContext belongs to. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_hsvkey.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_hsvkey.c b/libavfilter/vf_hsvkey.c index 30dcbfc029..7f2f191baf 100644 --- a/libavfilter/vf_hsvkey.c +++ b/libavfilter/vf_hsvkey.c @@ -244,9 +244,7 @@ static av_cold int config_output(AVFilterLink *outlink) return 0; } -static av_cold int query_formats(AVFilterContext *avctx) -{ - static const enum AVPixelFormat pixel_fmts[] = { +static const enum AVPixelFormat key_pixel_fmts[] = { AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P, @@ -275,12 +273,6 @@ static av_cold int query_formats(AVFilterContext *avctx) AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_NONE }; - const enum AVPixelFormat *pix_fmts; - - pix_fmts = !strcmp(avctx->filter->name, "hsvhold") ? hold_pixel_fmts : pixel_fmts; - - return ff_set_common_formats_from_list(avctx, pix_fmts); -} static av_cold int config_input(AVFilterLink *inlink) { @@ -333,7 +325,7 @@ const AVFilter ff_vf_hsvkey = { .priv_class = &hsvkey_class, FILTER_INPUTS(hsvkey_inputs), FILTER_OUTPUTS(hsvkey_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(key_pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; @@ -374,7 +366,7 @@ const AVFilter ff_vf_hsvhold = { .priv_class = &hsvhold_class, FILTER_INPUTS(hsvhold_inputs), FILTER_OUTPUTS(hsvhold_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(hold_pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, };