From patchwork Thu Sep 30 13:39:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30756 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp690879iob; Thu, 30 Sep 2021 06:51:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzI8IIj7pp27Gcz3NS/1FhsALzC+ox6tRDVV0nnxkSJ62Qn6kV1TOs2SiarDPoq+l3z9Rc3 X-Received: by 2002:a17:906:544f:: with SMTP id d15mr6905240ejp.520.1633009875018; Thu, 30 Sep 2021 06:51:15 -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 j23si4016138eje.21.2021.09.30.06.51.14; Thu, 30 Sep 2021 06:51:15 -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=lpG4CzTA; 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 F393C68AC6A; Thu, 30 Sep 2021 16:45:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069094.outbound.protection.outlook.com [40.92.69.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BAAD68AC1F for ; Thu, 30 Sep 2021 16:45:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jXGY2vPyQkGrEx7S15jBjt98E4PvfCHzB+D4h+vi+Dw6x7zlTqWthu95CfCaFZKokMJ4y/DpVydG6xZ6+0nrOk8FAUr7lwO550dhoR4TdjpNCzWTRFQlUR8/1S9KgV+ZpQCb9Hfx6DaVV91k63sEcCbe0wADyMwhPiJCBMhIIZSUWGg/+R56uOxlSGVHQWc6iRtC+cK2c+4MDJvovrsCCLRqIeo7bg+9mm8DP1uh5EgF05q3ieYxjCRxT6uuqYqsJiPK8JzT0Trn7Ssdd7wa3eCGfwc2PU+2WTrMpWEgG/bN78vfmwZCTnvyKnQI6zqQcdFM9mpKxycDLdPherUvtQ== 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=7pL+AEppOMwtzhwssX9Nzo5QiDBdEi3P+JDm7SrL2Y8=; b=ioYCA1BGqilcpnbQrPxxNq0lPV6PtBkMna06sYTUk9WLHopMjcko7DdIAq44wThhGg68TnMNZ+S0WV7kREcViqoJEFwrN1rTByt6Yzn7hcAfxIZvTAEmdirpQ4CfOPervXI+xyhql4YN33soxmkPdyTQAHrec0UxH75J2C+S16QWZq+Grooa2XCfdSyQOCdW8Q6OYIsc8NUMzLCkwRQICl6M1LzjA3PA30syBb408yfzblO6AJqZyaKIN1fe3ulBH/IBBaEChJPY11StMTHjPtyKyTRlj9GtLis0Gw63FMIVYUlkcrmzrN9lM9AruDVodY/8sto0R+yseZKVmVD4hQ== 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=7pL+AEppOMwtzhwssX9Nzo5QiDBdEi3P+JDm7SrL2Y8=; b=lpG4CzTAlXh2jApbvIxv6bh12gTD4E4khiiUuNxpbunQL/FO3VX8dNn6Dj77cQGZzeU1tTQvrAiwqXQjr8agcrnhkKQb1bdx9qcvSSAhXkPXr0hrbKh61pneZCSYN+rYHK2+ircT9QE5mgYSlPJF1ve91rZMhReEkOM8nlcevwMeSs8YFGZZzn8m7V7AGNPW79NxbOkNh0cu5vQ/fteuStuCz6rNvcsMURHMs1V71eYdCChvS4wQfAeXtQ0Gbf8SrHpjarW9FXvv3XEfHDN3aZcWPiIausUZDPdjU2w1vOH3FsT9dXqccJOkThp6u4+GdxiPFyNG6Ru3ysribj8X+g== 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:33 +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:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:43 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [sEiTY4l0xcMgr2FX0UGDCGLZ2Jct2xsz] 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-41-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:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5ced7b06-74e4-4250-5922-08d984189370 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIBqLe59qjkRp21wji/xErRRRFI5QUJRfCNVXrNQM3kC/hCFb2pcviDRflsMvYDPnglK2qBPYTudubivraNWqbQEDINde0z14QexPZZXH4jd7M15IEbNaTNZeJNJNbE+ma5CpQcWQRCfMVtENTp3+yrGiGZp7a+eJxk9vx/4o0EV9pNbrsHH1p8E04ZLyt6aItL5PdxK1EYLGasDxxmlePmMN6qWQW53KXd93uiTggRwyXJQvMaJebKP9FbKHgQCn6kdRB+yUdctRaLclSYlQx8kiWi13c9WyN2+7DFIf/flPCvJ5/ihXZeHaDMKH0xZgEQocQHR+pq4LrdKQSfqXXBX15s6iXuq8TFpAowtrhBP9IPXKr00ocbzC7b4AtGrrNUL9uPqI6TXnibewiEEmcGTBjWmjvf4gkaJobvJq43Anqi1OZRa8yIT4ebJMY+WiIgAN3kceqKcOhz6W+vxRqof8RH2PQwQXcCgE8SuHUD8cCs+qT0n2LAlmMbSf/J/3qRQMSrJVflJrooqTCqJ4LFwYXPh5uLo/iNCDZKRMf6Cecf4DPhlzPtVi1iLZOYSTRwgNriZ+Psp2EXQqOvZ0co3QD4vKMq7mrwZ3BTziVWO4mgDxSUNOYo8dfAopeRtnhlaU1GdBWWUphb7vwSgzN91aI0W0EUD6KBMYOvMHS2NKCPXkVe5kklIoH2au+YB0wgNdwRwCPIxg== X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TKi6fRnEfk6I8oYrqj73NY6b4Fe7u1tqJ+C/uXGOqp4d6kGBNiy9BhcY2/Jcvq76e3/UJbv4FxdNDJ0PDw+eEAKWe6W8F9VfsDw+JMecFR0OuWZQcuVZvDfzNBYGFvtQlMC8/GI/KJNRJ87G/Uf+fazsuoGzAns93jhLXckhTOCbZQtS6FdOJ/6YVJj4fLGO4NMv6i0aNGme4/Klk7aVcnnswB21SAD4rg0dmVApsIhP5ygkpOnQfUcyt6WJeub7gC5iwuXqinnc8IX/HojtUI/G3kq8yaCQbpUFGFZOHdgz1AEkOk7iPn5xItW0zw2nC3Mxwr9oFa8l4LtuFqEQYid1r5iRa7ZFPFJQEYBs05bsQ+FEf8qc7r2HD8ATd5Zvk0ZmDDhK16wBtpsmayT9vjqNNY3nzFkCs7Zrd9I8wQ7MQA2XQmmezy/mzTWwJzUy X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cP8mOvqGOz23uvwSsTErTbxEhTl32RqSUdJ5lBtgPOSsDcDG9zl4Ch5ybZnuFdNmIA200jKzF6D+zZjJC4rkFZylurH9ZLSPQoQ1eP/i5FijJ8NS7t/ACrLy+YPLt5QYEuaisLZjJk4Ei3F3GSGavg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ced7b06-74e4-4250-5922-08d984189370 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:33.9312 (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 042/218] avfilter/af_firequalizer: 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: jIPx4ggt0n0X Signed-off-by: Andreas Rheinhardt --- libavfilter/af_firequalizer.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_firequalizer.c b/libavfilter/af_firequalizer.c index 83dc3ce7ed..568b78117a 100644 --- a/libavfilter/af_firequalizer.c +++ b/libavfilter/af_firequalizer.c @@ -180,23 +180,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->gain_entry_cmd); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, - 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 void fast_convolute(FIREqualizerContext *av_restrict s, const float *av_restrict kernel_buf, float *av_restrict conv_buf, OverlapIndex *av_restrict idx, float *av_restrict data, int nsamples) { @@ -962,6 +945,6 @@ const AVFilter ff_af_firequalizer = { .priv_size = sizeof(FIREqualizerContext), FILTER_INPUTS(firequalizer_inputs), FILTER_OUTPUTS(firequalizer_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), .priv_class = &firequalizer_class, };