From patchwork Thu Sep 30 13:39:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30748 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp692512iob; Thu, 30 Sep 2021 06:53:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqLdjZjk4m9fHs2a3GBgN3QRvAxmnp+0E9PDDXc7KLMFjFN0i4ZUr0tdkwg49pnoc/DU49 X-Received: by 2002:a17:906:b815:: with SMTP id dv21mr6688458ejb.380.1633009992385; Thu, 30 Sep 2021 06:53:12 -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 jr1si3392215ejb.574.2021.09.30.06.53.12; Thu, 30 Sep 2021 06:53:12 -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=c6M5Ia5h; 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 A3C0268A8E7; Thu, 30 Sep 2021 16:46:05 +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-oln040092070044.outbound.protection.outlook.com [40.92.70.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E840268ADC2 for ; Thu, 30 Sep 2021 16:46:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PVo+BG5pDBzAROzpXO3ynW44AUzCSn7T335dfcDF3Qty5lHM5V89kdb9uioCIQkZdK2V9EMnhf9LwrdxqccrJPisUD6VaShsa0AjSMsreiXDoRxNcsNRedEG1LDVY79HbIrUyYDwvPAfeFkYrTIs+nNUqQsVz/YAu5LKEc8KAzD/B2oWUCVRYizr12DuH2C+7VcSI9fzwMb5mUwQ6Eeg7aHdmVpX7FcHNGiM0SqNBTubtA5bOUh3cTVou7w7aIP0KTO1B58O/38eUs04ndsfiOA33WL6GoZGFRnNKxsctMg966+Rg5h01oAlI1r3swETmDYbrN4UDPwoZON6+XVsjA== 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=6fSw6FIsnRQdsyTBokfnY5ZgPJxoD2ispaYLrRaR7Q0=; b=X/mYp757ZEVNPdSJe6/zgovsPgvAegBOuTzbeMdbC+yRfFm9kC/B1sk9p6m7UqNc72DSkE/fXdMOdJIJfb0XbFbAxkn2+DSEdRwmBGf5XnmTiZKDkQF6CSSyp6sq8gHy4NOY/RNatmECDC1jWAjc5I/PUgGBJznaMUmmkl5MtV+/wslnAGXjBGbdzbFTc/L09630Wrks1Rw1gx9RKl4pnVSKukysjMGhluswUImK5rLvKP81INxH2JSCADcP9ypvnL7Y4kbkKhRFWVaXRaq7Hgtd7oAtHu7j1/9D9Vozigs1tkI4hYEkC0yHFUge6XS6GQUBcCAA4LSekuZsRAWrow== 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=6fSw6FIsnRQdsyTBokfnY5ZgPJxoD2ispaYLrRaR7Q0=; b=c6M5Ia5huCnP82MHSAKH9pfcYtSxokOpaE8PFm3c3LpKioi0Oj/CQ4phObCwp/Y1xpMCQyOg8SAf72z0kCOJMYFruA089tuzYQRzza31AaxAsqa6L9seRFMrKmcrIy/cvEWOsTKtPisUGKeTmDDqmz2XhvIxw99Zas8xta0JmtHXOpJnZtWjkEMN47tWISNXzbo64itYwQrv+sY+Z4fSn+Z1BeitsxctfK79m1cHy8aMPOUrJVyTgY80H8bVIhtauFm8orB/5JwLOR1fPAZvn5zm0PS6b8jsyh93mE3pSSfiGeD+tRgubRZI49tGMWNxstn+V4VDagk8y7YmC3bN5g== 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:02 +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:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:51 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [QdxUXZ20S46viEVt7RDo98nL+PfSM1oE] 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-49-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:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27c41384-681f-4481-4916-08d98418a473 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0bueYIaIE03bBpJT/1u0IPG/+Ec5Ee42BgOeAzKp9FAoQLrABNCnkh3aW5/w13VnkJe4Ru+81N1Zc4pZMs+j6KLtXjBTNeOyVxMiW+WA7+K+DFQtWLpUYMwNgHKb7e8QVN7Np+C5lx12jiH4Q0sLxOe20IjqB1KWOoRFD+38Zvj2PaSsIDy54PuYtnQ7DM0jHDC9hEoXNeOyVV2bCxmWomUlDsJgMmyMqS7VTk2r+P1q/LKZHB6tIPUYpHyU6Ld0Yb9D5EKoYL3ZsFUY9UWPl/PIeYt8A3aRJjVODcuV5rUafSLbcCZGqUCplYB79vjgBiKli15fDPsYTyIHmaAcHJxxt/TyWVoqomTpsHCUN7LZhm7zzYQwd+i86DWICLDiphI/2ztLwSMDLK0CkRIiuzDBT2ZfEXvCsi88QynTfXTeGX3U1YbYRVUCciUckzFcahjHMUJlNASB5UPcMQxrPOInPDQuw3twPqUf+2Em0dIQeIakUQS/an/JFIOb4OcQ9NSbww97pc7Fm7EHd4/zAmsxV4DFtGg8pdc6zv1vqpNN0+pxirw7ozcs+WsNyDhahDyjkeXN95G15BQfy7pYpGRx7+KV2kceTJPPx08Vlu3jOhdL0vKNIlp//RTZibEKiZmjeq22NsyXR8gJD2LBqAosbPv2JhoHBUHLxBxM8o0WE0xat2tVkgxhJG8Y+t3q+E= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RNSOIFd4D4mF7DNVFmsjlf6kIr0kC7HbdUwlnDKWu+wz5gPr5Pm265u+Jye106lYaNGZ/w+aDtn48UBPK7ZV9V7t5NRVONGTN0LqQtWnMW/9PiU+mv21xlwyeJ0lJ2XDWZVw76ndCCzO0HbZKIT4llRy+fxcWWRHFSBJqKCQmrfJrtFRvp8/a1/C5QB8GsN209BScRD7X3GMhaWNH1BAVcl23MnyOl2bOQBm9/2LlSupG3A4GYYoU+moxQNAKHvN8Y0wzgqOHyHvUFZchDkwtkChPVgAbJcYmnTjUQ1rXBkPuB0oJIrLS4e0EmKguBbtS+4wfJUobaAAdfgOoiSr48wwClrbAto6Kt+lkSCuAZ7RuCp7kJZ7RKRKyy46v40hrhVbKXuAXZyHY9qQrSfIQhxsT7H/30sjKrzAXZfqikCDk6HH19AuJQlvzTTBsKha X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gMdfRKzCxJRmSPGMn3UPG57IPLrxXLeNXo7faMIuIUTTaczv/C/TeQoC+kn/cb4nD8dQo4/454eVJZ8T/JdpNmNgRFf12YPi1VOhAEOvf57GHrpdCXa2JJHffUbcyhPFFhybHvOi0ODotWoe/3f04Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27c41384-681f-4481-4916-08d98418a473 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:02.5085 (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 050/218] avfilter/af_tremolo: 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: vjYk9n8wkGZX Signed-off-by: Andreas Rheinhardt --- libavfilter/af_tremolo.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_tremolo.c b/libavfilter/af_tremolo.c index df101cd032..b34a7b79f7 100644 --- a/libavfilter/af_tremolo.c +++ b/libavfilter/af_tremolo.c @@ -83,23 +83,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) { TremoloContext *s = ctx->priv; @@ -153,5 +136,5 @@ const AVFilter ff_af_tremolo = { .uninit = uninit, FILTER_INPUTS(avfilter_af_tremolo_inputs), FILTER_OUTPUTS(avfilter_af_tremolo_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBL), };