From patchwork Thu Sep 30 13:39:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30762 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp691126iob; Thu, 30 Sep 2021 06:51:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyReQDxNbzYHywY8mpc5a3jvYjYC45PoPHL5+rQnmE4ywO1zfDqpfazQvS35DdsWC2ai/aE X-Received: by 2002:a17:906:31d7:: with SMTP id f23mr6658338ejf.190.1633009889708; Thu, 30 Sep 2021 06:51:29 -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 n11si3346365ejl.110.2021.09.30.06.51.26; Thu, 30 Sep 2021 06:51:29 -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=UxTNlBNs; 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 022B968AC9B; Thu, 30 Sep 2021 16:45:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074096.outbound.protection.outlook.com [40.92.74.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF96C68AA63 for ; Thu, 30 Sep 2021 16:45:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GDnji41wk+zhiiwKWnc4fe8RUvOnnh1q3hpuPs7idOJ3TJlMd0bin6S/yQ5xpvBRu2X8f20XurtZL3m5pJcuimSdHQ+F9DgUDy87JOfs4c30cL4ufq052I26KevUFkYBe56U4mSue5DT9GzTpCGNGIbTjlZw9UJU1e5VWsVkFS56Xi09VXD1sN5N805xgHlVwwHk5V7oSd0LE43sq+PXFAdMV5Bage8RTl1IFHsEiuB8bdr8sp3MwxWraEB39pNFU2YXJmQOCdPa277jdePEmXcdTC8IEacGfEIrYebu9iQFJ32OFNPjB4Gtwq8A05+jBzBVRoovssOL5QPdBmPXTQ== 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=zWVZqtXdoRTb17u7GyCd9SigU66dr181IYSpY4jHbxc=; b=lKOamYL8NvyR0G+2BRpKge0t82ojFa0jvjjTpX4dVmv8TGS1zw81zugqcU2nAEoMIWy9pwBq2PLmtFeP0Q1rXVJfQLRDpOnyDLeCnIukxuf8cq19jMrY2dSdJ4QhgPjR5BbgqwNiT1qqD4VYu0DcxuGtZx4962IxhF3SRSCCZj9Scf61wGSMZ3m1nEG1AJHzZk30srTX2NzVr7A1Lj3oc8/aZwJsQK1M4oK5eWhkIoQZTWix9zgKqMfihr1+RxkqthMWQEjN6AUoCDKnPRrZCbKMXeFreA6wmayskDdaZS8Au2bPddhmbiDoK+h4htnpX6Slt5LzYz20D148tDffkw== 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=zWVZqtXdoRTb17u7GyCd9SigU66dr181IYSpY4jHbxc=; b=UxTNlBNsgTWKX58K9VmzT6qziFdpSS9pfLPaDEU55wt13mGmhXssJs75oFxSBQQtYT63gDvGJht679XLCmKTeID4A0PztrqQsxhw927Y5rO+K65x36l3ckExue7FQI9QB8lQpRleMwXnYpn1CN9PVXaWns2jsp+41VtLlf4B+SjC/b6znL3mGnussxdJVHm4rRYA2MinoUlUB11kTF1Yg7Nk3sOykKYBGYslzg/AaGat1b16hzfX2gEoMNdwJWi4TGwN8BDP6F+NrXRWx59+7M+8OoCjkRlaFTFhHWF4QdgD59toh/YZa4TZmvbnndFrW4WKGp/s34E8iWvYnJcwKQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5164.eurprd03.prod.outlook.com (2603:10a6:101:25::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:45:42 +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:45:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [YFsNNEHsp3ZMWq180L6omVGdTdotHG8l] 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-43-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:45:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d169f8bb-6c9a-420b-db4c-08d984189872 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoVywdiL99A7tYy3iFeY1ov9eykCKlR87FWybejm2V4l1nr2TI+uell34h94J6xV9x80LABKVN8mD85KTNoA5+u722d0nm1e/fHXwy70w2B+janE9sNgUn1viw5oleB9HvgxOAqFep2B5Q6Yd6D6wx0P6V9BdnhAbMpZeP8fa+mQzZpapv1fM/bFfnwVLUBm3sva3K7I04W4QO81NPRrd75ziQISOQew2OBrH8pdmub1W/d12hpqOjokS6lsa40b6CeMWaNL6QoYt1H7O/gSJGtxGtEW4wFm0m0Z5hwzLsJNi/HFV/V/GJ1J2PbdfF3jyAECsOWwYDaJx1K0jRPd5wynEp3GQ7P7N0vUBEl0qRgk+fLRIBknVvWpGC8kN9w069fUkiOP2y4C/+MNwJJISCIJlR7KLhq/wfahpDBqcEa2ebJc9fPMgctaJicx/t5cs1el/MGgrZRUDf67QOFz7hnCkt41zL+ZKB/qFiHydTsLpfRFu4XgcoOz9rgbbNOqmps31MQP5WtRibkJBcJB3Oljwvh0VKiVH38YbVnR6eXVmp30Wvm87++YkXPiOndonxArYeup+ShAiTVQxfQDprl+VuIvoCbTIfZDW6srZktyYvgXcC/Pt+mP2J6FR+7FVvcnao+Ep3N8OIkPixneUAqNLuYANE8fJz5dbRr6qCDE4g4encVVmxit4= X-MS-TrafficTypeDiagnostic: PR2PR03MB5164: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BU4AqxuGHjnCkY4X2K5KJWe5zast7dXd9A9za1DN++hikW1z7P56cl3vsPwIT3fZEGDu42L7/fYEmZ6nCeWsFwsHvvY+XfwG64JollRvvPd+pi9EgAyL7B3xUmsMJh9wu8FQBbcfUKEbELRSaLKHdXxwMp32jur0effP6bMSXRBuNLcSgkeYM0p/dAv2UTnNKHv0Dg5GuB+t1lhvSr/5Zt5JsOeKOIMwt1OYmoWS7jG9DuhYRio0H9rmeHVylGXuWFVXfvLZCOtuwGoGVDN+ByTqsa3wDE7FFuCSctxyNprHPiuvPAmf09m+Xzz5vO4iW2B0HODEHajPJdFDAGt8Nj22CN5V9XOGUFwtB6D0p82h0jKNzQO21u+mg/W4pQ+RmnERBiBkUz8XWm/lCba8xmjsTM88fKSo7CmlbVkCq7L5qcPs6SBICCIYcryBcVrM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mBdLj5JJqppNS3GZ+FquoOUobhdug2+f00faUS+X0caLU8SvE2tLQBtG4AHp6FqGTNd1PW4QOgaRxt+S229cS64nvHISX9PNWSUW1dKKE93SSO3v8CU94JLem/VNSVyeGBMlPSY+KIBH7RTu9ingMg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d169f8bb-6c9a-420b-db4c-08d984189872 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:45:42.3741 (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: PR2PR03MB5164 Subject: [FFmpeg-devel] [PATCH 044/218] avfilter/af_rubberband: 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: 37z4TBuCk0rw Signed-off-by: Andreas Rheinhardt --- libavfilter/af_rubberband.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_rubberband.c b/libavfilter/af_rubberband.c index 77f6c820be..4a42aa8a1f 100644 --- a/libavfilter/af_rubberband.c +++ b/libavfilter/af_rubberband.c @@ -89,23 +89,6 @@ static av_cold void uninit(AVFilterContext *ctx) rubberband_delete(s->rbs); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, - 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 filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; @@ -228,6 +211,6 @@ const AVFilter ff_af_rubberband = { .activate = activate, FILTER_INPUTS(rubberband_inputs), FILTER_OUTPUTS(rubberband_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), .process_command = process_command, };