From patchwork Thu Sep 30 13:39:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30730 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp690555iob; Thu, 30 Sep 2021 06:50:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTuZHXRQT1LrIsssoUCIJLV6bNKMFQ+vM1hb8iCTaIZ+bOfHWmFeOmQno/pIR+OJpj2xoA X-Received: by 2002:a05:6402:3133:: with SMTP id dd19mr7530018edb.172.1633009851171; Thu, 30 Sep 2021 06:50:51 -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 k18si3772390edj.175.2021.09.30.06.50.50; Thu, 30 Sep 2021 06:50:51 -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=LVJ8vV58; 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 F1F7868AC2F; Thu, 30 Sep 2021 16:45:30 +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-oln040092064017.outbound.protection.outlook.com [40.92.64.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DE2B68A9CE for ; Thu, 30 Sep 2021 16:45:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kjUDkHwoYRTZk2mVhwQO3UU9LNneiTsCif8dYPY9BTZxsXM0Xj1q9uIWp8kv5SQ3w++/Y+PV5mHsXXri83Nlz5jK/BqckUH9FC1GE9asFR5EY/gnC3C+SBgku9wWgO74Afin9ovQ1t8oovFWeiP4JfEWQOklfbi+B9ov9JI352QdnQma9uWHFbGM8efF/6E6psKhoh4njhdpJVNeNeTRsz5NWAFBTIzStxuUK/JzYrcXq4LQ4rraax11/qLva0yOX7x1RMXZcj5fSoXZyPZ/xu4S+XEU+536OLHM1lmvTVb+peuin1avli1GcH7TxYjkTmWAT4/uW8vp3uIgiTb5XQ== 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=ubSgplfH892yAfldWRASVPc9m/OA6d3+oDGek85hshE=; b=aBzsI0vaHgwPckDEW4ixEoYa2nMBSlu2osBA3GXBOezi5Vsl7JYVOcdw4adShJQ+FSlGXchWAJNrzZ+k173mdzDOF+j0Oj073CUPdSRe75ztU2Z3RQSMHuREH+Po1l90v/4/WYVR3CS8IGJv3nx5Pfs02Z5Hw93jemjrLRjm5BnntEoLTZ/1rbcdo5FIHqihvKH0kmjOFKJ6GvEPJurhyRiFQw5CFBOUK219A2hnYU+yvUSurfYlgvtwmcp4CEVzEQz1JAyfe+PLnYck7+m6TZF3G68s8qgsqqJGgX0bs+p9L9huolh4yQtzH1grIpH+776Zpd1/st/fwPJvvBKttQ== 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=ubSgplfH892yAfldWRASVPc9m/OA6d3+oDGek85hshE=; b=LVJ8vV58fhdPvfGPexaWRt7Kt/QwYhyOrAnw/gEg1DiBzscSjWX8IthoBjiwV4PEsZi7JTVgnBNzZRF0plmAmlagWwW4wBsQio1NXqC4h6llL0tGmgxCa6YfPQBdYUUXgMbSrIaBatbs9z0ZaB3VT+NnEalZ+wJ2a2G2FrH6LpOn5RLmGohJ/u3YjtsJFfojlv9PHqMbz3X6ZuFTJfk1EBZiyCOxW1D0fF63g7wKEGNWGtnkvmfSpNotRwi3SNUV5aPo8v3cv4ZAbpPUaJk1gXHcapuJESWJG/H1MhFJYY20TC/hQxVPZ23e4B4gE9zbfV3FAIRxUUQRxPSEcPhUuQ== 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:27 +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:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Z7HeW0JCL9RM2tvo3ZmfioSFrjQfHzRa] 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-39-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:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 67e821c9-ad1a-4984-f997-08d984188fbc X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV17rP2Vj0OJlpLx6nUZ/zLNa2e6HiYJ95UOEkL0ESaxNyjqVJZZCN90nmnQgHYXsnV1dZjZrg984T2KEAK8QMErgjNEpIVqOL7PJr9KU7PMebsgvtdhqN1/c90HPlQ/6pF+oRd7qOGqbf9KaGTrXSQsOGDyqcIcQJFBR+xFArcMW8+hN8xhIZeKwxYxCpKqvT6RR6qvbNOLNxIATMfRzJxuzOsxSEt1Ir3r8PZdaXT04drp0lrZ+ZW/k05Fj0Km9y65N1wJvvxNCBUA2OS72A/mEBj6BV/yosRFQfPeC/Z6ByJQ1/vvRVerx7EsIb9zq1ftvuvtf8jzRHTHs4Da5ZRg/lDFf0uhz+945niOAawgmqPn8UQo/clYTYoMiBSvsyosGvFt5oIFccmh4CTCbpkZcY6F0NLlv9TwfTrZSNw2GyRzjNpnwU81odx+3hiYgOFiNjQmHcHkxx/Vhg+lle++hD4XfXdEQJVuz2epJjxBj0DX9vD22LmvAEXpvS4ernju8jSrlD0lwrtXeLsBqIC7P2FDJJwjvKgMd9R7KkhvgcyNsDZMeGT0loH2vYHZt/FNfNijkoL6feZnBKi3ifD14wa8/iBI36Jj82K7Eus783TO0gIwZ3a7kh6JCaFPlnlLL3L8ZVFOenmn8msCGAfEAQriG4kzM65IiUaNVgOlMgOGXHxxx7Tk= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2mRzCDKnz3/+pbaY6J0MHesU8B5bAJv0p8idZwGKvzVvsueRFmA9hnUlV94J5WR6kuGBQgp6OqRdOhIAnG0zfiqJc2i8/2ZYjsO824DsyX5MrxAh8W09KeA+g4PwQ3A6ocXhb0ievQefIyAdXqn4Ziz0fFADaVa8rNlYH7Ra/rUCXQfhVapK4iowjm5m7+29T8Flfgmunf6UKiiirfYq0TrkhLDcNrQ/FKd1Y5cJ6XwRVOM44ieyO/Zr6cdYBOWSXGAuwic2cBUK/XBBPUbVfcgJQ8gHSV4ARPWqXITyhQPXfIrGjZdeS/4dTnqfh+3SsCnXleeNAY0O/mAxjlmcyFoJ65N/rX7TEK3BFHwHA3yd9tND93pxuqnt/VDRKTU3nx2W2b0m36rl8KYQQF2ReOBYEaFGOMV1nrScJJiWdDoYx25pq9xi55jKwVe34ZyL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: p1pAbE9qcPw0tNcbVRec79H7Gmw4kuDUGoBP950GwYAK+j55GJHBKb40kcBJq0zCfQEd6+0PUwdfz23vWhVXntHtsBQdF9AWNRjrvhECsUHQHnPdzz2kKWNQvlCVf19IAKLRXHIFnMp2VL2p1X+lIw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67e821c9-ad1a-4984-f997-08d984188fbc 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:27.7175 (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 040/218] avfilter/af_dynaudnorm: 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: ev0v5M4WA3P6 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_dynaudnorm.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_dynaudnorm.c b/libavfilter/af_dynaudnorm.c index 73dd9fb04b..bd17998a26 100644 --- a/libavfilter/af_dynaudnorm.c +++ b/libavfilter/af_dynaudnorm.c @@ -127,23 +127,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_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 int frame_size(int sample_rate, int frame_len_msec) { const int frame_size = lrint((double)sample_rate * (frame_len_msec / 1000.0)); @@ -865,7 +848,7 @@ const AVFilter ff_af_dynaudnorm = { .activate = activate, FILTER_INPUTS(avfilter_af_dynaudnorm_inputs), FILTER_OUTPUTS(avfilter_af_dynaudnorm_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), .priv_class = &dynaudnorm_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .process_command = process_command,