From patchwork Thu Sep 30 13:40:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30739 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp697004iob; Thu, 30 Sep 2021 06:58:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyE1CP7uRtOD2Pi9VV2zifgF7EK12RdCwccG2iY8EWEA4Ok2TQLnASb7awDY0pZWIiX6fdq X-Received: by 2002:aa7:c2c7:: with SMTP id m7mr2075781edp.339.1633010305575; Thu, 30 Sep 2021 06:58:25 -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 g14si488951ejb.50.2021.09.30.06.58.25; Thu, 30 Sep 2021 06:58:25 -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=klCM0jgi; 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 36E1A68AEEB; Thu, 30 Sep 2021 16:48:00 +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-vi1eur05olkn2049.outbound.protection.outlook.com [40.92.90.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 952B868AED4 for ; Thu, 30 Sep 2021 16:47:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ru+REQd50Ab9i7wo7aTWjFaqAHRi3CMRbFXhgwJteEDpJnWZIA8OMDNj/LhpGdHkZXWsMGGBWg1OW3tdICIM5XlDS8Fihvj0FWdfvOQp7LPwMcoTcBYK14IVPGtxS5OsvTHaVNFyTq34YtOnAzn9P85Vhxl87O72ZHdaD+9SmhurqjWxbLcdiAuwZygQe19NVYZqA7c9m99x64G60R7LQa5UlC0cB3Dxy6z13Z+qOAMHGsK6Msc/EH+fPOEsjjNTJTWi125RklEQz7KYBgNXxvmkhSW0ZA8wwfiseKSjwPMiVEtvXhQqNprcjoueo1FF0iVNBLYThDLMPxFbLdGlPQ== 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=kOQGYKIU8fW6z6boPQeu2ZLb5KErpG+Noc+B9eTHrNE=; b=Sbbg1LtOyRZwxOCjbg27trjjQWm49x8UxT/pbZ4FKK72oDRfXthhpKK5Mx/H0NKrDkpFx+VN0h+vopwjEY4Lal7VlmttkkfkPer2ZK5cNn5JIyh3lHbmK4lojO+U7/dxgwvvuxqrgpb1pr5P2dKW1yL7xX3JhR2ErB4AOBLa8CrxYb+mvfF8YBnji7iFp552R7b7CKWce2XGtVi8cH6hAIcLXDnEE633ZoJ6l3tKx9MNPcX9egAyg5kaKheTMR/xHCC9MOybmlDbIZ3/nBCoUg3rBY2xTsjbe6xpLcH5FBol8ILXhoUeIUmZ1A0PIVFONpUTe3+2Gv1ugM9tjxCPXg== 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=kOQGYKIU8fW6z6boPQeu2ZLb5KErpG+Noc+B9eTHrNE=; b=klCM0jgiAPfXXbMzUjNYz17x2GYJx9XBVsjIhcTepIEXswFIC6haYpcFS6K/qeGCYKcikkKpAyje9LO+9PhP4N6bZbHMuX0eQpBqMAD7FiFOKbLCrhqVXAZJ5jdku1YJWLAZNlQYIrAdJHT0EHZvOfTcK4P7AEEjN4UGhzmqKiaHLz5gnASyccBfrq5c0Xrph0DEDsfYnsHCKoHtJ5APX1Ae8oR8cK1XO91Ppp+VhxCZmQa00EZgeLulUTCQ2OZqI7ovhea2qAmwJx1JORSeSaunrxj2VVjkyE+lbgjaQfjr1OppU+avvkq+q0SNdy9ungJgQvwD5MdRLnP0czYdkA== 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:47:58 +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:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:16 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [7iKM4I6HYCnmvult8RI9Vf7yu6GGbb89] 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-74-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:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b55b8362-d2cf-4ee7-d153-08d98418e950 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbN6ihUoa1XKEF6d4fLZcynnm9zQ0Sw8YD3LhoYdBK6cuyD18ohh5xYBAIqzv0yL57Bikm3NkWRtsSIvwhbJCarVGA+/3FHPZ25YsI99JWuQo/COTyIDERFy22GWQuF1MkKt1xYxdVbEfMI22Q6vWjAN/W8Fxgn8oMQg5XSr4F1N/SxBSM0blhRJHsd7JcxkQ+sWL1c96W2qxFX+RqFy5LjT6QtUlF/Kq1osQpvtEZ4FdymIETj0KZvU43ADmcdTfbt+pE/1uG+/yfMg1t2dZrXC/Mk1j5+gc6uoNvoPnph66uaJz+oBGQRsHeVa5z9+YQokUaDMraNJ3f4OgY0drXgoBL889cx/ctoAOAugD/OzzmfmJGhqgFZpu2tffOZevRJzPbHK4m1lllp9UPKnrWQzA4iebjJX55+FclGodT3PJaT8ABTQ4zR3JdXxc/SAuQlutkNj3UZw5Sl8kVjw7ocbV2Yz/+oNtPS8dlF4luTiKHuIHBs0D3+bQFLs6lxqmtcTwREI9RzK0CeYKIAJKoc5NdyN7HJ19/m7yIxZ4krog/xp0JvUttLzFeuy38mEAkyK/9N8qPKuG22Z2vbHMfU0ehOQmLI5Mkg3JR/ODOE3BlTKqlNcM/jIYOX2lJyU57op6CIljbsqE5b+3oS1ng53nW1i37n7NaWDamEYmuQuJ22opVCDEFw6lTmEyBGqHklRkb3zn2QWkFQTqUD+tagqgCO+ke/atv4= X-MS-TrafficTypeDiagnostic: PR2PR03MB5161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a7rBNsYguTujovI1OcuhNkqVVeLDSx9PFsDgxvFOhjExUqZbtZsUxA6cS4/VYCOuwx38FS1I1e0+uY9FENNnjYEvvYgbwplH6CfvYWrxhOV8FuT/m0N8BQRzGBmCwcLzKQDyN8Us7n8FrznR+HoI66Aq9oBirInhjqDrzSUp2PtCzXJstMlfLIHlxJfRddDdC8MadwO8jGUrzWLpeKSGScqBPwyv6YnCjaRyoh3nwvx78paiNkHnazEJw0C51u7g0ooXjE3CPhbfGSm+EPWNk3T+b+2Aaj21OvrTgfUIg5M+NHNT9RrfApPuKqIwLeZSA2b5jKnhl5ta27/sQS8OAgq1BnVL70m5qQ2f+b4UmxhyJ535oQQHRjH4xnh6aQFRiXqAXNVAqpnYatlZsY8B2zXVomDJ3T4VZKq0oPFWEBOTa0HQ//GbNJfF4kESVJKX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4QOTmcAW9q01MODHxcodHr4fg2DvZ+uIVtifRNdRl2U/JfhTgPWkh0OtY7H0wPLphfLG0duAZeRAfzfQ53crRNvPPBdYey9I6VjHvhwGYm+u4iMglBRnilD2z8unpsGap7aWRqku5KUsjQ6LwTeKNg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b55b8362-d2cf-4ee7-d153-08d98418e950 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:58.0335 (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 075/218] avfilter/vf_tonemap: 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: LNGkiUkF3Eda Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_tonemap.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/libavfilter/vf_tonemap.c b/libavfilter/vf_tonemap.c index 51f56c7386..363df8034b 100644 --- a/libavfilter/vf_tonemap.c +++ b/libavfilter/vf_tonemap.c @@ -71,17 +71,6 @@ typedef struct TonemapContext { const struct LumaCoefficients *coeffs; } TonemapContext; -static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_GBRPF32, - AV_PIX_FMT_GBRAPF32, - AV_PIX_FMT_NONE, -}; - -static int query_formats(AVFilterContext *ctx) -{ - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static av_cold int init(AVFilterContext *ctx) { TonemapContext *s = ctx->priv; @@ -341,6 +330,6 @@ const AVFilter ff_vf_tonemap = { .priv_class = &tonemap_class, FILTER_INPUTS(tonemap_inputs), FILTER_OUTPUTS(tonemap_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS(AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32), .flags = AVFILTER_FLAG_SLICE_THREADS, };