From patchwork Thu Sep 30 13:39:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30709 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp688240iob; Thu, 30 Sep 2021 06:48:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx05wJMF5s5x0axyaVfTLJ6jA6lFpDxn0V9sFtBQNWSPxtA0LXLjJi/B1265A2oy/XC+rMo X-Received: by 2002:a50:e141:: with SMTP id i1mr7265835edl.157.1633009687702; Thu, 30 Sep 2021 06:48:07 -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 j4si3564415ejo.225.2021.09.30.06.48.07; Thu, 30 Sep 2021 06:48:07 -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=csRVynvl; 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 9829468A881; Thu, 30 Sep 2021 16:44:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064099.outbound.protection.outlook.com [40.92.64.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77F8D68AA16 for ; Thu, 30 Sep 2021 16:44:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NwRq4gqFptQrUKYeIydaljgFMs5K1fUsBVntu81TPNR0XXY6CbLNO9TeyzEJ3Mrgfh0RuYrSaBrOQ+sqDO+M2/Nck7wLYqA8LDQQLceT3Mjkg9zAwnmhhemzNDEQlnSAfm992t5X0pBB6vPrxSGWYoFL59u8DPQdLYV3Ag8uEdnPzUKVBGqZhLvpItU9EphTePdKVDrgdelEISpi1j+weDJv2E6795DL3Ck9eSYo3jaUjH20YgUxhnjAGwIvXIFGIQfTWLRhfwBjiMAz61RehYxhOwDY0z4M5i2lZWzeJq77ooYpteAG8YMJeCSPAVAgrCL/tyXgmU9EXgIONOb9NQ== 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=M+OMq8VcYRNikNKG9b4NYChOjlrTSzNbKE2VkCkcUD4=; b=CH8P32MfiXh398GZU26nXGkd/sbGkyuCJ7Z1EolnB7ZXdesXki5BYXYyYjTwL0TX+lSaQP5VB2xXyCUGSnv8qTiOrjjWMNYdt5iB8/bIcFbhmXVBeTkPpmMmcaaO8qMSh1tiQxicmO+umUbxlNWZ8vazzQehmROjw96Zavmn61pTba6q8kNqi+YercNArn3I96yw3MP9kua5nStP3cQE6/V3gkWhYvUzHgc8kmHzyZP9K/Y2EPdEEAKUu1X6EJ7AeMfmZqdC9qHwHBWmByIzYPuEsi1AaQLDK5FDWmQQa5fcjyKiJYgftlfo3qHtTk0ChlKub4bqQWgL5wkswICh2w== 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=M+OMq8VcYRNikNKG9b4NYChOjlrTSzNbKE2VkCkcUD4=; b=csRVynvlQeppfxQfQj0p0A/RJnYF/SHOicYyayXYIrl3f8w4SurSW1iutCBjySkiUT3A2N/KiSMQUdjPprP5/kmAYd1uvAWgxQ5Vax3mHnM2fdd25LkYfeL6zPRK+zutLn2pEcroJ1maGQDsFpin81wmtAVrUkGaP5Sb4b47TFtft11OgUlCxKefbYI8Uvym/MOtQy4kOauFeLngCH3A5Det87tULRDneUs8dmjS9tzHTh2nVn4wXxa/7i7qUpTvswzqkgVrIhy/l+xAlKrUAi/epjO3zXUQxoPAv1nEkiudGm8tEKY9cGJ2MSbWwUxlY4XUysCby6M33C4Qli6CJg== 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:44:39 +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:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Mr8+zLMOkAuIrv283tBvtZe17eMi4Exo] 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-25-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:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2d4eee6e-6633-4d63-3621-08d9841872c6 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FBJZxyHKSN5j/BVIQLQ5poOYTNeSpN/RbUCM09S0prl0GOQ+4ucNEYj5PUQIfIB3wRkfYzoqduGICdDsjNQYUBUriVJeDrXx76j7CXtNSlYCyTUY42MJ+2YVPZREHaVdtuKijkFmcm+66bh61Eoz2pUeLFB/0w4NbUMbILuRWex9xWQoGg6jjmiRqXwjmIXtUWcucu7hf8onMCsHAqr4Qx5pnFHop7S3aOhTA4ZiNk7j5Fod8tV97hOjrhnFInE9KxCE6Q/RQkgTuFLCbjBQcm92JGI+P/lhRit49Pk8c+h2iY+/lGpbrR3DrBAOEQwYr0LIy0veHpEhITwR06xiRfoCg10lGDsFr3bEu1VNBIwzzp6q6lkGSr3TgDGi3QxG3xTYh2fDXoKtFirM2lGJJ6dHKwexLgBdWuYKMCnwBplIsapbCxVDHo+R0H9ZvYW18BN4HHvxKUfev/7Ux1SLsbNPX2BGwnTonD3TE5DkR7vKOpVH7WeRSeO/DzOObfqDxwZ9KP+a1Ol8RoU4B9kgOMuPax6LLO8SVrygImrSuT9uGZNOL1PUH1O03ZqScbDMSZV+EgAKov0JjIp3Wp1PSt/mCs4xtR+MTr3vqQHU5l6VBIIFV/K7bAzpR8/29rjXMZbg6eCAkLeYhgmE6x6FODNmF+gjP21eH1cUR9A24IGJqUzfMl1dP+0= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KGOzqb07MDuFVpnh0N0cgLRX9XrhMqojXnv4SKD+2PcWaRGA1sgbY3J/RtNfgUUFR639BB5j5hCXAtO8Dpd+UmtL+6iCRqxYVAZt7O4Iutn4KmEI8xibCoQszV/WjWeSAjtrmQY+lmog3cvApAmUWh9QG4IrAeLGYD13tilho+dbgodxQO6kG+apKTYq2GeDXXZt0l/VrQgcetMl916xPo6Gv0xY1Mk77ayKiub997SNZ+GP7j4L+BOLRkdXVTYdD7zHqHJFVj7f+E7H3ozf0nzruQ6UVogXb15M9V/6DuabjDq4Yoopr07Fr01Yckalomyw9rN7mSll7M0J2KcQPKbwnrWxfgl2rIYOd4Xhc0ibCBXe3oyNGvQQW7SvhIrCXjfGBfZj9Tlro7DH1yXmD5x3qZiNWxul0EF+4QhfCqryc5YlfaRGwZuh7vDzueef X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EP6o3dJfF3NmFZ8+S8nGHo3POGAgA8BNL0nsbi2wEzZRelHaRQBnoTkCMt6PZDPci5TLc9GIqy/qYm2ETLSRs8bqKnrLrhpMaSwzAczANe0m0TeW27KVyWYNO074t6utm2EyKLFYcjZsTJytEVNiuw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d4eee6e-6633-4d63-3621-08d9841872c6 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:39.1460 (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 026/218] avfilter/af_asoftclip: 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: 1Quay3gnSK/R Signed-off-by: Andreas Rheinhardt --- libavfilter/af_asoftclip.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_asoftclip.c b/libavfilter/af_asoftclip.c index 50646738a4..6ffde4431a 100644 --- a/libavfilter/af_asoftclip.c +++ b/libavfilter/af_asoftclip.c @@ -88,23 +88,6 @@ static const AVOption asoftclip_options[] = { AVFILTER_DEFINE_CLASS(asoftclip); -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 get_lowpass(Lowpass *s, double frequency, double sample_rate) @@ -504,7 +487,7 @@ const AVFilter ff_af_asoftclip = { .priv_class = &asoftclip_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), .uninit = uninit, .process_command = ff_filter_process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC |