From patchwork Thu Sep 30 13:39:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30713 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp686239iob; Thu, 30 Sep 2021 06:45:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIZvhexrpAgli9hYRgR4/OyEPMmCGXuQiYnvI3O6LETuj888ZX3PQ7LfYPN+a/1+7Uxt6q X-Received: by 2002:a50:d9c5:: with SMTP id x5mr7180796edj.37.1633009546453; Thu, 30 Sep 2021 06:45:46 -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 l2si4536585ejo.509.2021.09.30.06.45.46; Thu, 30 Sep 2021 06:45:46 -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=RvSEop25; 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 BA16F68A938; Thu, 30 Sep 2021 16:43:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070090.outbound.protection.outlook.com [40.92.70.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D338E68A8E7 for ; Thu, 30 Sep 2021 16:43:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E3tVUZHLXlaWyyxbnRmHcxF5elaDhv2DUQSbAaMCVwVN3DbhNUD+MnAoRH0GOmU3KckBomW1/cSjixlo77ZIWj89bKqpObd4SdOgBvq8O8KKljdlwPcJRdUoyJfTDtzfl6nby2yp/Il5gyi2nQw1fgbGLgMxrgZRICpOCnX4aBsis+mCj7VTNHn3ncKrrzSAjhois5RfhgEiwdxdUZrYCG3aMpLEF0SZLn9NIo5x1y3rBRkhYdpqODBGsKynG08Iu13Zk3G+K1u3o2jWQCDSZrovQ3txcVYuNUp7IHtGNQCCrhkUA88+4zz7SL9sKFanXr//wSuycbRvweeJ09OENA== 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=TAJpHjcpGwQaXMt/e57ZUqm2BZovlL/R3Cl1+8HZ0V0=; b=BtISDZKvttTLL4PNTZKJZZ+fuL2qTKHDDKcbHSN1KR/yb+yTfgewD82aY76Bh7rKuBxRY4fTbDxCMGBlASE9K7V9WdcbLjcTqQqD+YIG7K0GF+OP4KRJk7TUJy7kkW0y14Vd7vesj7+XfGXkbgJIgxQ6UQaw0kzwSJFJaQXQfrM8Tl+ii0Q81ygEYmqyia3KMs7WS8acIRAAejUevpG9L0gm1ZWwKGCEFR5KoMuZFGEGM01+pLk66qmjzM+zZN48FG0tDP1uYHk4cdvz9173DS+5aHqWbJuawwJIi6JY/pSuiM39Dx05sGeWCQTIcIZkmmieGRqAiNDtBd3nMGFjUA== 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=TAJpHjcpGwQaXMt/e57ZUqm2BZovlL/R3Cl1+8HZ0V0=; b=RvSEop250Mcyx+ScV5Ka050DVYwEzaddU/WlDc55mRTmgJTs/zQKpnqcl469Ztw8U/IrEw4UDxM5wJhjpr8qQ+XeIe+MGlwXrAPFlQmTtQbvYQ670rJq4DgvzEhyNRQi7i70vfEfo1VzZqvO1oWhhuS+UOIkVPjpxm0kjfiZkLKv2E5ThD8qNF6utqKWR+jMrq5QXGEpmyOVMtXhnBJNG1qyY+mqtnISppoetu7IRYlT15HmuQLqomMCWVRtO9hmVMMaahyjMbVx4MLpDA48f003G+OnW0+Ju6J4dMYiiUuLVVukFNabE0UaNH3dxt0VrLEhFQnvFMvpPF0mW7ZPsw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7246.eurprd03.prod.outlook.com (2603:10a6:102:bc::15) 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:49 +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:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:16 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ikeiIYNeFkHQdDs8JvtbQGpO2z4+b7sB] 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-14-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:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 040ce303-0fd5-4d72-a55f-08d984185539 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV5C/IQ+NYWVWKJ8pLytsgGEeEBTL1e6SwUsr2kei3/VbDF6eRbb8aga2RvryrUlyxqSs9MmjNKX1Hv8GLh0D5UcqCwgL8ktyLFUZgKJRP0RsAN76KWQHse8gGWmUwpy4RZUSsV0zFXq5CxqpB5tZZDY4CC9Y1l23vthsMW+adZmGOlxxcc/3W2o0jsDWQZJ6/WmUHQe0xVrRMIzMCn210cGxzSPUI+S+Uk4oQSTgEbkMtEqJTD438PgLcxcykWx6CiYBqJtaDndoz+xh4uPLfkI2sUE6rJAEDkP4QNL6jwzZnmwNF8bbrIgQiBVMLlO6M/whr+Zem7lBf73wld1g64genmiF1c4Q+FZRgXT9IVifJHqRm0IgsxLGSpNCUhEKBwdncRVN+DnhJq0rxwpIwsymGBSXftw15q8A55P05GSA/gzogt57GDvpN3dVNKhxhPBl5GtGmSkifXbuqXBxV7oufWpiu096SbPx/M5W/Q0C7RehflS70TiRrz51ePuXgN/mB9vTxylCBvUPXmkV4ukVTTXnXDyb/Nx7GRhoNCQMO1r8/eJRzxaLAEqL9kf9XNBI5+LXApT5960MR3kUXtA6ptXDs9pS+Q5RXDZ2Y8GEzeNT4BrJ74LZAuTbeL6daOEhNtHmaRvNrcL8Led4SZ26cCsTxehTTOpoOri8Ujn6ch+K064jOOY= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PXg1nZ5EgFGmGsy5aBDkNvG4PhbUPOaqWHBAHAH8PA9PY5mJpVwEQyZAxEK/OtbRCfIk88Stp5Z9QoxjMe1m2BCh+Ka3plWSAvPhO2PevBhbvPISnzZn3dR0fnTziOfnfuJQE/w/lrMxMr1cadhkvBbdm6zZwIl4iQPmvd8n4TT+jB+2brhGgfkNZGTR9Qdkd5UYHzRBUfWC46VNMKwskBdku4+gQ0CcvKdxvjYSYrlMVfSFyMNAWdt0DCJvFKMFdA3zblovGxdxNpdIlhr5/t9r/jSkYfUFKBjovR1svgDm/iFhdPolqMfDUiALr358cQ7faYp/pO48zAr4QYzordg0GHDoUdjTDjcgL5tbWvrJhzMeH/RfqZ02dZL62rs+5GGl6+9Xq8kFRdRmJv1aVuRkbDzKg91CWsVhQkMtX0E1XrG+w2ifCozl9jJRs38H X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +cLuEB6WH+ZBN48uP/J1CV/jsC2XmREQOj2TYV85EpOA092xBA/mHdxmZMvdAlyHlTeWPpsHdy+6fLUj5AYzLWAmTc9obqoMHDv8GvH7Hq6/IqmYy/JNxRnBPJPwZcKVfR50kWM9R/OilHh3Jn7/xA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 040ce303-0fd5-4d72-a55f-08d984185539 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:49.6515 (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: PA4PR03MB7246 Subject: [FFmpeg-devel] [PATCH 015/218] avfilter/af_aexciter: 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: usYNTy42p6Kv Signed-off-by: Andreas Rheinhardt --- libavfilter/af_aexciter.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_aexciter.c b/libavfilter/af_aexciter.c index 3300ebbd4f..5d76f290a0 100644 --- a/libavfilter/af_aexciter.c +++ b/libavfilter/af_aexciter.c @@ -218,23 +218,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 = 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) { AExciterContext *s = ctx->priv; @@ -296,7 +279,7 @@ const AVFilter ff_af_aexciter = { .uninit = uninit, FILTER_INPUTS(avfilter_af_aexciter_inputs), FILTER_OUTPUTS(avfilter_af_aexciter_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBL), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, };