From patchwork Thu Sep 30 13:39:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30727 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp689908iob; Thu, 30 Sep 2021 06:50:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxi9K+D5Jzw5KrU8CbzSozOADNOPlKSRXvJAFTSvzWp+Nr2ST76pQaCWoIvKpAvHi6SjGhN X-Received: by 2002:a17:906:4892:: with SMTP id v18mr6910514ejq.145.1633009804125; Thu, 30 Sep 2021 06:50:04 -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 lx25si3470224ejb.159.2021.09.30.06.50.03; Thu, 30 Sep 2021 06:50:04 -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=G+1VHLnY; 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 A5EEC68AB9C; Thu, 30 Sep 2021 16:45:17 +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-oln040092064037.outbound.protection.outlook.com [40.92.64.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 789F368A9ED for ; Thu, 30 Sep 2021 16:45:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Opcex/szPUk5FKS/R1ksZCBcb+QrnTrp9HBjLQRn5d1Yccxoii8MjWe7duIq2t9GXLNJo7IV+DJsMVOAA/9qIHvVn0Rff58R1LVvZQe8ZU5XEsUiSdua7i/l7YaAULDNsvZjxH8GTqc3LK4Bmfia8pRMH8zTSns2SKbf8M/k8zpoM7e5XuBoLvxWrdmoVWCLlSPn3ur1oFwmKcQ49uW3SBWBKgwyCk3X/s3rpj7sR/zcgP23TUsvMLll9wYhC8g/U+beJzz5O8KLBjpxUMjtyKdGiy5tlhQe4dkZ5guyLUCicXfDv7klY/TSp3/8gL/e6PX5h966RM8oyHhig7b6DQ== 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=dN25W/GfLEN9cNXs0xQhQGtcW1EXJqPzh+0Bds4Ofqw=; b=a+VpzJDYr4oIVfKdnHS5CqgmZh/liIBgRCokB5UngSNeghgMo0jS7o3u8hr99RIavaFIXiM/+H4X7hd+EW9+TeDE1RML+v1JQIpzKFtxCUdWujkbRJbCAJzBHKp2kmi+Y1RAn1x/44Z3g00nj6xKdhRa5ABv4eJI2FagTWYAvvY8Uoe7fkKWJAHbAYRSnc+t3FNP86LQsoGjlYbu/8Ci1PxR2nesVt62d7tlypUfUigOo68KzIDIgaXNrOsioaibaDkkKLCejlyV02dWSg5918KXEE8BkgVarrpxAGshf4yRL7od+oDpqu1Miq0InS/SVWUEuvIWqyqta0GsM+FxAw== 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=dN25W/GfLEN9cNXs0xQhQGtcW1EXJqPzh+0Bds4Ofqw=; b=G+1VHLnYR67bb5RExbKZuoENl4LnrGjZFaZCJai7ZGBoc8vLHe4p1uSR2hV4IEXHfKklcDeWi9FwMvU12nX7cd5GNP9/DnsZM9dXeBLKs/hHMK95A8caAspx9ZjM7rreTfGCuiXPQQswzdF33JKkayloLo9pxZsPreHifec9s+uYipGCdANoyQMqB992yWg5Hy8Mkx5FkCJm/L78nDfs7XwCskuld57yIFTnTV3iFd224eGtoVZrZHXFTZbYX2MRlzfoBNfXYYa2N5u8s3NkmJ+NFAk9W+PR/FoKcTm3OoZUrweJq66GJ5bEhn/HZOLqtJx5FpZFGB7LBGynUvc48A== 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:45:15 +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:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:37 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [lt47ArjIzOOrx8DnuCcLmNJYFX1OMi4K] 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-35-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:45:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9bc455a1-1153-43df-7a26-08d984188836 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FMx0hqN9ZiZz1d2/QTEKSEy/N8Yn+TSbpGjf/bC96DVdjSwUSzdzSt2apT8tU86wG/gnLogRdyrJbOdwKAj/UrJjZoDbv6JiAJ08Q6GAK0ts0kwV7wxSZHBBzxCGYlNM2a5PU2CFiYfkRi9qVojW9rP/3HSeZEDijbI9DSNKojhhQ5qIzi6HhSxB2eOQ/XFvr37sL9pkSL+RYFT9Au01jR1GdqESCb5Scd24T9qBzkrU3kNP3htcRlOyzvy+/eQhPt6py5qglbP8MAL3hoYMcNvKPG/RUYZWubpHAD7Fxyfeqe89UiuTqKoHFX8L/9TdH+uiiue/ezH7VvUNM7wWOsqsJB99hxZ9+sAlMBPR9cWxgGdtzUb88I/YICTZMdNKCFW2P3W9scEO+4XCVRlfm97ime7PQUYeVHr9ysQPu3fHT02CfA7Ijr/NZmJrs+mla7qusrxYCingFYXKloLszHdMlnXGaQ+denWZzu+kcDgkMLoJBnShQ9zmdOiW2bxDGWJ3SAq/dJ4YKH3Bw/JbuXy9RyXiXWcKK+VmtWjZJ3g309dsvnOFW1VZ4R6bmtigWdfJc64+wYDCTi5lp3vji+aE2slHaAfw9TsSGgnM+kAwHTK6kSBuInlj7w7/EafKBnB6OwaOjxoW/IXyW3T3JW/wEBOf/3Diwal0+ZNtNHE41WtfYojuiMw= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +G5lsKH/JVvyNRDF/t9YFP7+0UT9Cclfb6rrf1WX2JReIEWIcsdqcdRhQZ+8Lr/xisJQJvktwJmXZch7aCP+TNU39eBYStDK1Cko2/JNjYimQ7GDO4bna1xtw0/QTiVzaSPHS+sWz6DP55C3UCOeD74kW76Gen2oDWavUN8RRG+QxXm1yVviXwn+91BQg4Lo7cNujcPDrR7cdbG4huC7KHbWjl0Tk+BcXH67aNvQ0nodM0Z2riPOhcwreRYrIvOjI/+VOvyA1hIVxL5ujPsa18LPd5dcN/3XbUSI28JxMTapLRrmZBkXG62Xvl18NJL8pJt9mwAu6x2HOT8ReL4cmk6G5afLPaRQpLfWkG1ai4EVtAI0G7ps6Jadc7fGsrPlE9KGYUUkLRGy5rJCUM+++2EJwSgy58agFf4wCG5RtarlYvk5hsf1TRhcwxD5QOK6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gpoU2hM9aTQ6Wt/yTQqx2050dAEXdNjO9NZrIHFQzeEw/WslpoJbfTc/EA7eke8ng2exnRVtsvs7wdRBiJMy65sw/geSqMykSTX+orF9TIV/s2ydxuveHXkhqLcKpSfvxdMYqUugsWeoY1j4T5x2gw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9bc455a1-1153-43df-7a26-08d984188836 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:15.1587 (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 036/218] avfilter/af_crystalizer: 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: HQXsSOpdB0xY Signed-off-by: Andreas Rheinhardt --- libavfilter/af_crystalizer.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/libavfilter/af_crystalizer.c b/libavfilter/af_crystalizer.c index 9e1a4ef9d2..8d967fd629 100644 --- a/libavfilter/af_crystalizer.c +++ b/libavfilter/af_crystalizer.c @@ -43,24 +43,6 @@ static const AVOption crystalizer_options[] = { AVFILTER_DEFINE_CLASS(crystalizer); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - 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_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); -} - typedef struct ThreadData { void **d; void **p; @@ -384,7 +366,8 @@ const AVFilter ff_af_crystalizer = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS,