From patchwork Thu Sep 30 13:39:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30718 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp685372iob; Thu, 30 Sep 2021 06:44:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQalHvBQKKmxONLMuhjT0JAQY0+VZXeIVEwXK52mq8i+ev/Ry+P3+YNCkxCXblqcRlpkZH X-Received: by 2002:a05:6402:1545:: with SMTP id p5mr7571318edx.110.1633009483482; Thu, 30 Sep 2021 06:44:43 -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 v8si4770750ede.567.2021.09.30.06.44.43; Thu, 30 Sep 2021 06:44:43 -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=LkEQw9Qa; 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 8763968A8DB; Thu, 30 Sep 2021 16:43:35 +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-oln040092069046.outbound.protection.outlook.com [40.92.69.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B23268A8DC for ; Thu, 30 Sep 2021 16:43:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MA6pvtMFwrbRY0kvlGyN3baWCCUtS1EtgwmBZOEDnijjJYUTzW7fNKH6ZpHI/I//x1i4j6gdWB7FGJZfLr2G//UCXNRMz7V/yigNOBKFAOnHjBamPKhH7RcrEIDa/QAIVg+RKP1XsByVEGckM2DKr7Ng2992zTZvlwI8BgQPot3zIbasEXWxCOzDBc544zuo36ptz0Nv9Gsvrw72Zad4JwHZU/FVDtLJR+V0rZo9LUxzkHGIIqwcCkRSODZ3MsUkfNmm/lpIcpQQDnLrFhHiGlVWEpOZTnmWW+G92KVUDrUaCoUovTGkcnw5TuqnyEJAKlU2FxrsCnrk5bCKEVEnGA== 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=oVcIsibt3yuhjy4JsINqclreSdG1dCbd114DoBbzpVg=; b=n191WPMMS9DXuocmSZB7Tsmzm7NdEF+x7Yu+7WgI8pjQ8eAgjknGCaiT3/Nne8E6GRF7LUCUvb5E85WSBi1aawv1QoeK4EnK/0FinvqEBz/AHf4m3w44jMYR2iUsUdpywmU72nEmtLGAqkraLKjJzk0ogpCE65tmu55Gl+zQA/+XBRC3m1RNWnJfweS2wEg/Rep5ysBrOq8leMPhi2NHjvgKnGEfBgnxxVjyL3H+DnAtRQZY9XU64rVDkrJU6eYsZdJtfbmtt4790AfR8AwsOw8dzur1N7o8mjCrL6GHeVCkeEYJDg7GGiSmRmOzEvzgLvIhHzjwYGv5YkaVBvtJOA== 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=oVcIsibt3yuhjy4JsINqclreSdG1dCbd114DoBbzpVg=; b=LkEQw9QaaxjLikyspOHb8+Tzg5OfP91lPWTpcGzZCk3GxSCl1Dv+/tX6cJq7LmAuWzT2OGbKZQUdXGKe+3Xsjr7QybsGobeS88A+RsZ2fQs9fM6frO4b4U2kzkgcXzgYAaOQtz2rvnXJhBKBZDnPrvLbdSn/u1iKeiMHJ4omdeIDeBJTnB/cFSfsGQ596GCMRM42lDZtOFwy/4qzNOu+ch7FGjE2g78n0/l19hSsj29pnnuhCWVnbVyeJZ1I0+DQGkfVnw1HWb//Ag0lNZWKgmv468FdLeSqSMNxcXAZ7j8gdesqxI6clfdJ6Hz03hE54mm6TZEq2jkQLkvrbrqShQ== 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:32 +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:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:11 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [mZH8JTuHmhQu+HR3RvLxZprKUsUHpdFW] 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-9-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:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ffd5d95a-a927-4ca8-3c80-08d984184b0a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9NZAhOZbxyPxD64t6XTzFQN4v8gfED47HDq16yb/NzCv4IpHPEWzdVJ9tzXuvCjS++UtX4s6N5V4ZICkhYQxWs5kqggzyiTuUS2m6+q6zi3vDzgrJHvIMxEGdjp3RiNnPSPQNfHwYOhQGj5krBSXHFvfYSz+IdfDo5DmgYv0W8vgSti8fPnnjRIF9e+BqPzop+0RlRdW6V5uq5fJWZTO8qzRSK/sVpN+MHC60fIHp7jo4+YrsqRFm0EjQ3DEWeZJGxbMjzozderdxtmQvTffdQT3h4j2miEy7suvR2hIPqFlkTO9xn/QHgg/fYKDDnizsASwy/bKWvCLptJ0xyN0NxRZilVvMu/Hge7HQYOti7fhUjzqr46Tn/CJTH+cVEA4mtPoliGe+Y9rYrZEzzvjpHmYsExDqfk0TGXHTge1Ps0hJLq3JipAyJ09QR8fUMvuOX9ShyWf/KryzSCLVXjKpIHj2dzybQL2fqv5Yt8kgynvAzCR3XAyVUUxfCrFPH0clB/mUY+DxPPQgNcbPb6to5uPC9GLozgLELtQQx23Agpa2+Xgx9wncLNCbA4X95z64bvii1h4MiQf2N2ZynTQTUZeooMTabTmn9k3K9XIIl0Arce4A5Hzr4uTest4F26C1HUrNdh4f7/nv9o9LNGeOrMFrkktBzpA1Gu/0mO6gTe6F5K+V3GEdTO5kv5l0l8aXsU= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EVNyNaLXzkhf1YGp6gOg82wxPF98KWmxtRhMdeJbTKI1Gwr9/7NNWByFFl5qFe/1/jMOqLwqejua7kkFnPC2TJJ4ya4mdMUi4+5kuf31cptser7M25W/V48+sNdbe+c/p8GFqtT0ZTq7NC60VjazC405MKSL+GPeqZieZbY/KMcMPlHFqZnWuza13ghMh70NiAVZKL+Ii1za5uX+6Gqqrh2ovkH1/elsEtrjK+FVPoyrRMVHqryIHFy6n+PX7XsB18+UUZ1dG7csN/9m+7bGW/cXP56KJ4kvwe3VrpW0iDmX614falfSEo70OLg8hBpY/nbKsHDNLM4xQ45IHiotEn7CBVeFtlfKJEl251k6+6vOqcvcN67uijjrXrYt6mkmigNmyDQ6b2C9G0tlu4h+Jw1vRaFqk1DfLL+t8zH+P2YBgpXxf/8R38nBlDrt8K/r X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Yx9LR76KTsGUxWDXiKrys++5iECulvzl6RaCtn0B3idouMMoUApV94oYVBrjWYLUPgmtuY7lGKaDxC5ULzHVPG6lR8vuq5WT951+9t+EGPSm66iKBHnC786zvY569FC9zMCLF9WL3ixMldC5qtv6oQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffd5d95a-a927-4ca8-3c80-08d984184b0a 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:32.4849 (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 010/218] avfilter/af_adelay: 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: oeSRdcOSxo3k Signed-off-by: Andreas Rheinhardt --- libavfilter/af_adelay.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c index e67f081b97..c42fa2d175 100644 --- a/libavfilter/af_adelay.c +++ b/libavfilter/af_adelay.c @@ -61,24 +61,6 @@ static const AVOption adelay_options[] = { AVFILTER_DEFINE_CLASS(adelay); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, - AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, - 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 DELAY(name, type, fill) \ static void delay_channel_## name ##p(ChanDelay *d, int nb_samples, \ const uint8_t *ssrc, uint8_t *ddst) \ @@ -344,6 +326,7 @@ const AVFilter ff_af_adelay = { .uninit = uninit, FILTER_INPUTS(adelay_inputs), FILTER_OUTPUTS(adelay_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, };