From patchwork Thu Sep 30 13:39:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30695 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp688424iob; Thu, 30 Sep 2021 06:48:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEaBtS9Dbm0I/g3UDrdpwdOte8BlQhg4Yv07kEReYHANvQuKjF7Xe0FvflEN9TdPrLiwOr X-Received: by 2002:a17:906:a082:: with SMTP id q2mr6767253ejy.535.1633009699471; Thu, 30 Sep 2021 06:48:19 -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 hk18si3605088ejb.238.2021.09.30.06.48.18; Thu, 30 Sep 2021 06:48:19 -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="mMCw/pH0"; 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 7D31D68AA6A; Thu, 30 Sep 2021 16:44:47 +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-db8eur05olkn2024.outbound.protection.outlook.com [40.92.89.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 281C568AA63 for ; Thu, 30 Sep 2021 16:44:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GU0ck2oHMy8NvbRl2mG1cM1GqHwnMy7lGij6fU6DMxvUeMloaXI7exU5gkjKS8ZkiA/ArEhsRiiOsGf1aQKwzyoj1PuCxllJARwdbfJfHxQ2mOfO0aensRtgIWFnaZztX7TSpqGllulht3K3TtD+135jvPdBI5B7Shw4a76reziiqTBstDwko7jb45x4MMVDVxIEyuyZyaxOM1KyxNuxQRGRBysBfhctYO1Jfqso3bMiyVBrMiAIVbV/wY1ZYSJBkpVH7HaexvOhGxZj6KCEnfwHwod8uDNuMYHeiZ2UbEpF8AV/rs3Bty1Kzc0eXpT+eNE+GG+vuif4pYiIc4VZFQ== 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=O6HWAyxKzisI/FuexFxYJxiyC6JoEpt8oKRdta2OSvE=; b=FCvHg++dvOekM41wY6vfLrNw8Qq4Q2sAHhtc74uatzQMIX3hjNkWGeI7fvH9qKIC5QWC5NzaEbpJDLU5uBBaFMk0Y0SSTpBEH/wcvP9QqODuZ2l+T9h0gsMJJ07eAlRGoQEi6HK1dp7XbpQ6VyE239/w8V1O0Dh+SFKOSyPWIZi0u2Xu1sSV+Q4gofD95oIGdEQGMTb4N8C1DKVOZ2ucfgArxCK2lwofuYZ+IBFFnIXe7Bxup722AKt3qcL6wJcG0KnykM1pMq64RzRz9UpKXsAFaNIyvYd4lRGi9PmY2nwGNWQWzBeWgLIjPfeIzQb0GrfZOvxA9nwWK2hSctfcwA== 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=O6HWAyxKzisI/FuexFxYJxiyC6JoEpt8oKRdta2OSvE=; b=mMCw/pH0IuLmtapLtK5H++8yya7x4S0X5WaYBfHu9yXghN58vjQ/QovYS3Rz36yWNfXOTLbt1CzOpX65/urNg5CbpARRK0Ci/g4Okh8+McHyNkE1MMBlMT2u3sve+ThOgnCBgIYRiRq3ii8LtrpW+vCT8KtapKz0nh5dsDORsV7P3YDNEEM4CprfyOsriSTPGXNCmPebZCpcim1mLcGOV1GF8S86G7PBGlbbKdcegoJD6fvJb2rzf+iHM6D6yWrMqQX/aFMnVllZFI6myk64hKknlZl/sTcSOzfUxNwGgAhV9HnhlgbEChOIoft7MdMPUudHqIh5Ny8Xb9kdEHFZDQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6733.eurprd03.prod.outlook.com (2603:10a6:102:f3::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.18; Thu, 30 Sep 2021 13:44:42 +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:44:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:28 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [YQmfy4+GCCrpA9xRBhDfO4IIJBel/R0g] 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-26-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:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0c3f8962-bc2c-4ea8-dbc7-08d9841874eb X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOddO3cs4VPgpR2ICz6aZgr/M9srTI/9wY2AFVTormRgW/LLHA8FAinB4qhasENimgcOh51FZVHuB5Q1Q1YROzWFA5esCBMDzSYa3AcD9ptWRcA569q1X9LkU5Pxwp3wllFNZA+rSbIuYKM++Qdv+JwIKMY39PhHbKoIVBDJujYZQYwoACyQ/sps8SIs24C4j+PCSr++Ku2JilGFmORwLspn7W6IrRRIQ3dfz8vC/wd60BKB5U782FQZwcIWIWEW0pTywSqtsJDHXNVpSh+sfL6AQXuJctnFhfIH3FSyRINQkiG0dJOSVTMzTrjGDdNgDWwOqA6f3AqtnN4Ud3FlLquRktQ/0nTjnQhanEYmNxG4Ji8Xw/27VC+bbMlwXEuoEEVCS9diRn4w6UZiYheHFkCt1Sngo73eMWZssWJwmraLVhI8zGkN998DLtESIDSi0sB75ywO3bROmFLpR2kowiO9oOJWStjPu+56Tw0yHVHefsEAEH4IrSAuLMW1pQFGNl716lzPTlEfuSi0UmQQ+k62moKmO5bcX8SxCHeS20+2o+8vwthlWmRvQ5Upn7wl9hTb1bHfj9wPR9OaxAH7rvSK2RgqIaaGH0fY8RPYKf9YvKO4HDsi+NRDC3kZMIv1qMW7bgGqpZUMCbooL4eU02Jn42DSHKnl4kkZt15H1DNumbPSob9US4awmA/Uv3uZgc1QsrK016gpRql3cN+RV0t06bbWHuYvJA= X-MS-TrafficTypeDiagnostic: PA4PR03MB6733: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7epvcEvlr9lV4eXWwQgFBn+1EXpdvSXdTxeEo33KWrxrZatN3rD2cYXncOK4Kz5sh8YLVIOdfZdTGcAr0eCtK0DunfHAfGBpHo793C3P3ZGCtCCFZLRQoPphioynjP1vrBmTO5SB3zPB+IMtNMbSu7+iZxhUddvWxViMOmvKtbxmH0APLFLJU5hC6DWVNSpkKRnRAcvnad6vF0sUJ4JD7IaLQR/9xpvZqakxH39fBoc2+YUvt4Ib/50VVwkDZC6MmpzerJmf1Zc1S+K3AaS5hQx1MZLHtIjO7F90EBig4MkWlm3lfkKahdG7ykWv56yWTd3skkbwwMOgQt5APSjtkWtzUQKUgYQzVslUbhqHjoU97PRlIJ/Tx2sVyCIvaib7a0wOeWNGRFjEjWh7rW+++Ttd3bJrqc/SO+QID5fx6Om8KW/9On/cq2p+9YIpgKkB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RN5/m/gK0yzuelG9vdZQ3jrZFwXvw+IOuGwMGgf+ukH6ht4jx+8KTF4XQZmbeRTo9CXbmqb1l0uUSCdiDoBd7GHqQRbTUWvK74nIy6XJmxA960lZLU3m/kRYdQSYkhGjHoOZk5X7d4oB+hiMJd61Ow== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c3f8962-bc2c-4ea8-dbc7-08d9841874eb 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:44:42.7492 (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: PA4PR03MB6733 Subject: [FFmpeg-devel] [PATCH 027/218] avfilter/af_astats: 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: OQWppE+ZK16/ Signed-off-by: Andreas Rheinhardt --- libavfilter/af_astats.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c index d43dd086f1..0621d18b35 100644 --- a/libavfilter/af_astats.c +++ b/libavfilter/af_astats.c @@ -149,27 +149,6 @@ static const AVOption astats_options[] = { AVFILTER_DEFINE_CLASS(astats); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, - AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, - AV_SAMPLE_FMT_S64, AV_SAMPLE_FMT_S64P, - AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_DBL, 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 void reset_stats(AudioStatsContext *s) { int c; @@ -868,6 +847,10 @@ const AVFilter ff_af_astats = { .uninit = uninit, FILTER_INPUTS(astats_inputs), FILTER_OUTPUTS(astats_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_S64, AV_SAMPLE_FMT_S64P, + AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SLICE_THREADS, };