From patchwork Thu Sep 30 13:39:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30745 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp691936iob; Thu, 30 Sep 2021 06:52:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxT9F6COJPfLAZKkglgdFZZuZWox6tTMwxQAl3eN8atGG0aOXYMn6PeoDSk8VP8PUQnk1BY X-Received: by 2002:a17:906:c205:: with SMTP id d5mr7011830ejz.74.1633009951285; Thu, 30 Sep 2021 06:52:31 -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 f2si4300633edl.338.2021.09.30.06.52.30; Thu, 30 Sep 2021 06:52:31 -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=MGaMde0k; 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 D64CA68AD93; Thu, 30 Sep 2021 16:46:01 +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-oln040092069012.outbound.protection.outlook.com [40.92.69.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69D356899BB for ; Thu, 30 Sep 2021 16:45:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CQ5iU2fPL+Qf14+bhasaHt4nZBznvorsB7biahp8lmWZY0fw1JfoH6IgDgtRfFXm1xIsyXjxYhhiqHhmVeLt4ra+SHILoI6wXdrHbCtqD+yt7ob8IR0orbIKagKU+eUydfynCIr+y+bkGSj5FUzYJw7Px+u76kQDFPJ9jdCsWklE6Wx3zm/oN8yoxzrDRhwRdeehg9BtmHglIt7xSYoeaeqMVoyOeTB9HqaaeUJLc7eMhRU/9wF9kWQsIWLcFiJ/B8hAu6W4g/1nzdrvPjViOl87kcW6HWzOT7/ILvXqqw77ncXdtEXZjDksBPjlUGaKKs46N9dbOkMMreRqazs06w== 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=V1w3Jl4c0+nNoyIxSNKQbQlncUxmFeu+Awtq56mtEIY=; b=BhvV8MhA5FKW0ZDjcDWDlRCHo9ZduoHbdzOzr2qHxL5zSc4qRLokNcPCv5+30k/OXh4R6xhd5eLT1SCWkyOpugCqEayyf/h5ydgNwMh4BBzzSTHAwaKpr3g7Ix0XjeyATJdLjJXTxNHRzzXe4lzD3UO9r3ISoffbRZYtvffBM2S8VmKKwgKRQP08tWct+uApPsTYPXMYlDzKB8mfWAxG5pYCg/tlGnymtlCZ7TVjS3721ZQFgv3lXaJj0QvlNbTmiQZP8RTVvvLL93KWbgxqEP9+WO+hcQFAszaVjUW8SNsafSpEYohBbk3P0BXB22B5Z0QHp0JJ7YGYoJxV/QGtoQ== 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=V1w3Jl4c0+nNoyIxSNKQbQlncUxmFeu+Awtq56mtEIY=; b=MGaMde0kezOdWnbZqCWWlbzQy/mF7+ZvXvwdV5ST4TR9lkhkPPJrzJnxF3pTP/BhJh3FcMSDoc2pDAzyPTTScCVcVWtm6XnqANBzXVS1/fhwFSLKCUQvGAcN9qbWu2wVdpTRK/baSQbChd6bjggiViwQ2RD1zkMWxszWKUUoQB60+tRsIqbPrhKHxSoZFS3s3SJMiZi4ZfVjf7TOtaVTS2Oi31GT1ARvCNhHuwwWSixYulG1PwogKb+IrXuWvUxs7aHM21VLwXd9VBA1sA8G+xs96UAb5pMgm31GPVuGsZX2WxGJMxh0xt4ySosAY+dVGo7gESPVb7kuf3Yzg1p4KA== 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:45:55 +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:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:49 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [X/ZXkV0ZlCF5yEyVGUf4NZFGAPm3QYwM] 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-47-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:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9119c771-b144-49c5-8914-08d98418a076 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FIbOlC/6ENyTOw24IyVQlcfMskHBGvSRHxen6WNG8RuPKNKD5Mro++g9xU78RAu1dXu4oSCqyfM8PmhsNy74++Sm5UAQ9Y6nKc4qMbsZnOTk0V8aZ1b5Fp69KgdeqBxGDIoOrkWm5zr2AAWlwXHO9wZpzq9MwjgY1zJHIytM/0FGDPH324Oc8qDD1RfaaMPnUrYIH/aaUvqE8myLGFLc+Otm2c8LHPxs4waH1rin3w+efrBPOqk7uU/lkHzp7gLCPQ83coByAEctzqjV2/8UJpxA7y34zBH1Ru8bF77IRdXgwyv1/LA+rbUJZlvscZ/e+9o4JWhHKl9g4ZFzxgquLTySeplPfVA5e+Q5XvjYOWTGdo5LpZ+jtcgQXaRjr8M6kw/v/LmPfdIVI0KaslY1s6uFeN74XyYzAp+W259hnwDrexFrg3L7Pn7+55h63+MG33YGA0TrwZruyo6yN+smQdi8DqObYiANGamGbAaJLhoINmug3xcNtJi5k9aFBYos0M6/W2yJh4v5ckbLqRrAJ7OIXrdcFec5Zq2kZLKE8WZRhRD5TCiaKh2BnJ5CizwDVPlAMBi+xiJNqLk2aWJPLif6MDbpQinpUErVWXWf0HAlsaAqfqhQnHxtrOH4pRqU5LYr6/Gy8SA5KsTWY/jVCfBAplDVcEmOP395Tk6PKNPB+Zxm0N5Ge1M= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wonmi1n9YJIEgHNKb1F2MShtUA0kO4QIkq7q8xmlf2a93fllhkWQeEs5W2ZLD+56v1XanNhC84VGWPaToM7TVETkMT/HfXOpSARqP7HuiQaZcCk7SlajECcLU0CdHReHDm/W+eTh0qyhw+lDhNv31xgEUEaid7Ju+nZCvREl8Up0J1DXF4eRW/1pcuwDDMm6dAzpto8ogfwNhDQR+VisH+ItScpQY3mYdtDeAnRmqu20OTgTyqcIjQUC9soFHPGdZcL3t1D6mom4FMkyL01irD+SlUfbQlcUE3plWE2iuj56F+ua3NI3cGjSXEerqsPVimo58+67gVr0u2Y7tmDU3Drhw+/DC6lazZyU8JQoG1R7Tv7dr1uh6/vFDLjmYjTjwkZWRFKdkNdzB28To78Vu7gxRhYEljXUt0KnyyEgnhzBKvDuYpVDMHU87IyzommP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1TACCCiuhHnvAhuUQxPlBq4aLyPXDWnKpYmo9/xCtLuDzrc9VDshLfPjf60PWJ1NSDhdRQcj+8F7JjlLu7859KBKjFWbkmNnhVCm5QfbEW+WQ5B0DXXHez0ulqhfcbKt5lN/HGxa3zXGdjtZ+YWXjg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9119c771-b144-49c5-8914-08d98418a076 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:55.7712 (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 048/218] avfilter/af_speechnorm: Use formats list instead of 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: ejUv87TMWy6I Signed-off-by: Andreas Rheinhardt --- libavfilter/af_speechnorm.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_speechnorm.c b/libavfilter/af_speechnorm.c index bc83a347e9..4a19c7b0b7 100644 --- a/libavfilter/af_speechnorm.c +++ b/libavfilter/af_speechnorm.c @@ -114,23 +114,6 @@ static const AVOption speechnorm_options[] = { AVFILTER_DEFINE_CLASS(speechnorm); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, 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 int get_pi_samples(PeriodItem *pi, int start, int end, int remain) { int sum; @@ -568,7 +551,7 @@ const AVFilter ff_af_speechnorm = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .process_command = process_command, };