From patchwork Thu Sep 30 13:40:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30751 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp695528iob; Thu, 30 Sep 2021 06:56:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUmsu61o/300wzauZEbIgLgzqr9FcUTjW3duCrwjVmZL/0AmHqxuYKiRyGVX9sbZHMRkZO X-Received: by 2002:a50:a2a5:: with SMTP id 34mr7367013edm.150.1633010199244; Thu, 30 Sep 2021 06:56:39 -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 y1si3578705ejk.130.2021.09.30.06.56.38; Thu, 30 Sep 2021 06:56:39 -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=SWnzuY7Y; 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 8AD1C68AD3D; Thu, 30 Sep 2021 16:47:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073014.outbound.protection.outlook.com [40.92.73.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E43B68AD3D for ; Thu, 30 Sep 2021 16:47:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z8A+nRg0TeFR/09BogbS5EX43ap4VZTDpk3uqo0qiIgMWtDsYU1PwAscCR5s5b5cEPAFEY3Nvf4NHs1DHnFeEuAfPRMUf4PaqGIoeYdpk482B0CQcxDdOzpJg413llqKl984HrhQUKFVCvmAB6bBKG5I9HwPz1JpE7/EIjCN6K/AkbClFTpgOEJZX2hEiXgVqM9O5zDSiY7ErgmUs+LQzLm65C+v3Fch+aSHSMv2HrjjSa1fC/tzpw94Ac4eGEAr/mf1/UJcXpoCJ+iMTu+jOwEOtXsaIUipM9PziFmPgJyVq1xdsZM/N4yCJRuemmPYCJtzQfFJvn+W9IOGjGFMIQ== 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=dkwZcNcDRDzW4Kg0iPulVZrfup3QPqr9KcKhglXQStI=; b=aarF7ORpeOU3TnGpmUjwoSUiu2gU2iHIgldfIZ9k4mWC88G48DwNaJiQVZ3/kUgCIXNj44xiU+GFMtSZff0I4QUvVjTeh9ayOroHGTN4oWnhhGMEODAWMFota9U6HRlzmFLNLIAAuxwkwn2aCWkkZgvBaUG9EzNFa5avKhEKxJ6t9vL0R5J6f1IHf1doXzfuaLA1NlL0Tis4oq9k2/rrzR5te4bzvP5Nx4UTqbvx1ZXAH7cY1Zl6XS2c6rkV7kI4qyd7fd6NwJWnWNC6n8J8CPYFygXye8vEttuMuGKoyruB1uWVwgBLUfg0s0dDISY+nQa3YE8Ivundb7LCbp3lMA== 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=dkwZcNcDRDzW4Kg0iPulVZrfup3QPqr9KcKhglXQStI=; b=SWnzuY7Yv7v27V+icU51bUV/6BH8YmKUPZQAl2+uBA6OPFLq+FIhsczdDadYUupWyhvmixdIFGsiI3FM54T2yloEGQCxOIPcHtgLevX0mY0mbmUdV1Ef+bCt0JaOHm5R7XTm4MG4zVxqVjP2u5+aKUvACv5JUJMYd2ns5nccNA5i/v7GG8I+9MM7Rc7ggpDq6wrwKzlbYA/9ukT02+Ko/JAR0x2ixjGibgWVOhO5A9ExevyGxv0j6mW06IiO9q7Azu2xdfahs1v5xXGCvhviGImq0fXPijBnvMxB86jJxI9dh+VSsme8KcQ/tg9B0mJoscwmPcpQe8XzG0Xafhet5Q== 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:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:07 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [oTZk7JGn9IhlLOhhZLxHRjtwOXC0KUHt] 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-65-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:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 003ee120-c0b4-4421-4ea5-08d98418d46e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOb9dbQKGMX4drG6cE9uaLQiuC0agA8pi5+QJF9/fM8naa/a98ph6j6FShKFM523JhEP+1S5KDcXJXxwLXBVsLgksQjo+kkOrNyaL50p2cBo+1qumpVOllr7b9tJla/r6d8MEK5t6/z0ge0yeW+57dCqwo3SfAiMhc3KpI89sKJNGvwWT78PR3pXQSbh426QEBgW56FKrFaeXCu0WXI12I21dpAhd2H56zt8oqsGbFmDgyLVN0Fw1aqUgbGfzEGVnrqYte4lN2gCO0ItbDAH7X2eZArWv288j9PG7S/6ceQ1+ykitdwKNyV1UlZpD7aiIrZbhAtLSmWy218z+8W93eMBHg6HTXh/GzWTGyfcnOExt0f8P09W6/ckzy3pQ1SkP5tl8D+9OtCjR8pjhoIiPuMww6Yp0uFZpLcCliKkMiIFFzWRhuZlx8iBi8dxhPqexRIf6W09kFZl6GPrY/MYfHGdglDgd3hP3jnFHNDo7S6wpheY4atfljXjvS3ztchXie6x1O1fvJiOe8W8u7tdjBzMSmVaxsKoBLt3VRGVqAYXtJ0dLk7v94Hk7eutcfowj/gsAddvOcMbgNqI0WSb+jLTb9o9TqJtqoMW4wDHQqsd5bDmFGoHvTX7tI+xSN0+RriV6/Dvj1hHF7omqVaRz/v98S7MDTxR70n79uZte7N53X5ZPBtweKT1EsUf0JMhGbuzgG9Hq/1Q5G4odOXsaiTc/nHP15cWZY= X-MS-TrafficTypeDiagnostic: PA4PR03MB7071: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fzv03M4S34iPpDWYdI03Pt77EJkNoy/lhgZfCIljemAovfi9qejXFMCREX87J50Z6M5V4n4HfSp/RzDTW6kbD/0K8dfxvgfB4JZJFrNbTPIcFdR/5NszBq5HJEs0CaOzsj7OxEmar3RTzdILv2dBHNTxtCl31MuHA+HvulsPk4LRvcF2HqgNuhqcSOfWS88osJKvvjp6WwIvSiNq2eN+HBZ8ohzyF3iC48o+H23tUrNHG//BzuOf1QmruK+bw+gZtYlLxkzsxb+7tm5ovgNLULAtRZ3HJK587qjicOE97PO+rgbgJZELe1zjeSkVm0ebeTykfg4VY8AP3raus9KZHKz4ZNWHIjkp1N62rc2ve+7dibEFKaficdAIlXj/7oDe3fWSv7csKVFw4tdAxDrpZTKpIzw2dkLm5CPokZoAzeISVH+Qjv25wvnIAkCbHikt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VeO6YEBG4FWeiWD8aUn1V44qiyCPShvZ6vuzYwE2LMUtfCT5lacFmZOonD6dIyDGRemtsY9m8hRtow5vMDlKjAw/sqHUxmrT3t6ENifZymVuHRT8sqEYly2+xhgmGZxYxKyzhSVNlYOUF00qMoAToQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 003ee120-c0b4-4421-4ea5-08d98418d46e 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:23.0673 (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 066/218] avfilter/vf_curves: 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: cMSik7F1t9xV Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_curves.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/libavfilter/vf_curves.c b/libavfilter/vf_curves.c index 4aeb9e36ae..22a1f8aa70 100644 --- a/libavfilter/vf_curves.c +++ b/libavfilter/vf_curves.c @@ -513,27 +513,6 @@ static av_cold int curves_init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, - AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, - AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, - AV_PIX_FMT_0RGB, AV_PIX_FMT_0BGR, - AV_PIX_FMT_RGB0, AV_PIX_FMT_BGR0, - AV_PIX_FMT_RGB48, AV_PIX_FMT_BGR48, - AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64, - AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, - AV_PIX_FMT_GBRP9, - AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRAP10, - AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRAP12, - AV_PIX_FMT_GBRP14, - AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP16, - AV_PIX_FMT_NONE - }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int filter_slice_packed(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { int x, y; @@ -817,7 +796,19 @@ const AVFilter ff_vf_curves = { .uninit = curves_uninit, FILTER_INPUTS(curves_inputs), FILTER_OUTPUTS(curves_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS(AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, + AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, + AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, + AV_PIX_FMT_0RGB, AV_PIX_FMT_0BGR, + AV_PIX_FMT_RGB0, AV_PIX_FMT_BGR0, + AV_PIX_FMT_RGB48, AV_PIX_FMT_BGR48, + AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64, + AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, + AV_PIX_FMT_GBRP9, + AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRAP10, + AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRAP12, + AV_PIX_FMT_GBRP14, + AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP16), .priv_class = &curves_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command,