From patchwork Thu Sep 30 13:39:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30829 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp411652yba; Thu, 30 Sep 2021 06:49:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaMd1J1MwecKBmw8tfslhQD46iKrvfnBXRumG+i1tB/jIgQSgs/CVb+vs8oMwmUcmjw9Rk X-Received: by 2002:a05:6402:19ba:: with SMTP id o26mr7350148edz.1.1633009767522; Thu, 30 Sep 2021 06:49:27 -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 a9si3360272ejj.255.2021.09.30.06.49.27; Thu, 30 Sep 2021 06:49:27 -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=JvYuRPYd; 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 7F88F68AA9C; Thu, 30 Sep 2021 16:45:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2043.outbound.protection.outlook.com [40.92.89.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 691B768AA64 for ; Thu, 30 Sep 2021 16:45:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=grJDJ7TpByPWNEEPB3whwBiMm5KSe/4ZBS3vWJ0AYVepG2JgoFn+kOchecPJiKq2BuEnhLLw+DWpBO9q/DJUcTHrptZqihj/vKMi++ZbMH2u4h0bu2TLggAcLvA1d3yqGi6u8iR1QdRyw0idm+itdXHJ9L6fRtPremHKMTjOeqnS7MWFL19q1/k/v68kdDcIs3iaayZXu8CGJL3V++iwSY0BgFDyJysi6HlZgfS1qwGXdJfteXC5zoH4C4D91FgAMiB82OfWbhMh+vuvCXTZd9N6TU1q3EE0L7MUNYGb+I6k9/7XmUvQ6scuWmJEUiynhhGK8GBgMvaBF0YsUEudgg== 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=L/32PEPCI7iVN+z3B7P5BWcLnzOO4oFvAyuCk5d9Zjc=; b=m+Rx+p2bAxJelrMOHr/xqeGaLoCqcIQ440D6HEfd2a4MZ/y3RX6JXsE4DTFr9Yks6o/m0lAelU08KE0OPnTqlyWjV138UwKJlkWAVLRLMAH1JUG9T8qNACwec9MPa20XdGJ8xVCkW0YrguWGowFXQsMm17JYp7qqunWEUyG+Dg3aMPm+SPBQBaTvX6yX5oQ5/df4N608afVB4x8SMcofoVO4YCyb2+RoyADTO39tNT8pFFGDRmzXJYPKjumCLUMbjCq0O1x5ThwW5HmHmIaqRh1r5F7gGuhgYh98AhGrpOenC1T/Fx+RYgASSRWh+4+ifZJc83mlkVpzuNc9pAnMxA== 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=L/32PEPCI7iVN+z3B7P5BWcLnzOO4oFvAyuCk5d9Zjc=; b=JvYuRPYd7GjVoczbOdZwUci6QW8WkLC+WrDNW8v1zVucfJPUffZd+I0lljWtw8LM73tZVf2FxXDrvT01JHEd7/Xy5wqDrAUbsPyxFKmPJWZktIFojsMfV0UBHEsGcvk2PuRyYotH5uxlRyWwqHRNdv1ifp58oxaJc6TgMOZbe9MuSscWYEfu9iapIISZ0+werQap8oD5oqyURrJHyx420GZ2Iw1dpgXGZAUVbaB2GjzfZEGwhHmuokfHkNoK87TWEm7lF6E3Eo4s8+W/fzZCcHg+0YeY74Z0J/zcMk8rN9YMmmmXRh2MS1i/rUFdXjGTRLV+GRgLwxPkgDXr+Riv9A== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6428.eurprd03.prod.outlook.com (2603:10a6:102:77::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:45:00 +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:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:34 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [uVbVsgXpOKgyMI0kxV/ZzQEfnxWz+3WQ] 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-32-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:44:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c39fa533-6e16-4b84-2e92-08d984187f4c X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIBqLe59qjkRp21wji/xErRRRFI5QUJRfCRmADtQqez2jmaaTMWLCFELo0CQE4k7Hs0pvEo1OGTd30KUKJK5PSc2oo512KXrWjk7Wt5LhOsHeHO59b3ShFX30UapIHQdKlmQEWTlbwaag4zwPi/WbIKxVrOnZT5hIhemqApFpZUkSbJZA+pGr15+KwRAqbbJNPh/gJMKJwy0rK1EL4bHbIA1A8pWw3n452jYwSm1TjV899o/e0djTcZzQETExq3WPqyocH9EykIBxglygQlErEDFMUmhrSqbUPnqvhnHNetkq4fK6thnPCNIrfgQTF9HrjDl0+dpxkD0N4Kz30rU9UEnLLapksDpMZFGA7Kn00GrSfTla6ZkwjCqPOxLlWoSpdUMRUYayycPvK1YtpDDYIVw6gWtacCEpCVD4W4w2J8beU62Uou2Un1SPtbajHVzM8FVZYU18laMS7I8byaXHmgyQ8FvttpVudQ2CuUzEVExuSRMsbupBcSOran8LFJZ5g7enh10Hx95aSsrX0/rZ6XxRqUGKDzOt/qMdJeeRP5UQdVclwBFNk1KKBPXY+TjyW7nL9JCpJEdPdKKStgach3zNAeoZJMwIWYWsE63XXFQgVQzNNhd+Wv/j3A+moyuwLmGfk7skESq7tCTQuB23ZLHtcuoLXRjVxS2IvAMhtXlNLGQOdy8WGtxEwcFqy29QF9j3Y+MeggPA== X-MS-TrafficTypeDiagnostic: PR3PR03MB6428: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3YSV7LnRcZ3n8ai8Xyn+xlqATWhAsSbZUU6yfdbPugmvOtdnR5Qg0XQ2zw44fiNNmEXrUnqZQyMoBdw9wRwiOjsPakP9ukO1dkFBi8T5Gr6h58CVOM7inv3t8IRmShcypVVP0oxS7vk9QxJAsVdw8jCaNA8jaWMbyURonsIgadys4XLvnEgXph1FkHxTwUOaclx/wsECn2Rvs244q79L2zDSz319I+0+FVrWeaP9eo0cY0PmFqhFxKMihWmgWBYtxAWXEKRaWo2fl7M07rlz65guOXfLey2aeZp8t098KzLXKZ1jHUIR7FMRSfy3UWDNnCxPDSMroMkUEt6lHb1ATaoCxp5JDxq8G4QzNOZBrK+rqdMnBKmSbhrdpWK0qVD1fXe1QfasLcmUbFZMRn0trDJbsNZ68DrI6x8fYTYBRsktlo4g3ZYdLNUgQ2FfO11J X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0QqmMRkxHiHf4Z5oyeCvbToqCF3mVHAIWVgXgDaC2DWAXF41H1EUYm/DHWRUzlRlO8QGhnJOS76RrlZIvM3s3lmSdgop0En1W1S7VQQeADidhnVKRWVZVttJKvr1MvaGPxIhKcpKAneh1AUxw7Y/Kw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c39fa533-6e16-4b84-2e92-08d984187f4c 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:00.2114 (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: PR3PR03MB6428 Subject: [FFmpeg-devel] [PATCH 033/218] avfilter/af_chorus: 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: vRpqCODsqGvO Content-Length: 1434 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_chorus.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/libavfilter/af_chorus.c b/libavfilter/af_chorus.c index cb6de9a85f..68de692c4b 100644 --- a/libavfilter/af_chorus.c +++ b/libavfilter/af_chorus.c @@ -154,22 +154,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_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 int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -363,5 +347,5 @@ const AVFilter ff_af_chorus = { .uninit = uninit, FILTER_INPUTS(chorus_inputs), FILTER_OUTPUTS(chorus_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), };