From patchwork Thu Sep 30 13:39:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30705 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp685531iob; Thu, 30 Sep 2021 06:44:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFePyJqhKXadVk1RwT+hpPMkRf4+Ls/So2iguvCw9nvX36VX8d0gSqV+Vd+Hf/N7jG/Fu3 X-Received: by 2002:a17:906:ece1:: with SMTP id qt1mr6934623ejb.281.1633009495034; Thu, 30 Sep 2021 06:44:55 -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 w18si3423547ejv.669.2021.09.30.06.44.54; Thu, 30 Sep 2021 06:44:55 -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=EUHpxeFw; 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 A356368A8F8; Thu, 30 Sep 2021 16:43:39 +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-oln040092069082.outbound.protection.outlook.com [40.92.69.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E168468A89C for ; Thu, 30 Sep 2021 16:43:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TlPgSWYtnWAunl2f0LoonPxso/RJmBOolxH3f+zYtZOGyBQV33op2BzMYdB4SYimaMZL9enw85LL5vOvZSSLinZHJS99XBjliOkqRemiVErlYaOpiyWg4+GVnETBgT2YlqwSOOujQbSgSOtkaIXaUtVTgOhvv4McvZlie8tPTU2BZZIMyBFncZCVvlECOa9p/2/Y3dw3rvukCiBgMLeI2jiFghp03sxAGDV7QZmexv8zz6DbWkK41/4k2FuWaw5sSw12TWuLFM5yzBXQUJz8pt7KY/f0M1aw8il0tCRtep/q36OImqW6bZxmtUOB4jjMMTuYbkyPpXdWRf6vwdFQGA== 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=undSOSmxuBB6FCHSJP0OibZy/NppdgLpOVRqgiBOiKI=; b=jOERyNBHa5gXfYQ0UeTNY+PHJpMyBmWT1vjvqt6Dh5zSExtbSsTJHmEP8MzRAiFmKtUTyC5o5p3R660BXZuU5+HCOkupkmKt9tIiK9BzVXKMOw7+N2sed+GM3uk+AeE7WrWQmpn4RWsa9m6KFLbGMC+Pz1YukVgDvWG3qAsh/UmR04i0ET4OT+YYKNJTRkCp8fz1rJAqeYK3a+5Dcgvokd7s3Ko5yYuwEIt56HNcrrnzqGqiSy4C8Jyj2wh/bmfYydaZOeq5vXwA6KRtGsr/Xn/8xbLpLrQt9A15Jk8CQytFnMMvDcgI5NPClvH56oblx60iOeV4T2Q9UB9DGWSiBg== 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=undSOSmxuBB6FCHSJP0OibZy/NppdgLpOVRqgiBOiKI=; b=EUHpxeFw87zip7mv2QkSHnbWfUZRKkfCS4MhjLOB23Pa3Nv3zIVXc/RKDNbQbTRXsnsbSiCIyHDNKLtT4q5YpjvwZzgN5hlEUynpkoYpXjH2LPbH9u2oLl3cZ9UHG2/rY91hRVJo/JlKZ2UDxSlo5v8upSXRnDaBOdiMrrV+6BmwMFzgm2Py0Gzv5hlWcstEphEHpGwFBxPfJLSdoj3Zkn2wyNNisy+vtzOdPr1Nlg9fLImHFNLn8dAQnjtxa/hz5OsNBCu4ku0B+0UUjqnzrawarL3ci+KfwCIOFz9bj6TcJqc9qOdovId0scTYQbgLrQtqJGAqe3M8gepQO6TPcw== 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:43:36 +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:43:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:12 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [1I52GLnqLlohe3JwLnx9FYv3Xg38E7YY] 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-10-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:43:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 58302df4-f360-4a29-f83f-08d984184d71 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9NZAhOZbxyPxD1LVGd8YKgi0vTl/gzPTMdH5/em92fjqRlOipaJlijzBZfxpCOWhybz8Y7oEe7viB4oOYNALTlPqHq9QGqVFIopBA/9FrC+zLhD3eTmCJTxXNAOhWpc3SpZR/n9E//iab4siI3LGl7+gJaiWxgeoyOzN7mj5CUr0XKLBnNRf9kxh61QL2SfUAsJG+hjOockJTqf+GhVFnfYWw+cKRhgbLi1UwWMvdb1AUFsKgD9RXXrgJbX7HgnOz4olIFycfv+XsYjTiUwd/ASmsJ9QujtzhJRY1af4+nJhnyxDTudDAt7r+asdQIMiIU/iN9PoW3IHpDzF3C3fUmjenLscee3Tdw9AoCsZbCyo2bIRKVYDgyfbhZeYsCknq0pu2l0JJgIKMDnkCHF44nDy64b7qvcv0bYjYNJ8r+/gzbsP1rLRdvFwzTHexpAc8LZvTLXuW4jdEyk5NkaIbNpM9DqDMknH4ZYkA1hzoSBgK6LTednalR+ZD1Wo9dtTfgnpZNEQIHYv3/PXPmTg73QeqwSf7YkiY/1PjjFkRxxJN5aDabp4G4wtpQqSQWBOwEeyaM7VJNLh9JpSO/91pfJOWjgCYg8xO0WjJTFDWqKOAmTzmZbOPlSCdriXL0b13SoDr2+tL7UOz19t/5FixspXxmW6oN639Gf1X1o85IgYzii689h2ON+BM4B3ntcIZ34= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nnRlPkXh7gRW1eTu0zLobM9zWSNAasg+9K4myVs1HxB/v3l4IRdupADtnlV/cbto6ZRxNpWUDex0GtZ6el0nBDriTI7XoYodmPFApyT53QNsNx+UwIu7uYcJo6+pTyVA8i7Tp4hbGK//cL9T5Tzc6rm1j5mk7VoBl9Y7GmayY06Aoz9fIXq83xxXWXBXCMLBxjCyPuHwQcyck8lMyPi0gdTqAFAzfPWrbSwMY+74L3RZPBWMnf2A4vqhM1jjWBG3AL+h0lEtlBoxAmn1AkJzloAQpMdRfqI1XGqwIkb9nb9Sn3igCftTkjrR0+ywZyX6y8EKwNeTSGFb+B15LzhbD+ElvVTZ1dH2cpvqv78YPhacgv12UyQODYzopiPD1KPVIA7hLow/BRz4iy8aYMGA+P9XQ8Y+Gg3uYrqrDH5Z5twotp7yyCh33km/n2ADwRKM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MPkCpjTyW5/fboigLkdP1AW7n013jkPcDgbxMbkTR7UYoqPYXg9c8JZTQJeh3TLR4iDD1yguacEt1Nxv9uR/jnQoxY16w87k3DJ9p4KkXM+ENVzzA1TBybOxH+FuJhebPYzUNOmKKV0W7YCpz4tDOQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58302df4-f360-4a29-f83f-08d984184d71 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:43:36.5531 (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 011/218] avfilter/af_adenorm: 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: 5Cx/FfjRpLxL Signed-off-by: Andreas Rheinhardt --- libavfilter/af_adenorm.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_adenorm.c b/libavfilter/af_adenorm.c index 2cac605a2a..3ad1e7f594 100644 --- a/libavfilter/af_adenorm.c +++ b/libavfilter/af_adenorm.c @@ -43,23 +43,6 @@ typedef struct ADenormContext { const void *src, int nb_samples); } ADenormContext; -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 void dc_denorm_fltp(AVFilterContext *ctx, void *dstp, const void *srcp, int nb_samples) { @@ -310,7 +293,7 @@ const AVFilter ff_af_adenorm = { .priv_size = sizeof(ADenormContext), FILTER_INPUTS(adenorm_inputs), FILTER_OUTPUTS(adenorm_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), .priv_class = &adenorm_class, .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC |