From patchwork Thu Sep 30 13:39:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30707 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp685853iob; Thu, 30 Sep 2021 06:45:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxsla7fF1UERMkSh2Apk9A1AN8QLGSh/+6TgkkPVlz8GJ5XfweBO1AoxuXv1ri9HeCzz9e X-Received: by 2002:a50:d989:: with SMTP id w9mr7567490edj.99.1633009519699; Thu, 30 Sep 2021 06:45:19 -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 b6si4202110edu.99.2021.09.30.06.45.19; Thu, 30 Sep 2021 06:45:19 -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="d/TCThgJ"; 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 9B7EE68A929; Thu, 30 Sep 2021 16:43:48 +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-oln040092069105.outbound.protection.outlook.com [40.92.69.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B08E68A8F1 for ; Thu, 30 Sep 2021 16:43:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WiUEhE7L/srCuKnU5/ZLikrzfoJfEV4JQem60/PfoSUEF9+XP2/7IwsMY6U4Og1Sn+h8tpqfxHu/EZ29ivcLcOuQI3xpYF+u+UXjMx041RvnN9Y3uqHvAm6VTkGvgNwCBAFVuLSg00PqMAsFIJndKocyIDT+q/draoY9MvtJFljQdJGrhAjNfRvFML0JzfHOAmsygY0yu9876WDHlrJaS/I9P5+U0WMoVHLEyvch6oyccxH8mnZTzFV4xVzq11PoduJlnwxBDsTFEk9qQTHtFhlNzQJmSyY6f3gV5ehmhYX9y2ggMYG/6ATj/xxEkST+qB8ndhBImIF6weasOh2dmA== 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=J4VA9LveMYLqfeyU+0a5CY0VvbpOo2MPvJnSIXARTFs=; b=RXu/qzXP5uLc4wKkBTfAG6AMCzhCOv6HLAvLnGMzmHbk0wKe/pYKRPribn7U8xuKweoAsWyS4MJaw5XaRWGzvWVctksfU5vYSR2FnBjC0ulc92A2fB/BlVwrvcNxocXjJywRwAVmS5bPvmepaWdSxlcTJ55a2kl9iH2Br90EKLGFaWpAznncYtUleQ/Sr90ljOdsB8BjlNna5AKZr5W5UGI3PUERivHjgR5afJ9QybRv2Kg2oCznh1ThP3Fdph1jYaZ9mdHpAcFtqP0WfQin44BpmKsiW/oWzV9SXymnnvlRiBkhORvIM947se5tjt2NhAyH2+lsu4qWDEYh4Z8d7g== 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=J4VA9LveMYLqfeyU+0a5CY0VvbpOo2MPvJnSIXARTFs=; b=d/TCThgJyi9XEU3gorqarFoCHvsv/RN0skvhwElQEYynxhX2lLJ7omeLsx6ENuQC+S4VSYqUhfwEM8QfXlOsgZ93Xwq7lKOlDXxq/1YeUoHEDXoBIlrJ32uFNmfz5BTmtNhWph5H8EUTOH3DPcB0NdaoAJs5IvJLZjXnNfBapsvVqdGJLJMbqtdGtWU+RGOzzeDACISr8Aow74n4l8IpDO0Mj1l1if6ECsqTXy+A9qz+Jj9DmDFZsWpf0bjPtRGs+YGzjC9M0DjhY5Cl84Hr9S2o9hNWmtuI0YsGfTt+nJ+oKMKyb3UUY6z9dLfs7/L3VEhEhNuqbRBVnX/7APeOGg== 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:45 +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:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:14 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [jjJIlN4FL1dXZfR85Qotv0aXDrLO+R6m] 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-12-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:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4b5c8d4a-e1bb-40c8-0783-08d98418528c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbNM4ubwW/IaMqweSBX9F9ur7qmFqzxDfKwgqYDMeXHpo84Me0fkiOG0fzFfNJQej9DUwSzdh9VX1PEEY/G5nY/SZ+Ano7DbJRk0YjsDrS9vlARh98nRnhazmwSZ1YWFkHJU3BWbByVQoNru7irssRQobMuqLGTv85Ro8PHFieP0WiFQz76D7SKmNmfVQvC0a1JSwQ0rWi6Ss3Iuzk+syIYx+P2lM7Xwkg0ly12HtS+EzCqQuG7M784ZfH+xbhCv8+HtQozT0bGav31BPB9tR0mng9DU+zQBllc1T6GZqTCI7siLiQNjNetbQ+G23ctIliZxM5rUo0DwCivAT8S4hzlLvbBtc86IUgcspuHCJPvOBMzAyqy0XKitVp5BcsfiTX5NQBvIBOLhll5xszNLDIIby1CjXhyXEmx+edh4fcumOmf4kpJTDTFU023q7AD6kNuY6BKlbIkCEptOjEYBQdMneS8RCrEj18u5MHKPiWwYQSlXY24IA6yy5VBNddc5ImJE7wyV61MqCt2aerIHmD2PAB4kgQIQzv7AmIUEb5pSfjsJ9eHhYZbDVoV5qhfuI7RdOfydK/A1KyT6shY99gd21m+LMas++YMHLJCrM8Ji118eLO4FG0VAVM7Ji9oUA6dLUPkAhIPA5w6SD4Lm76jbEIBQuzeOZJmaWypotQfn96MWGkJWArA79ACj52XyolXCrW/uxZMZNZvcBIbno9lihDVqOV2a/aY= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ar96OdRzTionIZ+1KCrEN4v/zvwigJqlBeYFAr2INRA3NFPI9PPXQmD/acG9ev2HJlps8gsQOn6oFu0k0xCoUw6sy0EoGBkwK7sud5LTaxdQQfwT9N2uCHlX/8IuHNPtxEVLF4XY5Spbfa/KM75vAsYrZA79UbfVsAF+eZjl2yoIpvneTicU+TRQlRsyuy5/8LuQ6V8wkHlV0WiWcyQIInqLaviTFqf0n93MNZLheiWOAVVIYxaWdP4j7AOZhdnLn3TuNlXD9MdYKIwKJsosRMCQJBhGp5NdVVGYDL6n6kO6DdF7ZKsi59Ud+/rWkN/VgnOio5qoG9WBTtmFz72WLEYhMRKNCNPhxeEAlZU2C2nOvNCM6WzbIIHx8ZdHp3VnTG8Xhn0Hg72hc+qk2cTUYEv12AqoWE3YL+O/SQBCAMFmzUlBnbR8l6IIrjUk1Lnn X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5Fke/vy57XdWTKchF6ogIgT8CMd8Qful6wFcOeddnXip7zDUCQiLwpq8r6egb+M0fbxlD0qCnp2jF8BuXlvgKLMlRGVdsnKgpzNGkXI0jH4dzaxY4saYoK6AySh+QkOpSNnVHq5n9O4VIvKO0x37MA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b5c8d4a-e1bb-40c8-0783-08d98418528c 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:45.0945 (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 013/218] avfilter/af_aecho: 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: eV35OigDsH2K Signed-off-by: Andreas Rheinhardt --- libavfilter/af_aecho.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/libavfilter/af_aecho.c b/libavfilter/af_aecho.c index 508d54b04e..73d9f1ac7f 100644 --- a/libavfilter/af_aecho.c +++ b/libavfilter/af_aecho.c @@ -152,24 +152,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_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 MOD(a, b) (((a) >= (b)) ? (a) - (b) : (a)) #define ECHO(name, type, min, max) \ @@ -371,5 +353,6 @@ const AVFilter ff_af_aecho = { .uninit = uninit, FILTER_INPUTS(aecho_inputs), FILTER_OUTPUTS(aecho_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), };