From patchwork Thu Sep 30 13:39:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30833 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp412008yba; Thu, 30 Sep 2021 06:49:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+50Q9PlQ6nfRf7TTqtm55TQUPYMSfZGLonXfoj0Lh7ZLXBeoGsnGYs0K0p3msgjBGuDPx X-Received: by 2002:a50:d94f:: with SMTP id u15mr7111798edj.140.1633009792936; Thu, 30 Sep 2021 06:49:52 -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 p23si4148734edw.135.2021.09.30.06.49.52; Thu, 30 Sep 2021 06:49:52 -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=dzP4o1D5; 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 0BDD068AB49; Thu, 30 Sep 2021 16:45:16 +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-oln040092064078.outbound.protection.outlook.com [40.92.64.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B700768A852 for ; Thu, 30 Sep 2021 16:45:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O5omKX66PmHiFy5XWTWC4+umBjcNvZ15JgIWJVUqmTu9lqnEsQKKmvJ5FkWD9OIMQTAs6gF33QrOiar5HC0f+06abDJPtRqMo64464TonSNxQNKn/jS0cGzcmzGRsKkf6m6m/PQrNdvmV3YZdBxbjjrZb2WHX+Ft+taAS0fiJu+BZAS4Bz4lkfezwBl8QfUcXcx+9bHLQRkahKL4WlWjOmViuy36Vd81E6t5vbuSe9lr1n1RvZqacsL0CoXIsrhaKA1sgGMePVpZ1ZhUA1o+1MKOOsHyD99fFaDUOQ8tNX3V3tHSmAEy1owlCLE5voJQOqzWoMXAMR0I1mUulBfA6A== 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=8Xclg96DtTomCrIJ01L6SnvygpX/12Gh6GS6M1J1Aso=; b=FgS6i+0QUbjoy7G/M8/c/gaq+ii0Kexk8NgpLOkYog4ocphC3UcCXXmMbY3A4D821bZ/LW/lzlBtjbkrKjaw1IjRdzLFHwqiJv5a0YLjhSgfrTHUDisu+tcrqX0CpXZMsgTh8cVc6KKUlgETA3yKJ3kf7GW6ExkTsgbgwoGRs4FdBtZRlkK2vgIgA5gaMEkJhzkoi5aWy4bl/Wl8SHg1qMSNi4xZfT8E6fv9qVsp1j67GNyS6vRC730p7j+8ajHHZ86CKBm0im8kCHkCYhvYKXq/EhR4G5CMjKBVvrxdWthpTpd3qzUzIVLXsO94kIauMbvvAUtL1XFi9wTCuGueLQ== 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=8Xclg96DtTomCrIJ01L6SnvygpX/12Gh6GS6M1J1Aso=; b=dzP4o1D5p9zbpNsex6z73gOjoeT/vsoMLaW/R8BSPLh3FEXmopzZtK//po1Yy/0mjKICGtX6Ekq573vgrbQWxT078HgreAeENo49ATRNEaJC5tHFa2h7lFfXGwJqIIe+mNDkkz+fjmlTubWpyrZvp7UckDrhFhMmi9YnfIoBsIZ2xIXbzGVkLnMxcXvwbZGHBfarAU70CXoRCKh2l8XQrMRITp2ckuIxnam+nhXRt7RmeN607J5Urt6ncxt2BZr8BFnu3IbtFQmOae6K7E5DKJb6g0drWhIGFHYR69nZ8XSQRTGHf8aIcvb4u8qj1nWlivqRkSjgtNq3AKV4lt5JKw== 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:12 +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:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:36 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [2be27NX5niJA7tNeya2Dsvuuedsfn2Ld] 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-34-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:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 037659c5-df83-408b-ce2b-08d98418866d X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIBqLe59qjkRp21wji/xErRfEb04gImo6EHnhm9++MrMVFFCNfyqr3N6iw3ByRqnnD6BLDYqmyLgrSa8mFes/mR1GEVkdMWwBVEo9jzVr13HkPLwYXh/aFk9be2Vuh3iaT1jjXxTJtzr29y7wRXFteLaPmtJJ86Nw+LNsVV86zB/YN2C3x9NrM9lQWjgpnZ35HzRFba43sMgnKcuXJUURBVeWrcKATLa99G2RugMRNQUt3rI9UhtdBoIcKT6srR1Ga3/e78JKoAylk31HRUNH+e9n2FCw06szrVrzzbYprUr16lYNlGTf5sqIXBbgyxIrf9BVgsdzgBfv1Uh6wqvG1aRc/KTxyFb58eiXquEJSw8ef0Ry4OkYfr3rk1mxEZTv9uUGhNNtZy6BfdirXGER70tJUrGjnDJBhNzbDh9t6GXYqEPWGpY+9Kh7p6b/PKmKnlRFLmPuXFA3ir1SNvZiDYFPOfLuL9G7VnHnWUVAGwL3fGnMGdzQHXUNASn7E/voATeK4aeyEnm10Yo+qouzcUrs/TlB6XGMjxb0ovkKeWqAVL8yg/f7oaW0mAdxsKPXrIXLymrSYA47qNYmdv3ZezReXMgHGu2PTZ4IF9Sn38TAMDwLJuL1eRPDhgQyUDIAe2AEy7VwGaiQBDq1R/3xpOz0iWd0MBUz8N2yBOJlk6injQS4W+nX0fwJv6dTAoEihfiwdOjmbsUQ== X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QWoGYIGag9PIb6QXCPJC6NuI6ZjYL0/eTxSS+/KgW/1TNR028DiYGoEdfmPG/07I1XkiARVdTL6JdOS/6O8wUe0KcRpxzEuHkvJjOnFQ8nv6vxEcy3B6TA2EOnAH5SthnUbuohwwBvOyHKUFegEE13/BfGxUgweLZV6Fxl352HcUIQCquWa3mp3u6/LMfCCkjUscXna9ljHn7VMWXnPScjDqQ+sev26xh2K1W+2g/wcmCnQOqmFP+R3q5+g8aiopuUmcsd5YcaRdoJ0XF+xUNPguZXt0t2d5b/IV8BgtKb2dswUsPgvCZasZRy6BnH3y6OgtK/dPEhgZMFmCvvg4l3/uTSS4iv5PGfdGvvJR5VmEA0gPF2kDZ1JEzGLoJzCJ3AE2t/DmI7AN2sTy8AnwpqZDVWsxxkDoG4YK/wQoHHYuJNhfJ9SPl/4q/TupSqF1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PkDcPiSzSqoMLIE3BAJM5c3IdjncaGLqhW44WC6P+4bTMbXe3Fd6dDiC4oUi3MFB+G6VOzVH+yET+khLOHDVxA1VNW5h4S34qD5Tfy3VpF5KWx7cKMCP+tzKIFtvgT50e4i4T6K774HQ9HUY1prYLg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 037659c5-df83-408b-ce2b-08d98418866d 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:12.2654 (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 035/218] avfilter/af_compensationdelay: Store format in filter, remove query func 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: wM2DBsg9EYPS Content-Length: 1662 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_compensationdelay.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_compensationdelay.c b/libavfilter/af_compensationdelay.c index ff6f640370..6a58fd21bd 100644 --- a/libavfilter/af_compensationdelay.c +++ b/libavfilter/af_compensationdelay.c @@ -63,23 +63,6 @@ AVFILTER_DEFINE_CLASS(compensationdelay); // The maximum delay may be reached by this filter #define COMP_DELAY_MAX_DELAY (COMP_DELAY_MAX_DISTANCE * COMP_DELAY_SOUND_FRONT_DELAY(50)) -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - 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); -} - static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -179,5 +162,5 @@ const AVFilter ff_af_compensationdelay = { .uninit = uninit, FILTER_INPUTS(compensationdelay_inputs), FILTER_OUTPUTS(compensationdelay_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), };