From patchwork Thu Sep 30 13:40:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30770 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp699787iob; Thu, 30 Sep 2021 07:01:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyL9pQFXeT/70OvmjwGFAwQz1Yif1EmU82C5cGGAST2R8MTCx2iR8+6sPy8a86j8BvSgHqI X-Received: by 2002:a05:6512:3095:: with SMTP id z21mr930930lfd.167.1633010483803; Thu, 30 Sep 2021 07:01:23 -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 b27si4076009ejl.186.2021.09.30.07.01.22; Thu, 30 Sep 2021 07:01:23 -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=ah817eZq; 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 E4D9E68AF69; Thu, 30 Sep 2021 16:49:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2065.outbound.protection.outlook.com [40.92.89.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7E2A68AF62 for ; Thu, 30 Sep 2021 16:49:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TzcNqtNkTS0fqe6tzJHji7BLf2NPC+mgDHrfCa3vhHii4nYVxJOEuX6An7+mkKPHiTxDpjm2rfjPWshdGTTAOjQlOO8TolHg67wlT/MGFffdqhqmYLogJMZ5N6PpzG/E+ppYamJITH7Zivi+hAEt+06o4Xaw+MIFXe+pdxJ6s+pQjXB3QYfxVVQyLDxl2Gjlb1kb8w96cQa0w4cNLz7aPErNE4BfrALWB1Z9qHfWZHDtz2GFKnlmDWDrMnIGj3sNcomJBxDbVIVr7s0HUcjXhvH3pq7MbtKLi8R0Ts4X7MApzP8SlPHh6PYuzsbDsp+NWnUDhbTEGBTDgpwjCYja2g== 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=7xfVEQKC3a21ikGOwc0g/HlHp02Q3L7/GnQiYRNRon4=; b=RrKwmA1KTgz8WicL3TbzsSnM4DwfzKlvyq53FMzNBjfL7OLPnn4Yx+H6WX8xJpJYOABXgQUcv9elf+iZq5K0IsmmoJBAOyNWXA+8FlroauIQN9q84ZRifLOt4sNu3epUYfoL4B1dssrb/FuZWw7//fCq63aSHqDZGhZ+3+IAfMMZ0vL1rzS3SWjXr8j9L5DM9C7KEYkfceP5ZHqyHepvb3AhPTpg2QL+mM/GsFfAhsesFgzk5MUKynTriZBg9BoG+5QkFoJzM55camV56s9bUCMShk49iqxp4qreXDb15amPSHkE4caUwbbzpGOmBtQFRw/S/Gx6zaf9hfqC4o2UpA== 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=7xfVEQKC3a21ikGOwc0g/HlHp02Q3L7/GnQiYRNRon4=; b=ah817eZq/HzFPfOsBGIt32opvcWMD8MHjDDpB7qFD9bOM0gVX55f6+5vU8nRMxrNyzfef7tUC7u7xWXHgol6xKA1OCZw9qwQKZMqYUBu5tPmvfDLO5zcLJumNr/21hrDWl1z+6EylDlfn4wWw/hhxioAJU0eqA4DFxkTawQFecm+Kcf+Ycq0Wku4yqGpagI51nQrk8Zxl/1cq5csikwmfpeYtGMuaPBeV1NebpmRWw838+z6jkHeKFNIedvr+mz6pzdHHDWqIa/TDbWCShTh767ggIWXeab+i+RLSGajtGR5Bw4bFp1Lw2bVFn1VqzsLddSom7H9mKrc0KpL63pg1w== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5322.eurprd03.prod.outlook.com (2603:10a6:101:21::21) 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:49:06 +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:49:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:30 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ypibjm2V7VMGV/VWQjTtkgmHBb+vbSIQ] 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-88-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:49:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c261adab-646e-4e90-b7d1-08d9841911fb X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2l2+3H3DBlVYxbmAXhegqXh6qvGIigwfXGW3/oqLHDJfVKxUH6oG+xMofxnD+aeBsysNfFRP13Sr36cjCRjBIyNMRY+TruP5Wo3VppESJIfCfnhCSp6U2UpAUwS16xw7ecfOYaRZ0r7rhobv43jBQ89t4t3sr9M5nnBVlW3Nl4RrxdhfOKl/7UFbWRF9nzTxdNzvirMscpYfVWzOPaYCY0xn5/r2k0FO7nalo6zqUIwW7iUtwbTemysXPHsyDKPIj/okCdGr+933/qDY0rfj6+BA3AX2fpQmfgNoyLUFGzvFXDJHlhigMQOWlhnurfRZoelO2WrNos85EN0fo3p9psmvhf0+b8nvYyBh4CsyU4RUGPX1y7UBtFx8EKoZtxn5GHCgToyGVkN41AEqkszv9ET6ZgtjFW3WmerNSB9DZ0JCNTnhr3OatjJLrd8aBeG3+a2XjKUG0wEY/w/Bife5XQzbg43GDZq+jMGJVoWdEc71lwSAcFYcw4NFZaLVGjvCXVsiWZShEZ11xUlFgB/M2wMRHWh4Wgtaw83pbv1qdNJgoAaaC4Aq/t57KIW7G8D1kg9p5vtcKOcVUBCBiS55QoBpK/fjU4HKwI5G9BVv6sLjg4s2uGt/iKytfT+vtZXusR6N/0acWav7jm83R9r3MlqsuqIJsvg8rRen+3yZR8rlCOXqptBsbG0nbTuX64gYAs/+weD4Iox4uumDQOOnOR2Us9mbnN77qaVDlHj8SeuF8= X-MS-TrafficTypeDiagnostic: PR2PR03MB5322: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z2Kp8TONpqFbbOPKT0n9C+ls2JPqToc45GV8B68YhYoHE2NX2sCw70jvCkJCzjC39WR/z7E9jQiNN1lVxeVPva8VzY3dWALVJ1xWTnpqDU7lr7csUz4HAERJYG/dPIxU+Qwc575qUoM7jMEwZLxrFDKFLvZ6Qa0/aaH6TJDgUyb1VEpi7IiwJZ10vv0CyiB3jKRuLKlyslOswwbEZxz48PMd2ubGRR6rraFrQBdmMzDGKJLdfcE8Opvpy52vGCkY4wPQXuSrDk1o6nic0AJIKo0KF4nXGRRCSKbzR2ee4Ir7Al64L/5Qq6NDLbP3I364LzR9S7R9EzLGoCh1z6w6KrnsyFWdnfOSLKaenI25W8X3RTPY4yEjxIIHfh6l/hv1FL96470SPn9hMDrYLkJS5hDX7w9horNSz805pUFClWsnpT7I0cRQ6FX2ZobEXqAG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5tLyPU8Uu7PRR2P/Ysdm8mV5d1Q1egyKETTe6/RPAtnplH8jAsz8Os26YiNV8I6QEV1x7Yag+2mfucVREky0InTw+g65kuGUwuFPfU6QdOgoctHHqOrl+gCbpDr1iPULIHmoU1/kFuTINYBRvr9GvA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c261adab-646e-4e90-b7d1-08d9841911fb 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:49:06.2614 (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: PR2PR03MB5322 Subject: [FFmpeg-devel] [PATCH 089/218] avfilter/vf_xbr: Store format in filter, remove 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: WQBoBPv7HzBk Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xbr.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c index c799284566..6ae5310c9f 100644 --- a/libavfilter/vf_xbr.c +++ b/libavfilter/vf_xbr.c @@ -340,15 +340,6 @@ static int config_output(AVFilterLink *outlink) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_0RGB32, AV_PIX_FMT_NONE, - }; - - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; @@ -425,7 +416,7 @@ const AVFilter ff_vf_xbr = { .description = NULL_IF_CONFIG_SMALL("Scale the input using xBR algorithm."), FILTER_INPUTS(xbr_inputs), FILTER_OUTPUTS(xbr_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_0RGB32), .priv_size = sizeof(XBRContext), .priv_class = &xbr_class, .init = init,