From patchwork Thu Sep 30 13:40:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30763 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp697274iob; Thu, 30 Sep 2021 06:58:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIjPm3c8nNPafuixLPaFhDfwe4SshUh9JDDKOt2sDJIpETtojlAOOo8fubTnyT4AE34Io0 X-Received: by 2002:aa7:c78f:: with SMTP id n15mr7515751eds.338.1633010326334; Thu, 30 Sep 2021 06:58:46 -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 nc14si5985076ejc.445.2021.09.30.06.58.45; Thu, 30 Sep 2021 06:58:46 -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=OVAzqndP; 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 1C10C68AA3C; Thu, 30 Sep 2021 16:48:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2055.outbound.protection.outlook.com [40.92.90.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A54E268AEDA for ; Thu, 30 Sep 2021 16:48:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lfphvUi/xrASecpowoPsA0DFwgUk3LwXB3k2BDQdptWC0GeQYocbHJvKk9MJ3Ox+omMqI1AMpVzKCkBkQplseXYdobSxY66oEYdMYqLtD4D+4w8w8oKzvHL27hhiFDxOYH/bu/OVA0gb7DcmM9Yov9HPJ3hgycFIFc174ouyFRXJV0nRBjOPLtoOq0pGjv1NJn4g77XzWeHGoQUQGmZaoNTkxurrMtDUBNy80l/Bh5zFp0mH7T2RrqbRW6sdVk9LPyOWnvPx8aN8ff44+/49jwvXJpT1BsVyusogCDjDicdpJDCc6S0RvVJzvuKVjZAXsYdJNoLPWbeC2/fBBhLwCQ== 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=0/iikmQYElCJfUzh8dlUXEhtBKPzRKTKwgwQ7MUoBv4=; b=HwF6CZFxPM55EJ9feh2Ziqc2hGDgrivI5RlpAgyMInqkI9wzIS0BtRuipZFrv7tCnJ6AX2maCnNwoXYtWo2BJXXt3oa33uPE2/Z2swwPNDgq8N6LeNE3TK7rAzqawTdw5ZYzP6WSejQ8jqjhcDHKYv4Hl+3RWL9VBh5dj9m7SWiDmGFz0/RFKWXVBnDLLfVhDkhfwx67RAILq5+8NZN95RXOe4hlyKvYPkvSSdW7fEui34n/Rjo5cfashhsu1W7d/NkmaMmL3JNZztvNJaVh1nFhyvmg6XM/MQbP7106cWZ5HvyvXReXRrSvPQ6oljL1wWwU/SohzWxutfTQaO955Q== 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=0/iikmQYElCJfUzh8dlUXEhtBKPzRKTKwgwQ7MUoBv4=; b=OVAzqndPBMk+dwIla8ZaMazXRa2hViklq6t4XGr1nbUa4OROvoQctcRARxmP3cApVN05ZfRScgMECNrKxi5yGgO5cAaZADAl1TL0IfKF7lfbVDXExAFMsm2uYFY3Z3p13pHFdv4INBWUWpoGcm4zo/DOHEistmSyQmZpDkqSK5+BflaSOyo3cbqDxYVe/vLQMS9GgPxDkSEaEZQtqW1yPsFb/QPQF+zQDuq8rC2SX959HkJmeA+O7UqPYrydnLVQ9iS7qBvqsLZUoOSWRj59gS7hPGphTyCRZIGQmbijs0Fl9HQciihZIENGoxJYIU1ywXR4RtqkbimKZGUkjK+IDw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5161.eurprd03.prod.outlook.com (2603:10a6:101:1b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:48: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:48:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:18 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [KXGRywPs61Ijf8KXSFTGMREftT78NVdP] 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-76-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:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4037a436-0050-40ad-f09b-08d98418f229 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbN6ihUoa1XKEHKVtHuCgoRLc5LJj/CGFSQvmfCIhHHj3HyWwUteOQRr+ADG+WSaeNgvLIsNxlFcvLRnROv51evm+3QVdXOVAsWxXNZAgOzCOE2qv/ZzBRjliN9vIBkWmMaDcZ9t3AGcbCeBbASgyrStLre+7ISazShvANwSJM0gW/yNHxag+1ReywsEzTk1UXh+ZEZFXx2nW2b7+K48qN/valxGmF/Nd1WM3jbP8g0m7rgmxgAb+1MQ8QS/cWi7QIOgmlwStdQdrJDhHSDlYv+NVgkSncBkKIiPbMA1xEVcvavzjzWpswmDjbHR5YXZP8Ew2GaDp9Q2YWH5pFB8HRlcwWqdhCC16917hyDXG1smG4Ixk3SxDrpcQTMhlZFXsnT+RiDwgVac+m+4KwJnsNF7moHkTtDMnKJ5pycysY6d68x+tyG4rqjVhQtrzHmk7EMbIAbeTBB6gwjhO98WSnqd84LNjTpZ5XehF8Fz457zuafuVtUvHFC7Ft/PMDJBRoRcMWdEYE7qZTxaMumajfS+rOos4AHakfsmVjZ0G9WWWjlSQyhojHZbarjMKuPGfsxXysZnGuE5r01WUpxUZPUIC6kAqmb7Nei770mUaOqZaKLL3aqJUUA+bB93egmFytoWxogbPV/QdXW6LRg1jmHZIzsK+GGCUns4vbS/gGDYGY021WlN7bDYrOV87MLlbuYOx0lU1dqYgCi73GKokKeqy+XTh2o2aT4= X-MS-TrafficTypeDiagnostic: PR2PR03MB5161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N0SLJShqghnDFDRsFJtcaogMT3oUEjoL9/rsOrMFgmxr1mn18Uj7RK6hpAKyTNa0V4O1iZ3rrDQfCg/IEPpTOVIDmHxxnB2nWznD3Fb2vv93TU23AHPQ2vcCodX/a+sSZlivnbiKAZpCDMJYi1zLm53mQnCVspCr6fs2IjiCF2taXeSTDvLYOz78nz5zH//qOQCXvB0V27vbG4UvmgI57DanHQr67v5PcyZ59ncwItd6KXVNlMzUqpnNXTjgn8JH0UAScFnUogaP1NmOL5/9N/cVWhbzj9wEJAdBD2GSvpWWJHIvsZWXu0ef074t7sFkobShsLOp7r37A5BYT5W+JYPx2BZ5f+nonzJk4p7z3m4HyvCMAqUeTW1C/3oEFLhFQd987ZCP2kyoWpBvEMY1zXcZVIW0hu7penFvoX8nSBLIBbkbFUlXpn3Sq0DCCwJa X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VSxybAUxCokKASuLt/enQeiVmCeygh/vpHNheyzH6y/W9hnJf7PBDFDd3Q8FByXpOYEsZXHFfNNyKyZlUHjmKZV/B6l5hhHFLitHt9JDz2AWcnaF68Wr5Pt4F9us7p7n0fB6pj8BKk0rYoHB10PV7g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4037a436-0050-40ad-f09b-08d98418f229 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:12.8523 (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: PR2PR03MB5161 Subject: [FFmpeg-devel] [PATCH 077/218] avfilter/vf_chromashift: 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: 1lG0ktm+JQz2 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_chromashift.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_chromashift.c b/libavfilter/vf_chromashift.c index 18e362adb8..1e85530485 100644 --- a/libavfilter/vf_chromashift.c +++ b/libavfilter/vf_chromashift.c @@ -52,8 +52,6 @@ typedef struct ChromaShiftContext { int (*filter_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); } ChromaShiftContext; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat yuv_pix_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ422P,AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ411P, @@ -75,15 +73,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_NONE }; - const enum AVPixelFormat *pix_fmts; - - if (!strcmp(ctx->filter->name, "rgbashift")) - pix_fmts = rgb_pix_fmts; - else - pix_fmts = yuv_pix_fmts; - - return ff_set_common_formats_from_list(ctx, pix_fmts); -} #define DEFINE_SMEAR(depth, type, div) \ static int smear_slice ## depth(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) \ @@ -447,7 +436,7 @@ const AVFilter ff_vf_chromashift = { .priv_class = &chromashift_class, FILTER_OUTPUTS(outputs), FILTER_INPUTS(inputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(yuv_pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; @@ -476,7 +465,7 @@ const AVFilter ff_vf_rgbashift = { .priv_class = &rgbashift_class, FILTER_OUTPUTS(outputs), FILTER_INPUTS(inputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(rgb_pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, };