From patchwork Thu Sep 30 13:39:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30701 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp687546iob; Thu, 30 Sep 2021 06:47:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNeJGUNPKHq/P291ZJCY7IolV/E+8klUMQXrHiDL+MZ1f91eCYiicy3PExYA8Cmjtfko/1 X-Received: by 2002:a50:ef16:: with SMTP id m22mr7218372eds.266.1633009637368; Thu, 30 Sep 2021 06:47:17 -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 gw15si3521856ejb.780.2021.09.30.06.47.16; Thu, 30 Sep 2021 06:47:17 -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=UzdJflH6; 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 0FD8268AA25; Thu, 30 Sep 2021 16:44:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068051.outbound.protection.outlook.com [40.92.68.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2098068A993 for ; Thu, 30 Sep 2021 16:44:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CG+DDn/Iw5I0YMX8Zu7ucnkpoDioWPrl/smMAEBXnZ0Iq88wDHUBHWbnENzY6i/MoXG/FcBF/M7pYUBuUq7pJkxiHhxQcdwLrKkrsbNk2n82fFrrQGrDATYO5+s3lDEaQY3MzbumJhWDcRlvTAHN0s5BjMcDrVgRylo/1O/oR1AQDcAKpRUqjTVNc5KzVoEC4R5yEbwHCjf3U8B3nflBOrcCB6piy/is0aX7vb/o6b4KmS3l0+0WXLD80sAoNcp9IhqJBWcPxQsPfTb2Ebw49LVuPmVn1W1xe4D84Ji+sjIYWZCHZU0sYvM8ENNzxUDmhFeRYmazX1ccgulDeE9Ohg== 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=FxUdXsNtmcdLLSLLvnO4Avl4Dgg5ub6NIIhAOE5hD04=; b=aAtgtyJQ8++kEU8sVboJgjgr6v6E05f7wlbOltRUQXNXzAehcWa5RnaKAwLpCbNdkzY5QY4qEjFkMKm378Q1psUhBB/o9FAWLpWRuWx96EgbgtzD0seUnXDLV05nStXPzUmRJWpjBJR5TsFisAXczmE3sx9Mgq+wgsQG2adzAT3L7DcJpQaYB+8dhBCbMRK6e0gR21z4C9xl/E2TUqN5gdmFNqGTR4pNXGTbzzD2VmMqTPZO2X4HL9PH1n6AHabtXQu4UAhHWuaMRFMRpSrD2qkMFqTYcM33jsfuRsHpbRDzWZE3Vi732gmVtfvxFchdHW1JTHE4F+ZytOWzTww24w== 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=FxUdXsNtmcdLLSLLvnO4Avl4Dgg5ub6NIIhAOE5hD04=; b=UzdJflH6iz3oTc21HJzlKqj5p9MkBUa6tg2YAlwdz5vZDGV8u7n84K6LyisZ4jzufM7eDfbe1wZK8DNyK8fBRmp34Dd5UHRQS6cQktH8CgJ10F3gvlmGygVAJQ3/xGbU8bArsiGmZmdnLHFY29sIg6pUaV5ghiM3ffoNAaxwDvJet4yofDPqWRTEHRVyxeuhsOXfc1yRv6DXLhCgLKQyz7+Y3ZkE7qvynziC1RRmjzB/7tVLdAghEfHj2zaT+zwx0n3l3S8pqDo3GGNOwyfpuIHawABanmSodrPSbKxnELiYXpRy5DUwR8rMvrZBYigRKGszqcGWoXbxre+KUtsrRQ== 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: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:44:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:22 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [nXrZg72x/ovu9GNSZHeFuKBl5FiuNekx] 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-20-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:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d52595fb-81a8-4e18-f3cf-08d984185f09 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOddO3cs4VPgg7ezOm/StvAgfBsmzDyHFHPwT+Y2Ya2ihxGU0JdBJcdTa4GsJucRMY9jN7+mi0ppxXZob5hccoDzuLRgl057cSW4070GD0kszyoFtOp4BII0i8haMshNnAYsLPH3AmsQSdR3DR608qlOFjaPsbRBV52LzMfwUM9XuGgmHrN8Azh1TXNmz9wZhiY7IkhfCSIs77/rs/iLmesi8RpkF108VAx4HfJSs03OZ65JPIpVV/KTAq2ojMGPDRmTKrslLAwqt3KjMo6fxP6m4krUUHhJWV0c8NzUgPHwb3V0UENX/diq8tJW2AjdRWkXwg4Vy4c3pnhuMdyQslJInppBuXPNy59fDT1pSFcf6jjAdaJEamUeSuQAHXxDMBSIevVSeNAqSCqYwnh9xJuo8rocT8jbyDmCdEVucN7/miSqRjAop2JHGPilk/Oh0tnmGl1anIQs4jT3HvtLO5PiheTSnNfZGAfMts0Zsyu70ipk7IxZi9tH7U3CvA5uerPx7EPQzZR9WDjkPqNG3FZ8hrWczb9hsw4A9JxcXLLa0SnRMvotPcYRLC+cpXSeiKtir+Z1hoRTDuiYJJzDfaImjZ18IwE7MD88G1bIt7azKFFXSCs9kpSuYnRReIgNvtQ0saX2TxtvL44Tgw4Jn5pL+jGaFKfHvCn1zNlDx3LWRp6XJeJ664n2iCXB/qhELebDz7sh82IcgbTB0GvKSsfKND+51II87I= X-MS-TrafficTypeDiagnostic: PA4PR03MB6733: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7JpfXTcdlkweVhizvsogLO8BWNDoHRpnoCbWytKBrIsuTCI4Q/m4SRYqVpfXIFVMEkt2hno5RyU53gG7k+Md4VefccmFpSqS+l4rViKfNxP8Xh5IaPpwcEe78f56mmEToee0KcE2UW4vribkRNigOlyhs58h0oZuveKA2vFs3UWrLmoVK9yUSG0ut4GX7Rug9i6sfBLO9cWnCFkWBBm66QEqODgTc+suUyVWvwhQ/7xetNyshnJ9DVFtamO/TseUamCAuIWB+lsjyH6ZzUAzUErAf2dU73ZR2dIkligvtGByYdjz1Bt223qKBa0vYDNpHwgB9nSI0xc1fCvxHS7yrSGaAteXejCeps6TlfYItVLVnPzH7lGg04GrsDevg0qeQnRoEfHAUb2kGDK8ecSQPT0L4KwSPeBIZ6B6c5srdEN020F95VGTLByKv2WTD4kk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: l9aI1rTcH9q8AnzkW50vE7ugBfE4+0bHWEgH7OGvljL7TrbPrq3EqoGg4v9K1PQ39ii7f0xQpvXF8zb+rswWwSN71PKw34Yg+tkwS/raQM/bZ3zrIJnexi+cLpR61Os9mAn84734tDh6YyZ0upwU/w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d52595fb-81a8-4e18-f3cf-08d984185f09 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:06.1839 (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 021/218] avfilter/af_amix: 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: tA/aY71015cR Signed-off-by: Andreas Rheinhardt --- libavfilter/af_amix.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index d2a363284f..3f51d43acd 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -589,22 +589,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->fdsp); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret; - - if ((ret = ff_set_common_formats_from_list(ctx, sample_fmts)) < 0 || - (ret = ff_set_common_all_samplerates(ctx)) < 0) - return ret; - - return ff_set_common_all_channel_counts(ctx); -} - static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, char *res, int res_len, int flags) { @@ -641,7 +625,8 @@ const AVFilter ff_af_amix = { .activate = activate, .inputs = NULL, FILTER_OUTPUTS(avfilter_af_amix_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP), .process_command = process_command, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, };