From patchwork Thu Sep 30 13:39:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30711 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp687869iob; Thu, 30 Sep 2021 06:47:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwi7oeEb0RboJ3Xpc3+QlXlWR4tftQp0KeAMkYLCmR5vxK+ghrxzI5QyNl5Lged57ysGBy/ X-Received: by 2002:a17:906:d14e:: with SMTP id br14mr7115424ejb.61.1633009661341; Thu, 30 Sep 2021 06:47: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 j30si1219692ejj.467.2021.09.30.06.47.40; Thu, 30 Sep 2021 06:47: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=tzue9UZK; 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 0C70468A853; Thu, 30 Sep 2021 16:44:30 +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-oln040092069033.outbound.protection.outlook.com [40.92.69.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9F8D68A853 for ; Thu, 30 Sep 2021 16:44:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=arad5PH8RUtv2poSoWgUfLpeNt7359LhilVx3sQ7Ez77Vb4zAWcYTpfu3LwhkI4ekAAwgN6uIotq0hOliqVhvfK1YLnU/0HkFuNfxHnbd+pqBWDqEVELLlBCsF2yLEOoRoQ/fz7P3iMa54GUL1/PfjyeOdOtfuMuZpd9jz55/5fll2mUmtZE5/7RSQFTQDbbB/wylnSzS5jIoEGPWUyk4SspQTNqV5INLWJwKhNd/fOiTyT4FLkXi6ERu0fh/XJbvI9cr3CL2yFXY9GKb2LQ/SmDtC6912RDBW5Gor7stxVhzjxV2tHjE/kDfP20D+D0e60Wpa5sLyAg2m7fm+xcCA== 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=jX8V4oiFvdQu3YIely0ZN/s0XzI+ftAMP4dXSRYYupM=; b=hBNa6gizWQT2bOqX2IP9LIDWef5yUD6tKw67uAVIjW64I2xIfADNM8KwGHAmIK6VHtmNGxFnGwbvdQc+Ef0rmDKIdnzwtiLFhdS9DgdKpEAeiKX4Z6fCP5UCj5GJ6YGq2987zjEsRxyvd/c+EjmP0XJ1uxr+/vkTf6rOVh7gghAG8chuMVxWfit3UxD3pEupb5jbrT3+TTvmSWLMyoX2rfZo/MhhH6grL+aj3lOcJGPhKB2KmxHQBKLr3P9E7XmnjY+PDDZmWiaeq5fzctSTc8UONMHZ1cwTaKdcZ+veUWJAOa87xI9dGWeN0aGGvNLwUZqPADNL8ugkOYvYAcrgMg== 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=jX8V4oiFvdQu3YIely0ZN/s0XzI+ftAMP4dXSRYYupM=; b=tzue9UZKPyJWhiC/rzBGrMu8ZxfLT97PGgCoJGZS6KMp1KrE2AOI/kU30jBxWRnnaF5SI/D1E6CZZH+AxJBy+T5LcsFbkVYe0B0j9CRBefRgzn2q5b9565JLRmhb3l/BQ5O1PIliy7K1+OKfH1xc7yYaCMi+hJTt1QGA65ZRuU3a3SQPwxqxm6wsvOe5QoJo363XrXWIWbhQxXQ8WmZHSEndB4JJIfebLVlF+hg7cciFLkIRQ3vNe+J3Qv0x178pU5xD3v1eHLHhv8begaj8jZUy4Hk0Bc+f29YpsNOyKIAA8jchCQm57/8ThaEeSs/fZ14cznsuFRIeBDtmXaAaqQ== 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:22 +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:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:25 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [639J8+aL165uDZWLbvlLpuqHHIEsTLTG] 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-23-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:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6cb05c8-962c-4703-fd8e-08d9841868d0 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FDSiv8ZiPQOl4JDgtLaBdJmkdTYCwUH9b6YsVU/L/IRHZOoeAY/h6kEcAv2sjs8YgvOgmEwk0L3RFg//EtBMBd1slvLxcQ8qA6s53kgGhK608D+hr8ogTvpzGZFMqbNec58fYTxXiKZgu/EUSG7HsJIMmcLgyPd/U7JD38D8O40Qcyl3Kx3Kq0LNrZv8Q+tqZ77y04JZoV156eLGxS8RV/xiOAhUm0Lpc/TKhhz4QLp2tnvuzG8eACh8vT0CsM6OIzod5H+0FIumA0XMoYSRyP5iL9gXRGM4uaiZPF0upDgw25TP7H6qxlZ3bmnsPGPAOcHauVQOkMyDIP4G1wnRBdyqf2zT/k9CQGmiJiyI2eAR17A98LxAx6I8jNuiNaESZ/wN7gACCpcQxnOh885HQkDgASH4KPD1LZXHrlVlm8awS4TclGkLKdXUPQ96bVsCKMkHGQv4VApCvcULzagHAnYiYMA+iRbLf379E+ahQOyK4w0GqCasR1tpO0IuT2rsmzVC7giN5Dl3oFtW27VybtUkmrLtb+m5ydWXAmDTIH2eqgSNDKsuIrSEkgu+gym9FgKrruzo/Jz2bLE2kbilRLEwqYRbvfS+qbAGAHOJ9R9cXyrk8Rt9xdjY7Bg7l48hzQiAu5zhdtQCiMoq86nrExk+oZwMwQQiLdy011HxKaF8sge9zJzEJg0= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W/auEA4kccm9PPN3NmWUTfJlbDa6RZN4QVFM8WOwhX9qi/lwdsd+SWCTOAYdglJ0A/Jwl3wc9QPCFYrkOsQN+dlZvQ9zgD51z5Yl7Oke1P6AfZCzCOP2qcm/7tiP1DDnB0yStPLLGseL4BXRFE2h405S5aWoSojc2Y/31QYfQCCAe5uYsa6kPFJDIoZwF/FqFJkGpJ108UoRo/AnsLnCyRKh8T0uEuJ3PXP32JuVHiFNVbjzSLggqsu+6Bzg2GIVI3HaFdcHehrXc6BhdAvcdWoChwTQOVyvOkqWh/Yw/70yKcuB1zFFcXO5sp/BUoFp3jRuz+1QLg1CUoKONjg/asix3D0vJaZ8DNc+5Plons6AB6UIMH3dDVj9ETsofvmhqLjCyh6gQm+BE0EYb7z0mhqj/CHEVStA3Q4Aqsvj0Qoso+Yg9NX4YlutZnpiVl2+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xGsyM89N/2gfnbZxRMKqX5+icLaTsR+GKijF5a2ounEad/8pmJCXWW0gppAeDWEYXD3NmLKJEl53lHROUUOa8dHZ5M3C6SZTEG9bMaj89lt3bQTjyDrZgebjP/h0BVQweqvdF4fR6/UBVQXZAcCjyQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6cb05c8-962c-4703-fd8e-08d9841868d0 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:22.4374 (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 024/218] avfilter/af_aphaser: 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: 2ZJL9UR1zaOf Signed-off-by: Andreas Rheinhardt --- libavfilter/af_aphaser.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/libavfilter/af_aphaser.c b/libavfilter/af_aphaser.c index 962bfe6b16..2d95802677 100644 --- a/libavfilter/af_aphaser.c +++ b/libavfilter/af_aphaser.c @@ -83,26 +83,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, - AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, - 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); -} - #define MOD(a, b) (((a) >= (b)) ? (a) - (b) : (a)) #define PHASER_PLANAR(name, type) \ @@ -283,6 +263,9 @@ const AVFilter ff_af_aphaser = { .uninit = uninit, FILTER_INPUTS(aphaser_inputs), FILTER_OUTPUTS(aphaser_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, + AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P), .priv_class = &aphaser_class, };