From patchwork Thu Sep 30 13:39:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30724 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp692705iob; Thu, 30 Sep 2021 06:53:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXBsbLIdFzz4fKAuLIcukwW/QGSKBu4pz4uf0pfNnjdBxBnf43DadLDhAW2DDjRJeR3PBj X-Received: by 2002:aa7:d5c3:: with SMTP id d3mr7329345eds.151.1633010006612; Thu, 30 Sep 2021 06:53:26 -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 v7si3447785eds.200.2021.09.30.06.53.26; Thu, 30 Sep 2021 06:53:26 -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=sSLMpxFR; 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 B02BF68ADEA; Thu, 30 Sep 2021 16:46:08 +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-oln040092069066.outbound.protection.outlook.com [40.92.69.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 573926899BB for ; Thu, 30 Sep 2021 16:46:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nt6Fzw5sY0dNXUTx4LzPunjJZa0iW+9zW4xQX64eu1jJwkbHCVAOEnMqWJlwbiC0erFhsvP96WGKpNw88HKpeE2+KL56VHS22cIsL9U3VcCFQAfNOBGz6uI2WiyuyX8yi8lU8neRvq+vDFRXdlChHHcNpUYkBoNBLGuqYkb2zwRRFV3AcqF2U7sbdP/veT2OFpc8E/60hJEhXlQ1MSXH3FpYMgi8MATgFrf3b2Ro0qSS0B0N+Af8mOVC86fM9dkSLW6UapIEkt/gPhyCInA/EPbfqPh0cCqcn361zj4hl9E2vmPeOfCfpBFhZgXpqXsxOTRSvkkY0cyqE+dX3TA23w== 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=8aPB9GoTMhZu91RyOjGzBQ+n0hAEqM5utjvZDpUxqhY=; b=bF+S3dEuAzwLVt3NoZNbN0KHlQOdsBFEY73to/1R44X23ZIiA8TAfYgcXPgTC5O0esrs94qLwdfuZ3zzxUcjsCEazIrIpAR9wHQ29QYX9zr1VGdfoj8oL6Wrzt6PXolVQiG0A98303/KKyVb74vRlP+l9Hl59rhEcrtO/xceyAXgXEWNWz5SWPmxuYamTVZYGA7WAR/Ek0PhOFzXHWdoTxWnUbVmij5CPOQfbzdPYkv1awqn9EQWbTk76qZVaOgCmJAwi1h8RZvucuWWOhLDTOlJgMLjMAehxv2zQ+JFfYoxTTW/wplsas3pfUttp12ZzaQ2tkxrccGmI5Bf0rB7BQ== 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=8aPB9GoTMhZu91RyOjGzBQ+n0hAEqM5utjvZDpUxqhY=; b=sSLMpxFRwxUv6wd4oP0HSWxc0yZDYleTawNtxtFq6JSVfAKWHp44xBDyB3Z21wxd8qasIFCIXLB55wLcLh96Z6H4Fo37wYcM0PcgXAb/He/oy/PPOa8ab5FLdHx03GyWEDP1MQSC+Cydyh23PB+03glacuBGFXINJUZeGOSTXit6RVqFPVHuSS7xJCy0AvLtW6tY55CDHtN2d65OyfLprqkbSEjKsOxdujoftX8PkCnpNLv5/H3ab7ZDPWR+8JQiZwpDcfwsZw98Vsc2Mz3TSslDijnZsg4K29lgy9ScZZxMyjdDHq/491cgRzAltu4mbsybDb0e9UG4r+6Cpr5PbA== 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:46:06 +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:46:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:52 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ejDkT8l8jOVamKpIkTyteXiUMVmLQV6d] 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-50-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:46:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb96bf08-f507-4c89-69a0-08d98418a697 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymLkmy1xk0GDJQjISQ6XWgwW1xRfJeXkw5rEnBy0g1VPxj3KsR1YbD4bI8cLMYWGFmGR+Wx7E1e5nlfTM7CwWFNAd4CAI9GSOugaSUiAo2L7tTRo9RkbvWWOb/yluSP16Q9024J6ByeHD/AKdSI5tQ5h+cm6Awf9gupvpGqZHI0GU3pSnvS9T4YSnIP2Q58YND23YkdH/8AdqgPB3pZR4sGMP0JJNTlLneJL0eYsSLtvmtn8TntRgPf1W4nNrVGav8WSmmMs/rUFFcLZqZ62OFdFlVkbOjgWVxGyIa4ufjw4etPpLRU2v0HCcO92X43e8Acim4L8TRWBAi+OMRRm1fKd/5C0Vsof4Mln6P9KiSEtopFDwcCH37oGnxUb3KUNb9Wtpo8NFqcNV0lxg8lQC6sLmzgyZS2GZh/Zs70FzIqu0wTX3sCoaSJgcMt5d3xNPkl/mly3vXjSbKGJOrM+bc7LYLfjwah/vuQtcwI8NN9I+f9tF4+kwEthbmDOL4w9qAUqJdy8+H815wWg+N682Ci8qMCEarVppF+Ge28pz0sfVcTUQq3mjsdpY/zlSrTDYsfsC98ciFwVGlPwNJyHSqsvJWew9iz1tRGW9sEjDZHhnJjxoY89vfBXshFWFmnB8tuNvTGteMAETg7lrh6cT3QuDgHz9ykQeGMryWmtT4TqREJ2Pq74PXOAa3ira+7jUwL6J5kdd/6jDjs38tGezcA/NSOOVntc+Tk= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QbPdv9cH1NSRhRkegrv67g/wgAitFMIXDyEuc4be+z7aS/Ai2hVvQgSwPDS/vNyvK9RBdyojTr+dcSznzSe8m2tIjhhjsrppm/TIx0cKxH9lMXMpvh3zyHjPV3wdTBFHwWKoAAdBkcy36D+KyIC+uTvnbdowLtYe4AewZ76T3QYk1a1pMBwaVDfBLvHWYZQIGJG11I/DuugheCYNL6D6lJYmqGfbAfzV/yXl62vrZVrW+CLk0VaWuxulCcPlAokx4WrG6sfhGaountxHCQ1TlquyDlkWsjl5tbB0lNYlQGEHRJzzN5MuEi3NEWW4mgCYJyHBbnlNQgHCaYPnz115ZML7wahaTVQ5q5AKmOM1W7ZPBfb3RcNcjIp2kfXOpt1fwediXexAI56kOp60K1nMbkom9HMzdttdTpPX8qNtbIpSRm17TYPbBq1bdL7IBJph X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XILhtGUCXmXQLFOZbrdnZv3sneYpcgoA571mPgmbD6hnLUnBh/AF4aoJ9G9rGzqRdObE29OA7ZewOjszuohTfs+TK4+3v0o3+28gCRhx7jRjV/DmjGc5h+kukodkXfMSW1grEucSgSS/fCI4v5D3cg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb96bf08-f507-4c89-69a0-08d98418a697 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:46:06.0908 (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 051/218] avfilter/af_vibrato: 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: TkyVzjXC4uKl Signed-off-by: Andreas Rheinhardt --- libavfilter/af_vibrato.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_vibrato.c b/libavfilter/af_vibrato.c index 46b6b766bf..c0cbcbf6f2 100644 --- a/libavfilter/af_vibrato.c +++ b/libavfilter/af_vibrato.c @@ -111,23 +111,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_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 av_cold void uninit(AVFilterContext *ctx) { VibratoContext *s = ctx->priv; @@ -191,5 +174,5 @@ const AVFilter ff_af_vibrato = { .uninit = uninit, FILTER_INPUTS(avfilter_af_vibrato_inputs), FILTER_OUTPUTS(avfilter_af_vibrato_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), };