From patchwork Thu Sep 30 13:39:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30726 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp690076iob; Thu, 30 Sep 2021 06:50:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy506s7M4AQElscN6jtAnh+N0CiXuPXmkWrqDQlluuwIdH8ygHc4FKxKJWIHAlv7WBnNq2u X-Received: by 2002:a17:906:700f:: with SMTP id n15mr6706966ejj.319.1633009816146; Thu, 30 Sep 2021 06:50: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 m1si4162806ejj.616.2021.09.30.06.50.15; Thu, 30 Sep 2021 06:50: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=KTSi95qP; 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 97EBF68ABD1; Thu, 30 Sep 2021 16:45:21 +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-oln040092064040.outbound.protection.outlook.com [40.92.64.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D519368A3A8 for ; Thu, 30 Sep 2021 16:45:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=clxMK6g98cLNFDfPgL+7QNQFONd2V45LdyCgWc8efSK0Tjy8vcAe0x21KK9+HPVpEQcU41Oue5fNpbaHx9R888bqGNqACEOs/5URUtFI9wqNXeoxO/TEbeQRr66Z8dbKOIkcR/cnUdd0Vi/qi2rm8IZ+Xy4my1J3KBjSyoLsz5v65KG0UQeSxxvY0NPYMe4qP7JGwWqiNn0adzMnMoBgxY59EVzwv2ivKf/pKlhHkFS3AD1tLJnBABnQSHsV/1GfyfyT87u7rrkY5LaFwLSm3YzgRlGHeaUXdP6Zirw/yDkfPBvLVKkNMdB8jlblVfezgIHuNr3q/c9VQ1abZcrNTQ== 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=ud1AxZ8x7bEDcYdsfuNlYVJF0a2I+OvXmRm98b4BPm4=; b=YLs/boet9yMGoCCIrO0gcrI4xdBHPXjemPXmZZX8ufP8QhDPtnubuE19A9MrRh7QvJV0et1QH4tn7CtNnUsLRzVSbOs1U4BLHCgvMk6F/n+gqxnGEDMV2eMLO6cfyJLhaFqYdovlL677/oLut/zaCz/QOvI1vp0gmz/BGuYK+L4lnhodTPqmwRrdS3KGiGqGmFhiNOcMFUHpGIENLKSXqJ0LdK8CsasShRUZq3CJLy4CWYK005eF9qxauW4GeqcqGhY3Y3CRVSaDfu289sYxR2FZ30HM7aSSCPnyc/X1Mj233Koznar11fFor3Ps8Hgnc3TnOKTDvir07L4TKTF/Lg== 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=ud1AxZ8x7bEDcYdsfuNlYVJF0a2I+OvXmRm98b4BPm4=; b=KTSi95qP7hI4FgelGjml2oBYuD0MEivQNIIow9tzeGHf0GIOXI6JIUsfZnLhZOqs6b82s9mnJ+n+sfoGGFB3N/5SWL6kbkE5jsgV9kuYUm1YHvvmVd+tbQSwB2fuqxwYq1a4jd+/ARbLzZFQU1lfMTUQBF8wlEnWIHEl/3dPhGkIED4AQ4sX1492rkfCv3/5CrjBzdZlz+a19u+a8SAW2wjrwueDNN5U2Jn8wZPX06+e4or3H6dUH2oopP6pXYFPx4mw9FhH2epBmvYCDyZvfshqB89DAF1X92rqHhQhgv2ygFAotHo1kDkcnh0bWN4Oc8scMDfzYBenx9z7CCtlfA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15; Thu, 30 Sep 2021 13:45:18 +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:45:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [qaxIpQzeciCckfmW8SPCIqTb3hC28qyA] 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-36-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:45:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f5b619f-eda6-4d32-f2cc-08d984188a0e X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV3q/dY6tK3E9jIVEiLj7g8FdohAvguSixp/XY85jt47XIOzbLquNFNnbhCUca7yry49hSHRWWQWuP6KthppRkOLMhEYXbqBejUGi2ik6daTtDaj590I1gq/1jjJl3TqyUKS53U/zYNSAjCW6KZAx8GcCEduuEIfVr4pgKlJgiotMdTtOBsFE3T6CqTNCK0It2AomX/0sGbizJyvceo0wPpJ32XfYsyWWg2o3M1S55/9i727vq7bfPOhejYLbLHvkHdR5zlf7ZLfZqWHY/+Pp00474aa316lvaWP6gaColqHqDSwja6zUTptY1NLZyNDcK3uPT9TXUWkHLWDel1oMuPAsT8FgkUGeB3MA0VuK5TKl4XqJeGdmhzEtND0CXdZo2vYxkd5LORQ44y3nAhbIv4WL7gIc43Z0iojW5Ijw6teBbxxPSRoMdpoErBiPYYLayth7mlk7IuYg0wULyRgrzXf/zgdGdXeU4nIAF1Hl9PqpY7YenHjCWXFvXXKru8Gwnk1RlFSQpPDC2pYNxSW2dJRB1QqNKDcic5Dphw1eXpl3nCYJQkvpXxcvonoaSwXrRk7pFgA1GpKsF2+ljMabolUFnHP0v7RShhef9O7UxHQDUJ6aUL2/Pje2sOW2QqYltQUhZgGRFCR/gw5/75sBNPJTF/f4J6cAcx7a3S7MfwRH27KS0CTg/SE= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Af2PmK/UDUA7zbAHKaHFqUsJ8FRpHqXIYz7bRrIKAwjDqjaIp11MdjyAvJof8IueV/VLnNDAC8XPcOCO4dcwAhnHAcSMQzvqB7P/uFFtcVvneSLHyGOuWJVSyV4hPiENyxqaHBVVYX+uVnDJlHGYwQSUB6IKgPr2vJGeW1l1j3v4rUfk7M6gQVqWqlqRNJX137guqdz/Q4DbrwXgo0HN3gkuSQ6JwHRnd8F/zto64OTEyMw91czGr/qJTXQUt6bQgGd5xawut6gZNYY3uKO95FYE+OGRTjUSDEmkHUfjlK5U6E+t21f3nJBGT6L4ZOgY7WUbiTLXmxPQyH+E8ZQaS7X2wjaTL5mWxVkGGX2y8WPsCCvPRe6vNbHoo36Wm2ZlfVOJcuXc6d7iCoGIP0BGrTnCdWKmxowBreWJdrRZ2tOCycKjzL1CJIeVrSaq2tXz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fBMtZ/2TK5cuNdXsq71PgQWk/efACHsqtT81W6b+eteW//sgzia1LtTYfQgWnqcVcg9ccVleONsNRNXaUnJp6RvH1dZrejFzFQXiGbboaZBdouDZEaNGfss9YtbZGQTFkGh/3f4OMp0Sk8q8gmX+3w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f5b619f-eda6-4d32-f2cc-08d984188a0e 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:45:18.2541 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 037/218] avfilter/af_dcshift: 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: w0gqygDolz5D Signed-off-by: Andreas Rheinhardt --- libavfilter/af_dcshift.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/libavfilter/af_dcshift.c b/libavfilter/af_dcshift.c index 80f2600e7a..da7c16550a 100644 --- a/libavfilter/af_dcshift.c +++ b/libavfilter/af_dcshift.c @@ -52,22 +52,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE - }; - int ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - ret = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; @@ -153,6 +137,6 @@ const AVFilter ff_af_dcshift = { .init = init, FILTER_INPUTS(dcshift_inputs), FILTER_OUTPUTS(dcshift_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_S32P), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, };