From patchwork Thu Sep 30 13:39:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30706 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp684935iob; Thu, 30 Sep 2021 06:44:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxUgdA859c4sGiTkwFlZXrmh+DJiReIbDTF/MbwHBvem4bR7VCn2/8Rn+4zazIqpswQRmS X-Received: by 2002:a50:c006:: with SMTP id r6mr7229905edb.289.1633009449869; Thu, 30 Sep 2021 06:44:09 -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 m28si3508376ejn.761.2021.09.30.06.44.09; Thu, 30 Sep 2021 06:44:09 -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=IffACEXO; 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 D096268A894; Thu, 30 Sep 2021 16:43:27 +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-oln040092064022.outbound.protection.outlook.com [40.92.64.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D4D668A7DE for ; Thu, 30 Sep 2021 16:43:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J1Gi0I1NBZVbBVYQqkakVtk6j1d0n373eUMVs/FzgsksmFtRV2sitzzNDLCA37Qb8wtJq/ET6lngyGIVxQne6F703xHHx1+zobe6jXGzpMfGXrpN/KL4+5xpNh9/CqRmt2dI/YCHwdExphy6ldeBRA4//GQUDJoEzn+4Y4BOE6zgX/OlRqLz4cvqFg8bgRETpLhdmxKqEWy97ssAas4ocnuSqqFvSyBo6vBAj2T/eESnqOZJayP8kpG2B4ByJUCXeBhZc1BGqwr0wVTUyF/asCUwahTI8kVZfSsazEPo+snhmkTi0cp+Zz11wgptMmzZBqRYLkuUpK5sxXChjrpFeQ== 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=7jkwFcTuJJOwVCOj5J/i64MU5wVNGsUdlIW873HTxzc=; b=SAKhZ9NFxUqGriP7x5E6BGtyPfrvhHed/Nguk6KVFo/z64gpNASlcLz8tx6hE8+gEHdZV49WXQIAflqh04n8IC0bskguQi8Xdrx6fXSvjiauqGk8LtwA5cF6/0HbbgAx+FBGIDFhhsu/TsJ3FXkfLfkLZ7GyM7FVNKUKIrtvaRYqsZ8YM2YyvjpdP06s+HjBhAtuIUIuixpPRe9VzLdRxlUk3k/XRUm8ICTuTPwbbCq9Ho8zR2ijaVx42uSrtITuiSkhDNSnpb0BuLUT504Z11OSeqwNFDrm2LNlhjnStq2vBxZZxQ3AKQGKSl3QwOMxBgiKWlJfIUfOyK7Tj844rw== 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=7jkwFcTuJJOwVCOj5J/i64MU5wVNGsUdlIW873HTxzc=; b=IffACEXOneW/cRlnFRQINXS8HblrAkjFNt18c87R8aCJDlK5Aun2MgNpZ8UDcCDkD9LyAJJMdeKHUWUF+QhiwE+CMPNyyBe20DMW+aUye8aSv6aAuJOgOSDQna+bod2KmJ0W/IfHo0VW7NaZCb0NBmwo8PcDTRZLUlwdr1sVav4mYDprJcZsNBGwTQ9Nz2QhpzlNfbbcA37kqtBoFyjkzWXFilQg2GTRjotUE971vcecDCecwBSLq+Fk5oAQe4FEU4VECQ8bpD/rgJ4aC2s62Khe3hByN6qz3Lc/DtpQRyCVdeV9e9gb1XzQtPr6d6qjtxljP5Xahpi+hNPqdK1bOA== 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:21 +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:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:08 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [BD2ofNroMeHyqwItTBYoyfF7gxYDzvln] 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-6-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:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 45eff356-2ae9-44c5-dcd7-08d9841844a2 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIBqLe59qjkRp21wji/xErRRRFI5QUJRfCNVXrNQM3kC7RGGf+dpmjOcN4JZMLv2eztIt1qQ+qQP0E7y3XR7Kc/ICLQ3w9/UJaREMDOoScT7I6Y7oN2ep0HaJVj6eRyqV5OzBFQXhoBomd3eBWOvqBJ/EL7JzdUtXJymOG+HTplmf81M/qwlxOML7I3jbB6UiOcNKOrKLX3sbFdmCaOAFFBFhgmnIupgC/YY45CtAEVSrOyh2wzKpgBDy2F1DKT4xvVHXX3muoBxGwsKHq4edHGVHn4zFURjvfulQGrxHh3gkFx77Ca7XwqTPPaZcgpGDj7I/kWgEablW4lVhy1cKJbFwLlJLiZP6SNEk+/8e+tAWkks5znS3rXrj/PJL/1O/sw+oSIGwuuPiQWd0wvz696YMPkyWTa2erThINEmyZC2v+R6mPa6HNdwmFX6z72XJoMj88GBKqxKUdsXjIuQ7YeXgbU9XZwlqO4k8C3fM2yhcWS/uCfUx23zP91ewRR/4A02G+DpAfaGeA/NLH7DJNmF0YQxDLePRms/XE75I5giDqsd/YeoEy8wkrd7OyGJGDywF1/Cm8QSqIGFoTC4YM8jP1i0jmOObo8sZpwX561VBymC8ACKTJki5ZQAr/n6P9Y0CZxQAtC/+DExN6836IQIY+PvCIOXXKXBogS5qvo4wscZGpo+sSo9ue6p1ALU5wXj+ZAWZkURA== X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KF+nvt6DsjXpmKidI2p+uLy0OtE9MS87hU8Mxv2IiqK0Gpsmvino3BR6CgHlVPXs0MuHaJk7WnlhnwXrVPnSwRdpbQzYzXkIvYroq58w/su12mGeGWK792XOfO0GbambTOXNFY8//eUhDpnmvug7P+LpzxMDMFmGYKSbUfZ8LUDNHJtwVUBL8OQWM+c2EbWxweQDKuxZIs5zK5UB05QVn96NyVYHaGZV7BDKpI4fHyUwlFHDg43PUqOBr+8HPxXBYvHYiy3l7WhPDHuagtnOi3ew1ALQ4SotjWulVFjmG1bFwUuQ4eh1TxwMrX+8NumAry0WZQmNd9twnU0LleUXFqlld9PoNJTyZt13tirQQLg+8JqOL8upMClOzZL7KckbMMnjdeLQGfVjWUsUe1nSDJRuWNbIVF5AJMdbnO/lBbFgsl8nm7FYZO/1f42RJbCe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: y7sEK6qgAKKDtryDV2h5z2nyf5zms1EHWva5vio4ESTzIU3zISI3E8VhrFTsHcDt3SOwPe7nwxPfGoxqJpjGGA9arbSv8mVDGdH1/vJxy6Fa70F+xQFBIc+H+sO5d8w4U5W6tn380A9mIm6AIzkALw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45eff356-2ae9-44c5-dcd7-08d9841844a2 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:21.7471 (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 007/218] avfilter/af_acrusher: 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: BX0Gy1DCBadx Signed-off-by: Andreas Rheinhardt --- libavfilter/af_acrusher.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/libavfilter/af_acrusher.c b/libavfilter/af_acrusher.c index 88d6c644ad..14d66e88ea 100644 --- a/libavfilter/af_acrusher.c +++ b/libavfilter/af_acrusher.c @@ -263,25 +263,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) return ff_filter_frame(outlink, out); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_DBL, - 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 av_cold void uninit(AVFilterContext *ctx) { ACrusherContext *s = ctx->priv; @@ -357,8 +338,8 @@ const AVFilter ff_af_acrusher = { .priv_size = sizeof(ACrusherContext), .priv_class = &acrusher_class, .uninit = uninit, - FILTER_QUERY_FUNC(query_formats), FILTER_INPUTS(avfilter_af_acrusher_inputs), FILTER_OUTPUTS(avfilter_af_acrusher_outputs), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBL), .process_command = process_command, };