From patchwork Thu Sep 30 13:39:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30699 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp688031iob; Thu, 30 Sep 2021 06:47:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypg4oaJmJKBJ0Foq0/mG02lBkk9xcW15Fd1ayIX7rA1j0vKJ7vup54wp7FAuicZIz+UxdW X-Received: by 2002:a17:906:718:: with SMTP id y24mr6650486ejb.53.1633009674068; Thu, 30 Sep 2021 06:47:54 -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 du1si4138376ejc.324.2021.09.30.06.47.53; Thu, 30 Sep 2021 06:47:54 -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="Ud/HNHqS"; 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 50A8D68AA5C; Thu, 30 Sep 2021 16:44:39 +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-oln040092064056.outbound.protection.outlook.com [40.92.64.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E59868A7DE for ; Thu, 30 Sep 2021 16:44:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GZNvZIR0eGi+KCeBmX5IJxktMXGjuM1Vhewd4+eIjCC9/Ph4nzVNmaTA4sNEcR1J38h6nrl5yyWUaN6cd+bxjELi9Kp5IMskvOAMG4A71G1MSYYdw2RazSdyfGMdvM3zZPZbTgAqoJl0IMqtz36g/B7udIGRPAmv/7T5m4lvnCwS9NM2FLc3gSB/dgMLn2RReT/8sFPlN82Two9DHKWfXY/syQRRdILf/MMZTaUT1YLZ1Vc+HUWdMBDcj3haIf7EndSMoiwjJKZ6zHW4IdaT8bNdFlEWyzf0yWsZLY0fYHWWU30PkQ4pUt1XP1gMDKr9I0R+xWdWvfxbYT97eioxMA== 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=ENs67BM+ry6F5HfzEzSVniLTwmcWlIe48eVAi2DcfwY=; b=iz6CJuyBxjP30cqsAoCjlbXqY8YrldPJWXnzcjS9u0O6F8Va1pWHLMsZ2gLL8jyRDz3ogFk0rn2DXBv89p1W0l+Q6lTmbKgOzbN/FWcyGhsOB3jLUW5oXNYf+VmUEzeXuWiNG5/ms9yrGmYGdvZjSj4hS+zvSrV8YKsnQAqREUdPmdDvjGO+9G459zMuTQSz+RFmqA+Rcot24vEAApYklenDGEzaAr0JoNcPVLvlQ/onV++sPEUHdCMWoyA50MFP69/02I7eZkYaAOEerKIrc1MAMZgNKlQ92soYYCMoOcUxq/9kn/CPFwHv2R0HhR+dQP5XPQwaZdGG7y0x1JjrLA== 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=ENs67BM+ry6F5HfzEzSVniLTwmcWlIe48eVAi2DcfwY=; b=Ud/HNHqSU2oCrub5/aR/tnW44vfUp5bf5JV96uNXRjrk1fHuL1viJ5nk6NiQw66nOYYJqwpzUplnNbPCWH2f8MzfDyyTQk/3RLXAg2w7odPcR1HX5bMa4oHcZCmITsWWTC413E2C08ydzZvWFi2fn6MAPdgy4XL/397dvzkgKkpE9SOA0fbK1lbZJVAE6q54fAUuHmeXd/RipPL0hPHK+AucmtctNMCn9imd7VU9mno4g6+c4igx6tdUnToK3gp9uP8jAz2+zeLNKc0KWPUdN+w6N3+SVL/oRHTIUKAcL9WMaK6VEYAT9mpANLks2FlHDl9cu7f+vFRHxNd4/eAkIQ== 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:36 +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:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:26 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [O28ymNQ7dWxd1DW/I+0zZUAUEJlAdUG7] 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-24-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:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e9efeb68-3e07-45fe-f77c-08d9841870e7 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIBqLe59qjkRp21wji/xErRRRFI5QUJRfCRmADtQqez2j8tD3V+iy8syGirXP6+l6z1KsysLwz6M0eLCMUd6zEi9hVuBwNsvXQLMS2JHEHEr4is11oKItkENv/U4oJPgITgUOGvSKC82ZNhyq2i2DP2unsTNNYKVNbLE3ghgA2UQSyNOvuGg/VaiBw7rgoba9yGr7uDWR6hRUmR3WUNwqEA1i2rRM8uQ09LyFvYZqYbcFiVJxWqrk5FdnpWkLeqBQWzVvNA18pgG0NDjb5hmjdsxTZsKKzHdNPcFVioW/j2jap/V3IoB7oCpY4LWfx9i4wUqsrEYhrCobY1OfNPZILKUfNJQ6yuKEOZ+V9krf/z7MiSbblhly4uJWoWruwdKDWkI8Tq345j2NRAPUgxPsBuFmlg0MRF8MbqgVSnOCZCXG5OLmC9Hi7yW65oZX3MXNaHuAkyRDtNsMzLkXrmrtnPbLG+FNuGUe7Bxj4vmGMxPq4bnL+6aVW+MwQRwbP6WRcQtgm4GLigP/a8TwpQPQavWnAIu2MdRZ8rZE6uDGPaiJvANgArUq24Z9A0MDYnVkKcsqOM1gSc+Bir8xHCXA7eIfu05sjhDmMvBfV+/n8CPHJqncXFfWm89QsEhrJmGTw3xRPGJBewxosHbCxHQc84J5xaeX1eCOSAG65ZKaI1q84K6zBKG5Pc47b8b/UoICpAWh+k3wJsAw== X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: re9/HQjiw4an9F3p8lPVoLHEOH0T3kkotpzbn2vg4Xtcx1TXKfqdyrHNFJ5ViDZIIArgUs7I1bs6dk7VuPpJqPjjN1kQRYBkCcJn1A2m9vSaYkQF+sqMgApSVvGjuv5K5P3VlxOyliWtCr3Pii3dPR/pMV7F4gYitkBR6XZi7V/TAYrFzdDfs9h/fOBzZBUGhh4YFQSMylC9x3P1obS29PVG5QjzgXt2Z7BKgF3i9mO1xAcDb/5euOZdA3EGLmBL8pEDEzEjJxzOUZ7VbbbltchRnE7x5RZElKkOzd3HImWI8ydSmBYEnlDR38dmFgpDOuVRuyDd6JcPwj+FVlxve8Ngxr19k9SfgNTp5knbiODHiV6y8M/DUruNae+DnyaaZQF7If6Y0EM2rqI6uxFzEY/N+aDnihYkrKBlnDFOKWRFK8GI9bSyo0PwmxHkSON9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oIZw4CDZNP4MOnTW1ZOMdPHGNkGTOaACkIqn7TX7F9qxG7pZuSpHMDhOU+E3e1ptjjcXepOPhYM155RywGX411lVehLhU5qQujDxBK9JKWhIgw9OtsQ761kKX4wPYgqm5wUDKcgWOW0M/PzT2HCtBg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9efeb68-3e07-45fe-f77c-08d9841870e7 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:35.9988 (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 025/218] avfilter/af_apsyclip: Store format in filter, remove 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: zNNz2iCahBjJ Signed-off-by: Andreas Rheinhardt --- libavfilter/af_apsyclip.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/libavfilter/af_apsyclip.c b/libavfilter/af_apsyclip.c index e9f1feb906..dc3a8e97e4 100644 --- a/libavfilter/af_apsyclip.c +++ b/libavfilter/af_apsyclip.c @@ -80,25 +80,6 @@ static const AVOption apsyclip_options[] = { AVFILTER_DEFINE_CLASS(apsyclip); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_NONE - }; - int ret; - - 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 void generate_hann_window(float *window, float *inv_window, int size) { for (int i = 0; i < size; i++) { @@ -671,7 +652,7 @@ const AVFilter ff_af_apsyclip = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .activate = activate,