From patchwork Thu Sep 30 13:39:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30720 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp688767iob; Thu, 30 Sep 2021 06:48:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxh0hWb1KlxKqrg64YJfOAvhVVJfkTiaWYjn01L31ZhMGRUcE5lVm3cQZICpyz05G6gnCL1 X-Received: by 2002:a50:8285:: with SMTP id 5mr7278700edg.318.1633009721466; Thu, 30 Sep 2021 06:48:41 -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 r21si3276395edq.460.2021.09.30.06.48.41; Thu, 30 Sep 2021 06:48:41 -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=bERu3p3F; 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 240A368AA90; Thu, 30 Sep 2021 16:44:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068056.outbound.protection.outlook.com [40.92.68.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0697D68AA64 for ; Thu, 30 Sep 2021 16:44:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eSj19H/LF+L9dRK8gYN2rMKSA+iY3JsirLiqGizliVgIk8tzPbrYwLWXuJKDe430BKKVFGru/6uIQx1orYRYeIhYzGBPkmaWSUukhTNFF8GdpUzhfmcEzhePITDTEJ0mHbfT6U2+z+w38OFxQW13kXCW6Y+/N22L8kyimsCAxGyaQEm6ENqpuwWE3vZM5+GPRM3lDXhSpTSmCxO2EXIJj8TvAE2ogIWCETx0AuG4iKrvSzb75yxPc1dL4Xh1YSO85jVr16cTibGYtn6RJ9x8LarnL3v3Ok7pEVIk2vc1kS3Iozlhvj62z/kCdIu98U0RS6OXgYJ2R6z9c4xQ1Vm+CA== 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=d4GOnr3U8DchNXQuA7Ma2SICf5wXD9Hh7zgHpjkDgQ0=; b=jOrdatEYTEvVt7SlIzwaoxt0emdgegJlsYnRvw6z85siw+Ce0HNUjGvzRFYBvqXRGqx4hY7knHxAfcZW8Mqa0AgEeB4bnHTXAUt9fC8jL2yQGE8YKF0WXriHiBYsO5YBD38P3KlgveE+8d3l8LqErNtSXfytzqQNqSU4aohi3NtL1RI3rhMB4WYNmiuYlfPH/e/C6/ZGDEE+4Vx0E7NP3BbILYN8Y04XYUm7N26NsaE2JD/OmdlqlxV4i1xU6NcQuwL64t1RXKOEf9Aq1q9w+4hA8bemc+kB9j0qMlQKajS+VrgOWBzxtn7KvcvlbbwvqhvoHDEfeh+/vLi9ghetSw== 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=d4GOnr3U8DchNXQuA7Ma2SICf5wXD9Hh7zgHpjkDgQ0=; b=bERu3p3FJaVN3OVLthkG+Enmx18SgUFC/0JYJPBCeHbFXqEn2sIyqiP5iPeEneH6mTJx/NNzSeOkrsolIpxQ/xyCXoP4drDFT/62VlFPUrQU6T/pOYzqig0la9vyWrcl4I2fN4qHjLoxOF7wkW2RHsKZy+qU/L6FHrbZlNp630zetDF88oXXyArRDVqja7AWUaLLNrvnwKjNESQ6ONS5jyAWQO9m41j/pu1quxC7AVxMVlvozukvHdnPGu6O14dW8/M7+ys31XghRoPWt/RmkACFPmKu7ME2/OdXI8lhl4Wrd+mP1OAiXgJeGuFPien7m2+nc0GFdueh8MEDK6dleg== 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:49 +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:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:30 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [4oMozu9E//UhcvJVRMUkpTUlT5h5wFoM] 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-28-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:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1f5a07d8-42bb-4898-3c6f-08d984187912 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOddO3cs4VPgvljjATDTe4RqLGkLcJLcg2/clChYziDjwOPx/VrtvpPnKEqbdtMGNz36Rzm+2BLnoVoRgREbBGXjCnBpfAXdzmwklSBcNDwY9pRIE4AwPuprOpWO2dcwCgJYpJexrqf/H96dNSVUdwe4Cc5JU/F2G2FaWLYptj+xU3JQRTEjGcADw7XtfiM0JAC+yDUE/NS9KaVkss33cgBbYvbwzVu8aWkEYS3BBtI1xq053U8DbljLHlPe3/Rq9E4hMqlgDg+ljILyBoWCKGLVVT6ADla2gKd3XhjOnOgqIf2PVle5WRjy4aeB+28JbqGv9owMSmLZh6zl+Aq/jVRaVDSuHlX0ViqN2X7lucwJonBOtn7qiT5+EHNH56SbHTRmoh7ndi2CnSwrha6U1HfYi2ZVTZy1+DQZed+X03SvwKU2Tz7Gk0Vu0ggHzwKYBWZ0jiC1XzB/8rklB/t5GeokoMV17pXKfG+A5WN7UlOtamL1Hu6AD9+OeVC8TjpR7wunjjd/J9neWPjMJ1ttwjKQ0jiXKfHQTFa//eo44Hjp7VdAAvlP1dYnSQT56+HURvYr6qaswGY/nq5NXqsx25UpRaFeR/yyRIg2SZqAWobd57ZHJZSyrFV/9JFxK0UvSO0n3W9g9L8Db/E8fLOEepTreebJ4JX24t04ixnZ+B0EvMBu0teDdSdPnERa1Yx4d3nrT6bKj/HfNnwQgB02AmbbC2OA9c3Ds4= X-MS-TrafficTypeDiagnostic: PA4PR03MB6733: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ada1Lk1yYioONTbq3wd3Jfh4aG2U2eUT6waeg7xVpKM2RzyinqPr41sjfFRHvmSeq/Vj/RlpKhSEEkO3Mk7BOG2gJRz1pWeXZXq8GF9ptHlgSrU7RsL9R05BTaz7ULqAuIhCBdjnFpGb0te05LlsOYae/C/ve+AeNlajoBTVsgzGdpIEqbwbQ7ID6jrnDe8Yh91FHtRYjRW3yd+0AOy6WIt4uYCruxgA2QJ3iQrnkcAe6E0gf8XPPgoZNJXHwBj9OQfSQpMZ6J731USMCNPDVEq3Yi2lyeeHiSN1iqkP7dD0uIY1Kw1qfSeph5QxfPeyoY2g6f40bu8mb2IGfL7lMKZfWdoXr80icGkPZOzJNyXpJgvvm+oH7PTnYxp3D11qcrCLDTfKC08Ei4JHQjwlCLE+vulxkXo2C0t166LeUwVWhTtBM7N3nixWNpesAeQ1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3IkZFcmVYpkzmtoZGduVLS+zg/xjDGDitFdqcq4JTpflUFaEzJqlV06zRLFrEstRaNZG+KUi+kYPtlKc1y6UbIf6IsTWWEBABSBhrN7hzIDyyCyOYN9uC1QMF8k+PQb+0ruzujJW+gLBwpXwr7wljA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f5a07d8-42bb-4898-3c6f-08d984187912 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:49.7096 (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 029/218] avfilter/af_asupercut: 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: ZqZEWV909DVX Signed-off-by: Andreas Rheinhardt --- libavfilter/af_asupercut.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/libavfilter/af_asupercut.c b/libavfilter/af_asupercut.c index 0efcbf8d37..a4c2d15154 100644 --- a/libavfilter/af_asupercut.c +++ b/libavfilter/af_asupercut.c @@ -49,23 +49,9 @@ typedef struct ASuperCutContext { int (*filter_channels)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); } ASuperCutContext; -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_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} +static const enum AVSampleFormat sample_fmts[] = { + AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE +}; static void calc_q_factors(int n, double *q) { @@ -362,7 +348,7 @@ const AVFilter ff_af_asupercut = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, @@ -385,7 +371,7 @@ const AVFilter ff_af_asubcut = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, @@ -410,7 +396,7 @@ const AVFilter ff_af_asuperpass = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, @@ -424,7 +410,7 @@ const AVFilter ff_af_asuperstop = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS,