From patchwork Thu Sep 30 13:39:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30696 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp688958iob; Thu, 30 Sep 2021 06:48:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAwsKEswkotj/QF4iYXhOnPponz8jDOo0X0LQ+N4zC6fcvYcDu6yANmf9H2Tc8WKnr8k8a X-Received: by 2002:a17:906:1848:: with SMTP id w8mr2291219eje.485.1633009734026; Thu, 30 Sep 2021 06:48: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 i8si3858698ejj.680.2021.09.30.06.48.52; Thu, 30 Sep 2021 06:48: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="g5mKClv/"; 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 486E768A897; Thu, 30 Sep 2021 16:44:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2054.outbound.protection.outlook.com [40.92.89.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 872D168A883 for ; Thu, 30 Sep 2021 16:44:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hwOl5OiKu8DPCbQE0PoXP4c8oY7JoCSwB0NrraPEPwTY5mR6SZFWsMY7FK59CYDpLsdv/VfDqiKQJrkyV2QfRLAHlUo9zwsAIiJTMX4JN9fIxyhWouhetn3T/CiY9ZTj/+Y385k25NACErcldXpBoxEKIiymfC8hlncNkkcp4Z9/8ldDuhuNWm9onMw3imD9m6udWFeRkG8F0wc3PqZo9NeXQl0Hpv5rtKdJ/JAFSFmoT4jjTDTuNAGqcn49SaNOIapmZ//8wXU067izP/N5hjMZw8nyYHBuWXJAyf24YhC2aCqpdWN1oX1rvWpoS4mGjlNtHDwgSRqBcBJDKP62PQ== 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=oN2jU/3Eo9uvfuSOzuHd6gBbdq/XdOfl/w0HBZrDc6k=; b=YWHZLgl2l0ygiRUUxwbWgBndT7wLQa/q6pXH2HsASugjX5lklO0sltLwee9mpHRnNzXiYpAJGengeO3EXWxfauUqRmQ1rRHhp2I8VrNWFmVdKBGUw11snbNKYamo90SWFZCod1f8tNYsKHi2aqeuZEy7lkwx+hE0SEk9YrODVYyXK+6iTct0pqcQneJ6/DvuHxCr1qsXsd83xFvdygEJfel9S4VXUCO3tJoaBIFIdTNJNAPKU+u+EIIwQWvNaVqwFSjF1Ya0LgdIUOeqMuUsF684xN8HBgSHyzTZx6U3eYxUHDIIVIU9QTEXChhOK7AIcqGZ5kqMaVtKufo7HNMjnA== 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=oN2jU/3Eo9uvfuSOzuHd6gBbdq/XdOfl/w0HBZrDc6k=; b=g5mKClv/Qga59sHsyCER5YVhI2JR2O9AfPwFavnYy2lvgEQ0cNSDF3nhNDCZmTslzwS9C70vR1AT6jAUfRHwBmv8fi+soynIJcVjxnLJ9Zg9ocHeKuDbDrjmwvOCTOw0x4Dr2uQHrny09u+QOl4WccUwZCyfDs2rk3EQzYzL6DyHSdEEofQyByQSj5JmTnA/tRxkkSEAkTnbSFkkNkmFqRAWrSYjuJklr7nqDffVeCtCU61Euk6I0xOhBwjWvdItB8mouEKijCweIUAQ+XNhrGt6dRFNFJPx6inQ8JviWvX9sOi+YAomM2fJswuG2lA2Roa9N2gZs+5LhJLZ1cSk5w== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6733.eurprd03.prod.outlook.com (2603:10a6:102:f3::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.18; Thu, 30 Sep 2021 13:44:52 +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:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:31 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [tltrOnLZA6fuwG6VTIMvvx+78RDZ+92X] 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-29-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:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea159cbb-6f3f-47cd-d979-08d984187aa2 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOddO3cs4VPgs5p8hoeERqXAPXEg9LiOZFptrwUAKdOGDs+Z1UgsvDJkoEKZksmCapjyPlfqONN4Pfxug0LskXsU+Pw9HCaxdCmS8+FCGHfSAqix8DMXAnXohsqg5JXUyIqVVdLz6WZTfTHBd0f47e2jiLLvtuyIDgoEBEAa9zeWgBWmIVn9CzDvxjsh8BSM0d33Vt+ZLGGbjnA+qZ9kxqxMspo1ZKkXk3J43HT39AtwNrUHCBT7uVo8tPTBHTWSNThBBSMhlSOIFwRQ0LaDzjOc0LaCAVQpzigYkMRHk0AmOIU50RGepdsX5O563h0APVpIIWUq/FglzFSb1r8jeBhYo4Bfo1uwtLliDDiNRL4CuU1KzjgA3oW49HnIpcW66WwFE/CfhcNm9KqqFMREXcXrbcdf5gUCIzpb5lVeBueXRWRKZyjdxaUR1JqFyjU5aVp+eUWyMr4HeIqYHAPtnxqW+CTRy2d0fYTy3UtjHphiK5BF2dr1HLIl2Nt6Wm8ChR8vAwjfSlGNmM/kLh3vy7AaDl6Nz2kWk02rCgI7bYNW5ccymRMpyX3nu4LMkI+xAzXHCCj0Jl3OIytb1ZA/d8AKmSu//rBF5Ewz4mnxm5PutzDF66Ijs6E/Z+ORFVUblDpPjbbv0iBhPgRDX38HdtmpdJNwpwAObsqka0tuQyd0rBUNAWbGDVXl6ugQE/nhDHiOgEGBlXUjzH0amk0HQPpn99DiME5kYo= X-MS-TrafficTypeDiagnostic: PA4PR03MB6733: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GvljiVkXQSlgiGziLF9ZWYtZMER1mZOljSfIiGO3LfbFCcZ4ZKXdbjCnw+Odsy8ufHHUEdBZXu8Z95bKR7VT2y+Cgv6mQZliPYP66Pb34pZywmfM4jlIs/STQhZ5mzIZkTh8lpGk09+tZdGCf02x79Wh+ntyYR+PSvd9vlNl9K/R20aKhx2xryeZwVpfQMXqewF3PT2vSwcM1ezuuRrlmQ9b1tMm3pm+86jHnEd85BtKOPn7NnXfXbUiY03BWsgGebOLLaw0rPGGaL3+PYycvDHOkLjUdUV5a+msaYQOeMgD1lax4mK8Qo+IuqXR3nTcOO8uZzl/lAa0zEdQg4JO9f6mcossXrvmzK8rYMsHa8ziBysRy1B0N5jnTaiNHKj3fjcXfB+bOd6iin6ICpUFvONiDDv5K/UAacCMqrfclzu9prRDXcaPrEJSmJ9HtMVp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3ys2GeWAJED2fwWb5YUVNKXhFbuwI+CIT0WrN/H/iIMPpi2uCCdDJX6HoaNUoXHxklsFFs95xowdhIqZyiI+PcFqxh0IXSNenELhcOZrqubqQOQJHFkOogsErcg2cwlSYlcUVUy95sFG4Iru3ZrKOQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea159cbb-6f3f-47cd-d979-08d984187aa2 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:52.3350 (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: PA4PR03MB6733 Subject: [FFmpeg-devel] [PATCH 030/218] avfilter/af_atempo: Use formats list instead of 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: PRDj60wZhqi6 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_atempo.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index 6376cdc03e..e9a6da7970 100644 --- a/libavfilter/af_atempo.c +++ b/libavfilter/af_atempo.c @@ -993,8 +993,6 @@ static av_cold void uninit(AVFilterContext *ctx) yae_release_buffers(atempo); } -static int query_formats(AVFilterContext *ctx) -{ // WSOLA necessitates an internal sliding window ring buffer // for incoming audio stream. // @@ -1009,16 +1007,6 @@ static int query_formats(AVFilterContext *ctx) 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 int config_props(AVFilterLink *inlink) { @@ -1193,5 +1181,5 @@ const AVFilter ff_af_atempo = { .priv_class = &atempo_class, FILTER_INPUTS(atempo_inputs), FILTER_OUTPUTS(atempo_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), };