From patchwork Thu Sep 30 13:40:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30747 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp694307iob; Thu, 30 Sep 2021 06:55:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxewG76s+w55MxYI+cOeSKd0nid+1i/GPpurdNjyUyStMxfw+eHskhEkNSFWsJGLsjQj1Ui X-Received: by 2002:a50:8748:: with SMTP id 8mr783111edv.362.1633010116732; Thu, 30 Sep 2021 06:55:16 -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 dp20si4737348ejc.282.2021.09.30.06.55.16; Thu, 30 Sep 2021 06:55:16 -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=JAo9ybmC; 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 C98A868AE5D; Thu, 30 Sep 2021 16:46:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064074.outbound.protection.outlook.com [40.92.64.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 928F1689F3A for ; Thu, 30 Sep 2021 16:46:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QD5V1abJVYvGlgRWwt1HNBaTaTk7eju63GiRmqcv8quGGRH64hvDFL1vJZO/mcGkWCyq7D4wkTwFcqFZcRqXBqSI7aTccGtvHdumCeOHytzIw0FfDiNqstxZf7e/oM8CxvSy1kEmeS64aGO+daSScf2xGMhRRJX6zzuAtAU3JwXI0FMqOmi0DGShwp+A/yOj58BN7rOp6W/KuVFDgUwFG5tsgga4MkoYkw+5+NwKqkto9E+J9oAC8qXrjr0xjdMovX/H9QO8F6nKaKbk+TCRXApGhBomUWGuk2D1jwk87VMA1kxVBQ1GwhtAJvStnNNDph18hpjx6mTVW/kPhra4tQ== 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=dW3tG9UAis0l+3Pb7J09vEv+v74Xd0J0nNWg4b1mtzU=; b=MNcmuV06maUh63zf7VZR8gawwNoGCl5pm2mt2BQpuYcK2I4W1qc2Z0xbWYjQhm480ZC7jh8KYhvk9t2+T0nTjZcAP8U1C3Klk8ZyTBigWXDz6hdUlvTIlvvLEK/loKV/VDLVM2seMKmbAROYLR9W/1/68qi3RP+2Z61KpPt0e0e1JsFqOguBA9h/HeE6hJkVLsB3JZo/P59MF2Oq4vT3dvire9veflFD8rStmcOlKVrq3rDRwF5QjwyP2oD9w1eEmKj9EopBf96+GYh3smJL/zbq1j4FyDgbjHuWQIpQyhGB5TPTyX+8QoBM3YY09cRMRPRL4rmaTMAIJ1ta4ofAuQ== 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=dW3tG9UAis0l+3Pb7J09vEv+v74Xd0J0nNWg4b1mtzU=; b=JAo9ybmCnRpFoxwZerzDfK/OaOejPVavFGRyLH71TtF44xtW8yfHQ0rl2PY6ZcoqgyLMu6tr0LjOcp34y4y/E/LxzljTV2uLTG1qo0AdSXeOzWp+ZsTf36mduNFi82XyWaiB5XJmRNTYE+2nUIvJCfTPXIOYHfa9wmDrOvtgtdfcDKsbjA2EbLsaCdvFoYnHjZrCQDEOzYToxPa7bAFu9nz51xWcnZgpYUuUCxDPeveXLlHJU5MKJa2VoqPNILkevJCka997ZQKw8nS70boQ+UBrUR3PVcSYJvbg8QWqRiQDmWZyQ2sGZ4Ef7z59crnVvbFuhXzKXd6Spug4qVZmxg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6704.eurprd03.prod.outlook.com (2603:10a6:102:e2::11) 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:46:51 +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:46:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:01 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [pyi9znRUC/zkvGiG+Yg/C6kIGiOS6hQL] 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-59-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:46:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38b017dd-df6f-48f8-baad-08d98418c1a0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymKo9o/g3zytww+bnw7ZKiIdymZJFYD6zFh5KXcGLccYGCyNgmIS5LqvBtI1bToFu4BDPm9HZt4ohojDFDaJXQXfKjMUwyxvumVi9Kp6b1TG2azLJGlKPS1YOomQD7osM5airX1y3ku8kRniOMo2eY011JF+IZphUN1PhgvO7PRP/Zwjc5Hs5+OPA822mV5TGh388MKN6QrlgUQFt1IFx8xRCNkmA24wflx10069Si880DXq7Vi0DZG/gzC3BxAeUkeyWzwCaDbu9Mk8ibajsXy0PJnHeTsDcfdh+ZZ7k0nEpnR4WMI4y7FGGYLBwFKxhenq94MoXORVmBZkJRrV2YfhV3f2Wsv4fJQuN1I3B4U+I6lDDUyCfti9Cpl8+9DaDfxOtkZub7meOGn5rzc4IRZYwqO+q6CLKfgfaHGF1ITeM3U8tzV4hFYQdHe5XiChEZRUrXvBFACVcjgBh5DT3DONhkXKqhc7fGZ73j53mAkzIH+u8XAIET8ttafosxAfzdwT3eRjj/W9FyQ1qnLmX/V/A1RfrWbDIe0C2SlQVHaPkhPnzTvgUYmbogjsZSNCdwE2VpAohq8XGIUPubXoYK2TdRuUVGRNUXG7O4sHxIia5qi6uUoM8MrJ1vJqZFbH07LmBo3Zke8w7wXSjvb3vllyQHpsqAhtBB9RNeYyG+f0ILINQXltYtNO7Y2OqulM/tKG4hdQ7vPmuLxBxl1ErXzxd8mgU5VHsSM= X-MS-TrafficTypeDiagnostic: PA4PR03MB6704: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: in6knNy0zx+vf6CcjBmmxMkkJ0qpQ5x9wS7xTg7EThh2Cmjm/+6Hr7nDEU86mHQmVcHQ0FIPp9rDTb80u9VfF90MtdhpOoH+X+P1txQRhgPla2sG+pQ92N+x2MpbRW6X0Od3172WE3KU+c3OU+Cmq0Lho6lQPd78E4BQ8wSSsCNj2TBapCrVj3zr25CCYvG8mHX9pzH9TQ886BWy6EFDGy+hyWlJaMm0eA+dLnn2Dr1C4sSn8Zf/UzQFMr9qxkZrMS7kVb5Q5TgZJ7T8F5YnHPD41mklQXG+7Fac69GTNn7rnnTahlVtWgiH60pSUWNXj+X2rvZsTutX0fKDPPgF0t72cS9bP6pcaKvk8KHMFDNNjFz0G65Cfj2+35kLzlKUePpeR+bDRF70o8v7fvdJIkkJy6dR9CaUuTdE5loVPyUs9oIbbTKlZTesRy4IcExW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TeW5MdPYONlT/Yet0Nka7uG/9Vi3zR83YIHRrOYK7o0OwzCTVJKr14/M3D+lTz3yLYonRN3Jx5enWJTDHVPsMwA2qRjr+W1r0T8A1M5bcgeIA/39qqOcpT3RB1SsfCyDIpAnPkhv6vq7D/r77Vt6mw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38b017dd-df6f-48f8-baad-08d98418c1a0 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:46:51.6325 (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: PA4PR03MB6704 Subject: [FFmpeg-devel] [PATCH 060/218] avfilter/vf_colorconstancy: Store format in filter, remove query func 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: iMqYMeX43HkC Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_colorconstancy.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_colorconstancy.c b/libavfilter/vf_colorconstancy.c index 9ccb462d0f..ba6359462e 100644 --- a/libavfilter/vf_colorconstancy.c +++ b/libavfilter/vf_colorconstancy.c @@ -636,18 +636,6 @@ static void chromatic_adaptation(AVFilterContext *ctx, AVFrame *in, AVFrame *out ff_filter_execute(ctx, diagonal_transformation, &td, NULL, nb_jobs); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - // TODO: support more formats - // FIXME: error when saving to .jpg - AV_PIX_FMT_GBRP, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_props(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -755,7 +743,9 @@ const AVFilter ff_vf_greyedge = { .uninit = uninit, FILTER_INPUTS(colorconstancy_inputs), FILTER_OUTPUTS(colorconstancy_outputs), - FILTER_QUERY_FUNC(query_formats), + // TODO: support more formats + // FIXME: error when saving to .jpg + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_GBRP), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, };