From patchwork Thu Sep 30 13:39:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30714 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp686048iob; Thu, 30 Sep 2021 06:45:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCBcJPlXRNlpBqpt3I99lCiPQmGEcjgL1jpj3JOomIBP7PMWLSAv5LEgbUAiJjf3Z5elX0 X-Received: by 2002:aa7:c686:: with SMTP id n6mr7279998edq.101.1633009532858; Thu, 30 Sep 2021 06:45:32 -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 g23si3496741edr.321.2021.09.30.06.45.32; Thu, 30 Sep 2021 06:45:32 -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=R5lc4Fr6; 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 9C9E668A940; Thu, 30 Sep 2021 16:43:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070022.outbound.protection.outlook.com [40.92.70.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1185F68A917 for ; Thu, 30 Sep 2021 16:43:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JGRIfef3HHcU3KwAMT0uTo+iv81FA9bpb4FPC7OeNiliOjcpx2RbjSr1VOEIMVtYGX0BKcQVQL66lYORSdp7KTeGyS8iVb+N9cKnVYs62Glhr0uP9+5g/VzNtUfT8zLIGDz92dby9kVRblyidoiOX5dbiSrwqukZea7W4xipEQ3+h8ZzyOl69oVF5PCBSipah0LYI2uMOCypdCnc5dpNn9/gy5kVE8oTiRQxSvGHG8YqYSZNMJQh84qfcdRxrg63oRAUYOUOZVF01us7oknRVsiv+JCXrK+6HhTEKzbflHs49prMGLY9KRPMJpCOFEX+PXAsv+CbmX9rSbIjWlY08A== 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=vTQyw5f9MBNtcZSQ+xWRxWP5rzErhYTCCyc8oCTN6rc=; b=PmQjoa/7oGpXoJAq+ABT65jbNB1KRBtpIm08O6LfkKIj6LGgdWwIaBEMmUhzfdxYrDo+kecZ+onPICGE3xh0SY6ufCOndn2o1n/t5bmNqvv5y3Q5FCIIWwWHXCpC3vLkGLJOOAbhIB3zvxKJYJmnY8LEuIeC8OlBuIkGMeKsARBEZGR+9zu9AcGr4tFR+Vj3wr0WSoJCP6APRDFO32xrElerio0e13T4mn9BHm9fPFWhNT3whRRmVTvMHQebc4talTxuWbexjjXNzBZCBu+oZfybktADnWpMvF7Huevvqma8Pxfk05bub9vUzbHEb28nL440eLhtZf3mCGgZL1rtvg== 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=vTQyw5f9MBNtcZSQ+xWRxWP5rzErhYTCCyc8oCTN6rc=; b=R5lc4Fr6kXpcwxN4yhDZ9uVup4WUmW9nWmCzayzLIXCQBwRQAPVhAnEALW7Lht8eCVsx+z5rCzmpCcMfcw/xxtKZm2jhZsYvsWxfn+zqjnid2yG1dxBZ0ZGlyvQe9BcYi0UtT9f8wQ0rwe5Gr5KfEvkwQIglWqEXxBfepr5c6y7WlQO04E95B/E3CHeu/1ONS+acvIwB89k12AlkhSFJHafO5JdiSFB4BOScqMvJ5L2pjlMe+NSmSCtTyefnywkdhK0FKwlIAMcr/6c8C11C1WePJn2bnhfH9rR3w3wIRvE7Fv5B560STpEi+Yj73i3HiCLbFm6wRv103sBzWGaosQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7246.eurprd03.prod.outlook.com (2603:10a6:102:bc::15) 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:43:47 +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:43:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:15 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [lLZfxEHaxvGQTDjpfNFMrCsA6Z2pGIh8] 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-13-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:43:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a013172-2585-4a05-66a4-08d9841853b6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymKo9o/g3zytw/A0Qrrb1u2tz4xR1Iy2+62OBst6EZWuAy9vH9BbsHrDmCyRq96GSBbPu9HSzHLej/bMOAOBt+XMhM5lNXdb8/5FlUUZLzlkJrHhm9hUEKy5Rj4dbuRDxMJJ4tSrq+3FCjF1amFBtU/N226hUhGPFjTSCDKEC1iPsBSkXuMIQ6Rsz4T43J7lKvjuXw6TR+M+U/0KWy1ityxwl2jT3dudQmOYaftqnzhe2FK1kgK7KwKNWpc0GHcyc4Yp7qrDR9TvaLeqgMxZK80IMcw3R3WY0P9oX9pcuNRxnuMjDidEfqgHgG9xz2cYEwcZkH3z4E+8Pospizg696WW0fGtr1ZYAWf7Kv8ifnMhn6b/eLzuZQxzgYELPtajg7WRCPLBWjs1xKvEGgJknVSMw5keuA5h6+6eOLP8EgLuAXshO6W/CShyF3A57fjEbG1mxL6eX55VQMCSmlr4VuahwJSXiphYktC5xEsdl7ce+eiF5LQnaWsAJLUE+YAkU6bJ0TOPQ+pDIxZuW8BKk3fHuEvLfEtYk4Hblx+ygWRkOJ4f/l0sIs/tZAYZZxYIxqx62FMZ8q0xt6qwWufNNEmLGSx4/fsp55VNI8fXbOn7IwY0FHtrdjjJKJETbf1aBfVPcjKJd99XlhogJJx49q+FQgG7ertY90gAVJxpItYsDuJqFMVpP2pwmwCepso+GabEZSjdv4XajagPjqg5YnBtddGa6QirhHg= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SgaWPADdm+ndcowDA5o3R0K5krHn6WyD11aFnXzB+eGiwsKloz0vUOLSalOLB35+XRnFyQOrrxI1geMtyXlONLZ55xtACakUlNyfZGc2/e021h1bpXVxL19kClFxu0juYBRwmbd+//zBH1ciJglrpq6Yk4/+aHJ911rUD6NXD1IyCQWPHkmTi7nlYIaH2O98xs7cx3dL6oOgu4xfnAvFLzQoawSLokcBkUGDxv3KF1cNYLUAJoshfJuFeuEJVUzSiYSbz7EHT5F5B46Th+yAm6tSSs/b6MJeRYPCasQIpbMN0NEC3AHN7wV591zOmeBtDnkEJQkneIu+b3Z9ZzaptZ95xvyOGYMHjGD+asqAojzs7S4bJZCeyA17qexkcPKWRIhp5AjvPnhf3PzcI7XunTU4pn3zSZBsx6i0Be85C1JHuikmIQEiRKfjgsvnVjjb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YqjQ2AKfitIkNNVvceUGZQDMzCnm4Vq5WqD8j+nKHYBwZft4g7MZfpi18/TRi8aedy+CfqdcFW3+Mw7y4CC6P8lQBgyaDxdBAWvrIOzXqfUpw/xYCppbdGzAsB4lVBss9pWa+YaRITSIvOJ1UH3hBw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a013172-2585-4a05-66a4-08d9841853b6 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:43:47.0400 (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: PA4PR03MB7246 Subject: [FFmpeg-devel] [PATCH 014/218] avfilter/af_aemphasis: 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: wCgrQeWRqqO+ Signed-off-by: Andreas Rheinhardt --- libavfilter/af_aemphasis.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_aemphasis.c b/libavfilter/af_aemphasis.c index 54a47d2c86..1adfcdb63b 100644 --- a/libavfilter/af_aemphasis.c +++ b/libavfilter/af_aemphasis.c @@ -151,23 +151,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) return ff_filter_frame(outlink, out); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_DBLP, - 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 inline void set_highshelf_rbj(BiquadCoeffs *bq, double freq, double q, double peak, double sr) { double A = sqrt(peak); @@ -393,7 +376,7 @@ const AVFilter ff_af_aemphasis = { .uninit = uninit, FILTER_INPUTS(avfilter_af_aemphasis_inputs), FILTER_OUTPUTS(avfilter_af_aemphasis_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,