From patchwork Thu Sep 30 13:25:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30692 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp668873iob; Thu, 30 Sep 2021 06:29:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyS4nYLXlgFYl5RalP5sNes/P1HVBWE1Iepju+0V7nvya421vljZbkuj1cr0TN9C+XRDrol X-Received: by 2002:a17:906:6691:: with SMTP id z17mr6862250ejo.207.1633008550578; Thu, 30 Sep 2021 06:29:10 -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 z4si4544260edb.281.2021.09.30.06.29.09; Thu, 30 Sep 2021 06:29:10 -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=UL3bW6nE; 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 32F4368A773; Thu, 30 Sep 2021 16:29:05 +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-oln040092069070.outbound.protection.outlook.com [40.92.69.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64DBD689FCE for ; Thu, 30 Sep 2021 16:28:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AdPbN2lNF97GysQ7Nj1r74n3lIR9DiOPezOGiTYBRiZRZkQAVKslLWojjVLPifgojUl6+KnFj307ZNIXNaXicfsImI0dDVjmXXcVYr125vRlCKlFtmrmC97uLcRHjSqz595KtN7+d9aRm7BwuQFreiRUKV/DvGvfukAYl3NjOoGxaRGaBQlH9X1gBFeGCUuWBCTyqjOsRBh+hQcFETFnCZAKQ6wUgi9EiJlyY2pUMtB2m+TdxlHCP/iSEV0p32pHnM5yglL7zy9WC+IdcMzFwFakiJtxJQ1Xt18k5IK8CTCmqDkT3rTItkNH1qRgDBSdDPBQc8wZBdLycrOlRZ4hQQ== 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=8ucHxXTIH2d/pc2a5AGJv2j4tQWBDW/+DQxve0S65Dk=; b=jOoje6+CpB0xjaxZC1xSsIs6o1bjKAd+GGXda8S4JSatcgU+F29TQW3SHMeuTSB8P4R2UlpNa4V7oxtz8PH6b9XFW/rUSPJcFEMbVJZQleJLQYUy0aVjNIWprgp5MH7zlUWmoE95WMaiBPUeNYgXZg8i0UYzSp2sCvdPfyJWa7p9aO5h2HbzS7KeTF1WfwKHcsqNXjwwKoS7N1lXQP4dVc2UVn452Pjyd4k0D5+556OCXGNujd0zp9qCQmjBy43X5htdvyf0Rdq2Lcsq4Ed8wv0pzaGy+7rVVPnou3l1ia3kMGdwsgvo/mmiRHWSerQwJV0w5/w4oJ2EUfQjVqSIjg== 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=8ucHxXTIH2d/pc2a5AGJv2j4tQWBDW/+DQxve0S65Dk=; b=UL3bW6nEiUFYshEhp8t9st6aZZri5/r0kItlOCec71Db8jVvJQvPIGAOVJ24rWjTVT7gvFmdAWCnML1BKSmTSxRx/nA0ebkNII4HVKS7RZIxTBOlW+f7zRosSjbyJjEBziTyAoQ2Z6F5SyqyRXelfWwKTQxpfwTYe7u6EAKZFDgCuukSyRmReRyV4PNCbqYMUFBDv96c7SW4Epo4evSFz793a5aUE/gbSOSGzDLxMwY919R3G5HwwmqxJLd0DWr3Ta2A/MLhWb363JKjnV0xMN016aWLug9PWFDbunCimOemrG0KdRvNVoL/9pVz+fzibCAZFtDIYH8izPFfuQXIaA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6815.eurprd03.prod.outlook.com (2603:10a6:102:ed::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:28:57 +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:28:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:25:11 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [dKen7IEN6vDIbDILemn/l+AJ8WrSlzDU] X-ClientProxiedBy: AS8P251CA0030.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:2f2::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210930132848.2672546-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AS8P251CA0030.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:2f2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Thu, 30 Sep 2021 13:28:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7a1098c8-4844-4cc4-d049-08d98416411b X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3Uma0CLWtbSl2Usyl07K79WLk2yZIId1wE8TPxwVThRzdkrgjouLfLMkfvETUUdn+NRHMpMJ70D3mA5XltHnP1+qshSyx/3/feqnovKLxK9sBpSPugJSw6arP/h4zuS+kTGYqWqUxUSvyZ1yyRMl5cxKlK/VIYJpZaUyIMZV/vFU3P5iKd26a1auBUANLDs9HXeGnKKZGlNqnfs9DF8ADCQ4PqPOnUWJCijacJmcuSpUBqx1hNewo90qtM0aQx0zEYoQmlCOEpZpkD1sSYMGculOqPChns3OCO3A7ob/rc1SHxITdbH87lh0INJrGoLKIK2KLF8df8bkMTMqwqfAo8c79J8gOC5q6ExdsBPJmFwjwePHa/jZcvW1VkgKckix18rOOWq+H+0659BMI4EXt3o2LRE76jS6YP96hLCkZGT/cIoMbbHrBX12XM1iBucY2T/17P5mG1tLLSIgn2nDGU899EIR2Mh1qY/Yw8/npDclygtzahWufd7vDtiqounnzQSYgf+hKwuknCCA8SgmfrfJQnp2pr39rZ1SRm5xT+CgI2YlRMGeqJ9TEnyKT7YMigj2CAvN1lgTShvTb6aMozWkeTN4SUrtVqyYbkyTrXGaJW9SEubVxYQ/y+1IVAwBBV10jxcieFIebW58G41TtUMOUfQ2zIqVZO2FHc+w+IvyKLlZLang9Ha5KkX9/46U0kLarktfPtmlf1k+QbdUjQhA/w1LzMHplY= X-MS-TrafficTypeDiagnostic: PA4PR03MB6815: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yIvCugJiRk/8L8F3wnB9Xgnz2+LxmyP8jpEcsTNZXrKBKyP8OkWEJrRAz+q8iAEQq6OT7PTYZdUmVj6GRP1Rf6MR7og6HGuEo0fhLATHocAy25oaI4APmuNjRbcUm1IDHrVFDMJhtdLzuYUkluASS6x1UV5gWjhHNdLLqHbvtwtJaqln7cR84BAZw4/lih3vJ9piJnWQnkQWRds9mQhvRIv0CoNbeKaDV3fATjqCp1dyqQcfIpGcstlpd/sUZzIbZwBhkob38AUMWkiEQaO/JMJpO13ynSNG9t1TN8vypT3IuTKUS1iW8aDhHnDdIxomyjx9PF6Ad17QRBwjRerYUXPTwTG/JRsyiXYW2sM+a/HIIErSfO83dWE9xvMf7YAdZp96+ss2urYwAsIKwyQyrbRQXm+scMAM9fO5NAf5/8SCvUZEuc+Ge4sysoRJM7rD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FfXW1rN12dTssPsN4YmpPyQLUTox6CuIfVyvMArFZPIqtY8kxMpEj61SjLujYBUzYgoImNJBaStU7YNIec7wJlLp1I/gWN83BbrfjbO3uau0kVoJbhK1oYdGjH9Cd+5n3MzVBhbrklXZBhOpwLJUeQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a1098c8-4844-4cc4-d049-08d98416411b 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:28:57.2566 (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: PA4PR03MB6815 Subject: [FFmpeg-devel] [PATCH 001/218] avfilter/f_reverse: Don't use redundant query_formats 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: uGBJV1eQR68n Said function did exactly what ff_default_query_formats() does for audio; so just remove it, so that ff_default_query_formats() will be called. Signed-off-by: Andreas Rheinhardt --- libavfilter/f_reverse.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/libavfilter/f_reverse.c b/libavfilter/f_reverse.c index 82f0c705a2..0398aa9cb0 100644 --- a/libavfilter/f_reverse.c +++ b/libavfilter/f_reverse.c @@ -145,19 +145,6 @@ const AVFilter ff_vf_reverse = { #if CONFIG_AREVERSE_FILTER -static int query_formats(AVFilterContext *ctx) -{ - int ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - ret = ff_set_common_formats(ctx, ff_all_formats(AVMEDIA_TYPE_AUDIO)); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static void reverse_samples_planar(AVFrame *out) { for (int p = 0; p < out->channels; p++) { @@ -283,7 +270,6 @@ static const AVFilterPad areverse_outputs[] = { const AVFilter ff_af_areverse = { .name = "areverse", .description = NULL_IF_CONFIG_SMALL("Reverse an audio clip."), - .query_formats = query_formats, .priv_size = sizeof(ReverseContext), .init = init, .uninit = uninit, From patchwork Thu Sep 30 13:39:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30717 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp684202iob; Thu, 30 Sep 2021 06:43:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdTziyDFWbAU+tRLSA3i/kBN46XuyrRD3vdxyFhb0o7O2urpxqEUU1w4zVuVNuQiitSmIj X-Received: by 2002:a17:906:1ed7:: with SMTP id m23mr6740676ejj.558.1633009394852; Thu, 30 Sep 2021 06:43:14 -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 c12si4247738edx.6.2021.09.30.06.43.12; Thu, 30 Sep 2021 06:43:14 -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=fb3AVnur; 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 8F74868A83E; Thu, 30 Sep 2021 16:43:05 +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-oln040092069093.outbound.protection.outlook.com [40.92.69.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27B2368A33F for ; Thu, 30 Sep 2021 16:42:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R/ZtP4SsYYdR6W9YPAfs9mXu2x6Q2m67oo1XJXxDT6NJUD8gPi8nnM3goXMrQmBAoYTNYnyZCeYIl3veQbiqVdF00Z4ly7L1y1jg1zrYJZTKIj0cmkl0ReCnuamtdkO2nK0DMie/+rAlo48NkuF0jtdel0SdI2B90gykvO9otKNr6RJDE48QPYRXrV8/LF6rBpM9yjoRQjU/MeB3szV6Ur2I/5OmBHo+llYLyZBcQziw7oPI9TX+UvxCu4+SHXwIaXz3bBpbeUTRGHFhG2YXxreKXIlki5Q89HJO20VNza/Oq4KB44QTOA6sydv8n3VIJq+sMXhFK18eAfEa4qjBCg== 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=j88y/+DplSOFOFrQ1C/GY0CVRwK+TyfHoiiPVFGD09I=; b=FsKkWFSuT4qy0ySvK0Z6rjT0PLBOTPz1/1PrQzq719rfLbCGxupM4p7jfAb3zdi1HZvyaVKp31avx5+zDz+eNwJA+8mtkAamKNTRvQWjPNXIrfyqf0AVNu8d68Oa3zmrjyvBoEML4syMcetyrM0SDoAPDtu7d6UHmi0Q7n+qfeyvPQ88t+UnP2yJ0URjvHGef1oeasdJGdZ40I2yZRy4FSoPzsxEOZ8skOkdD4w8chc9PCCZzJTKd4uT8Pv6TgLrX3e6gaV4/4+PKM0sYQOXDmx/Bgm4SlXg9LBnc5Jt2Ne/Ky3yOFRByP00fq782atw0TP/zKXOwJ6sPUDkbhzTMg== 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=j88y/+DplSOFOFrQ1C/GY0CVRwK+TyfHoiiPVFGD09I=; b=fb3AVnurqDJv1Q+0kdn7Gyt0B6lekwaykDHtyIiQ9oQe2QbGsRbWgDx4c6PqolzWbBmQcUAXZE4yQHj5YO7tacgB4LQzGDm8ly4wGSHuNQryl63jb7uuTZeDh0VR31+4SQaT/aywxjO0Tgo+v5+QJrxBUoty9i4z3E5lft+7SSwdBefpIhcT2R/Hhcg/+bexUpl914uewG2++lIElYJCJSlvzQyt/OFR53wLvhDp8xeYC/RI+z6/JXxJy0GEF6LYubXXQSAhfdp9LnAOb7X7xu45mDjsH8AKWWEpx/PS+P2LIkBCBIp6MAfvm+AGxUvrZ0qfvdH2kh0pVVbueAouiA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:42:48 +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:42:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:03 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [If7UTXcguFpTzx3QAU09BHvMQAJWfsYu] 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-1-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:42:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 013ab36b-3813-4295-97a2-08d9841830e6 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3Uma0CLWtbSl2Usyl07K79WolL8qfI7izKpHVtgVltBox1u6QaU1eRbmZLKRXWVWMA49RefIGGS3/W/iIMAC8El8sdaknb5qU7XdKZKnTSllix8D7x8skkehoiCt4v6h0SyGHfXZRVZiy8wnFp77Uv+8y+8/FLkniejSvgpjDDHZqz4xeelF70fk+U04TOyQAT65X1dnxmlnKQ8QOUAe5TcpABgFKDKksLWcd/TeUj4lgWp8DLj95huzO/F3+i4hmu1WuejQfKWezjW2MtHM6CS258vohIje3C0fkzRpPSd16B+yUHdMH8P8JLod41bEgJqIPrA5u4JkQ0orDHcFA5pyuNGgMu3ZMlOV4UbSTz4qepe8M8VU+Q2j0Vce+g+UnWQH4AunkAx+s09QO9dYKvH/bLs328iK2O1Kz3jw7OU8AkY5sHVTIqZ6lkIqJc/RxxvU75cmth63iZ04dEiSVydBDKeh79x0jCT26dh35gsgGNZQDxStuNwpDL6NGXDqP4A8UXlDTtFitqfmL7+xcYkPhgHCitJWkDueYqnX/RL/6j2jb+PB1/8YzoYUnwCI+Lmk/Kg05Eu8Q1ftxJow3lnrAdRdRYODf+UHlwsg4OQIejKM06v2zw6YV5aA9G4tGfUvxIVF0dg/uoUufZzxmt65L/b4Koc0HxK9la4nEEP/pYXCF7V5+6FNHG8EjoKBW60N8LKKIQXSiKAfEstPmPo0ZyjcrxbAjw= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0SXSjB7+4xKRyKVnEyAyDeZXh2QJPhW7Bb9HkZ/jrO7sAnuVqg6ThKeCj5SzUo0F+BtyMP/Vl0p3O8xft4JA4EWjPAn4VHAr8u6lDquFH7K204cHDY3IIYXpxHiiVVVgaxNPWxAM5i9WpR1PTKj6mWaWEgD7XslFTq2sXRV+Wjx1SLkzuj/XcAIEfMRPHHam8sJ+c4wedWcvoscVq7c6dES1fgp97bPZ58We38LjBX7/5m7FIWRBV344q/StLkSNw/7vlvKw9H/DdLSfZjYHk/vlwSQKxxDtvC1eCVMpoA/cYtk9YbT0zqP/2vo8Xz5x0UJjxl88HSB7ArBbcEfgTJEhSQZRABgdSIby3zIGk5NEN+p3Qe/gBkwfE/a7UfBbZ3YFtb+e1Xeu9njs+1jdzMAOMz5u4YJTc+9xc6DGkDNOFlFX9Quy9gWpsHAstZJ7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: r+Qv4thMG+2899yc4RlBYk+0KoslgpopizjiMs49kRpqtREJmGvw1h4AYwR4oqPgFiiKbwQhdqRztQx7DynX+jgYiG8FYEK1OebT00kRiqFB1Ihrx5LZ8S14e1AMs23JR92uuUK64t3lJflUnTtqnw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 013ab36b-3813-4295-97a2-08d9841830e6 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:42:48.6993 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 002/218] avfilter/vf_fieldorder: Remove always-true check 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: kc9KRc/q+09L A filter's formats.query callback is only called after all the inputs and outputs have already been created. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_fieldorder.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c index d34119c920..40bfd6549f 100644 --- a/libavfilter/vf_fieldorder.c +++ b/libavfilter/vf_fieldorder.c @@ -46,7 +46,6 @@ static int query_formats(AVFilterContext *ctx) /** accept any input pixel format that is not hardware accelerated, not * a bitstream format, and does not have vertically sub-sampled chroma */ - if (ctx->inputs[0]) { const AVPixFmtDescriptor *desc = NULL; formats = NULL; while ((desc = av_pix_fmt_desc_next(desc))) { @@ -59,9 +58,6 @@ static int query_formats(AVFilterContext *ctx) return ret; } return ff_set_common_formats(ctx, formats); - } - - return 0; } static int config_input(AVFilterLink *inlink) From patchwork Thu Sep 30 13:39:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30715 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp684014iob; Thu, 30 Sep 2021 06:43:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSO2XIUvnFqZB2QjBBzTzYQeiUxUH1gVPMrOTII3uIQBrgwzkuu4L1wpJhPXJ1sXb3kbLx X-Received: by 2002:a17:906:3a58:: with SMTP id a24mr7072366ejf.67.1633009383827; Thu, 30 Sep 2021 06:43:03 -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 6si3308190ejk.125.2021.09.30.06.43.03; Thu, 30 Sep 2021 06:43:03 -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=rug1FiPe; 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 A946368A825; Thu, 30 Sep 2021 16:43:00 +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-oln040092069093.outbound.protection.outlook.com [40.92.69.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12E0E6808CD for ; Thu, 30 Sep 2021 16:42:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CW0UyBiVoD0YgUJx1e9fiBhF6OTB5cTBjBza0dKBDVmWKLguulcRqkqpYWIOOcjCprZePYW/J40Z0ZA+f4ymHvxMusv/EbWYSrI0hWj68hp/CSzgnh8ybNpgKXrH9OAGPtt0VUCIGqD0yXipf3ksVREoVxhgWzMQf3Lxf4dYtfQyp9dtjsY3/1c2ZMLy+HSk6JlgJG2JQRmIFJnxFkFu2JikB/QLrGYLatcxypFR/5sz1OZH00SlrnZjh2UBFiTOrhuoFfmJNzALmmtZCqYwXd5IfRICrBhRX6kgHd0FhHWb6XWLJA40m5FjTPCMRSyEBH/8VZgW91wVQqB6kszyLA== 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=iwHWG0hKhKAB50/JnsW6MPtTSyQYMLXIIfH8vd0pqhk=; b=DEJZzzDdFokbkJ6if67bRBmPLfqgMHYl2R5mRbxpfpJYmRNIc9SVCYz2hFWJDBUhrZWlsCcsegU3VRYy5kHRprk0mWkhlkxZEBcxoxdN9gkS9tDMinj0tDgS/8OdUXDxM156ct1C0XihYupwovWqTKcDXcj/W0azt5f7RgDTeXeS7I9zXNwe9CJEPZQCBAeL4unRieX32Ky6fBwpV7d/BEa7e+TDPFT9SVUqts6ABRciHgS/6XjlmvRpJbpp5oVmP3Tk22+ewYO5HYPGPOPi2o/wH6pETrv6ouj6BpIyimxiDfSA/dfDQebi++9GuGft9z27jAjpitfYwc6xFLvd6A== 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=iwHWG0hKhKAB50/JnsW6MPtTSyQYMLXIIfH8vd0pqhk=; b=rug1FiPe4Mkbsz1Y5HuvBt73LYQVKjxBh55AzyxaKDmI/XvYahJjz67vQoucA9aqOXfqGdSnr4AtO8h9Mi6+ssWvpC0nrZc1jR/4Ek4XGidkz0qZSAFugjphp9HZXZMFJ0bTxQy+Sl50GOKei1BlbpZxpNtCQ1jpThmu0d+8Lrwl4aPE8RoCYRF5ZD69rvlPz1Puo9fOmdAZhdXeUMPCIldjjt2T+XC0cJ6jm6+9L5e9mTNIhgNyvBpzRJDDq95xWR6oZEsBZo+M828GmjJb/+0sIbUmPBGscXzRjCjH6Ysxtawt2v7eiQuTXz/C9NZWT3khWCagR8bXyBZY4v8Mdw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:42:53 +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:42:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:04 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [BrTCDeA3H7fQmDyTu7TtvenmgjQO1tgK] 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-2-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:42:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7cfc826b-c45c-4501-6b9f-08d984183371 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuxeWGdH5xYgV96647felgByBpVHT46CClhiU9i62ZS6PtUBKQ961VOAeWdKEGsJE/dP/uEyE5QdpwHV3T3T6karHFnFEvkp4kVlyyEotPSzeUeN+Bz4ucDNCL6CIi2mz5DIUuKf7LO0ToapWXXPeuW4jYsmYlZWEuStTVzP+DuqlzUh+Myh5NG3QXrDVP/UrloUWXZgYFCnvZ5RzxlBSjQAfs+bNj3/y2crbAs9DW+CgEzpNeVyNOAjAzcoDcml9ZmZPwmugv5LJAFnG+W++YRmOT1RlB49+K5Xdg8vPGjsXRorX1fs0ahd47eInxD5xOR6P/28aKKYTnmBG/hgKicvlbmx1Rxyv2osfDxQQuhBIwoipUGl87wU+p6WrpveNo6tF8plTUpeu6T9zhXkB+fH+fAyt3lmfGVGus6ys8veGysL88E4stvT3uRwKVegGzPxHElMPtRty9joUJwz1VzIZvGueiGu8RV+/ZzyIQAc35laokSS7q6m4+HU6Cq+ZfmPkSrVX2szcZ+jRx9dT/Ck7DZ04jJBnuMJpRXOReB+tkUzLC7Yfo3P55veVnrEx2EpUuGFsQgrH6F8X97gAbcBn4lLiwQ611i+ev8hGaCDfzXfh0Xq4oQ8bV7NeDVuccK4GOziKs+pcDURefqDPXpGtP54PDVh3FIqkg+XBDIZ1ouJVidQbn1iatauKcbPUwZ/iQPGVCwu95Pi7FYXatMYRw0ojGyk8Kg2f0c5FnSATWxSSF8zEcMqafkCeNJwKI5d/AZ462oRQ/8goW89rfZ X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /rLcxF1ga8RxLw9XJ2grt/3sj3/g2xoJoe3sxxSTTCHRMhH4i6X0J1RgUGjzIdRlvbEp6Z9+/Ns/opKhaqgrt0JNto2m8UlqsIrcLNJLoABrxJVsxz6AR/NIH53YnKdLxfQS1GUy8d5kI+yy+Vf5vSpTLpuEVup0VQpRfog8Ejme+vETdHq6UvJFxYMtWy5IIsKhZuGEiR837jFYhup5c+2a+Zmgb4nR1giDeke/PcyO5ZJWdoEBwtwOsazbm5DIv9fEkIEKqc9xREH4+L0z/O6jf6sw3HKBgG3aLlk1kZ08BGYrZ6tM/IMTFNIP7Xew7YncFMsPT0COxDbAp62Ix28ydfNYaFaPgDxpPOl2niChDEr4RuMN9z49bX9iiopzMQFObA9WMF7QJ14EAjcEMLZauZPGu9svaO1jQzo2T5a/LW/M8qF2LOSTT7kq3wpI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pR+I6nX+k2pnqNFP6Bz8k5ujANFTgTau/mqGIBl09BUr55V5//fzpyklrXQjDIa0nXU9ykfs2FnIgbCHeSBdHX8Zb+hSVKTcuDUDRBpVQfB5B+AwIWZeMHl9/94GxVeptOUVzATDUtt/XyYOGtgm4A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7cfc826b-c45c-4501-6b9f-08d984183371 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:42:52.9128 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 003/218] avfilter/formats: Add function to create AVFilterFormats with one entry 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: EAU3yAzQMas2 Most instances ff_add_formats() actually only ever add one format; this function can be used to simplify those callers. Signed-off-by: Andreas Rheinhardt --- libavfilter/formats.c | 6 ++++++ libavfilter/formats.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 1d2a51c0af..d5b8fa8e50 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -430,6 +430,12 @@ int ff_add_channel_layout(AVFilterChannelLayouts **l, uint64_t channel_layout) return 0; } +AVFilterFormats *ff_make_format_from_entry(int fmt) +{ + int fmts[2] = { fmt, -1 }; + return ff_make_format_list(fmts); +} + AVFilterFormats *ff_all_formats(enum AVMediaType type) { AVFilterFormats *ret = NULL; diff --git a/libavfilter/formats.h b/libavfilter/formats.h index 42fe068765..e19625ae6d 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -208,6 +208,12 @@ int ff_default_query_formats(AVFilterContext *ctx); av_warn_unused_result AVFilterFormats *ff_make_format_list(const int *fmts); +/** + * Equivalent to ff_make_format_list({const int[]}{ fmt, -1 }) + */ +av_warn_unused_result +AVFilterFormats *ff_make_format_from_entry(int fmt); + /** * Add fmt to the list of media formats contained in *avff. * If *avff is NULL the function allocates the filter formats struct From patchwork Thu Sep 30 13:39:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30704 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp684365iob; Thu, 30 Sep 2021 06:43:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJM2fqEfNSgVp7KKYJSP5v4mPgx+47qMu3GNmpcW2arjQgtP/5mO3gddRTkNLAGgzgYOcd X-Received: by 2002:a17:906:c7c1:: with SMTP id dc1mr7224539ejb.6.1633009407325; Thu, 30 Sep 2021 06:43:27 -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 i14si3328546edv.587.2021.09.30.06.43.26; Thu, 30 Sep 2021 06:43:27 -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=CZJYT6gv; 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 9D82A68A861; Thu, 30 Sep 2021 16:43:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064067.outbound.protection.outlook.com [40.92.64.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E05A068A76F for ; Thu, 30 Sep 2021 16:43:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cMunyvEiKpm0y7HjiDlybgxStDkxo2E/KPipDOKDdA0Mc8vGCGAugENpO0X0sxb5bVH+JsMBHqUpE8C7/tdEkifPenbsYypdX7nSt3DtLSL9+0tYSGzzYrVF2OVoz6bpX27fglSbrXUvWe4rm4gJ/jxS33UWzyG0JQAR1di+U2u29pa/t27B+bNbO6pXDt8l345qrog7TlIbHcpN328nvxq7ajOC2ahIAGElCde03I1NvBju+J+ivXxv6Uo4SfLqC1MSmNeUPGKnU1bP+oBVLUMRGTJak5t1hjnJRXwMH9uLe/t55dbe4Xuvssl/nahW9EyJIuUh+7kmt9yBp5+iWw== 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=7qi72vsgF1oOBHdc8cykqzedfFVGtyiAuUC3jmu1Soc=; b=LzNQfEY35GE6BcOJTvJHEXdFZdT0a3C8OCMAQLlF/cMDI+UUyo33LbiE6nU6yzWYpekCWL60UzdbbjRl4OQWsHvK+kccWTLXwq62mW0CMDq1xSj6keAiq2U8v6HHA3F+MrzvAusLoRoD61iyAC953bC1fSmJ8UFC3T6pELR1KamOXSbmrrGWxE4NCA6KqX93rHuY70Iv0ZJelih+13M1OmOHmV0s5voFv/5Pl6LHO2rsyoTs5Fctm5T+r253Q4uBfzRnyjNhJCanMTMuS/sYfaO6hqYB3IghhXPccZMfEl/HEsj35npVmMcnmJ7pNp9BqG3s9cAcQS5zkcM0A6nXYA== 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=7qi72vsgF1oOBHdc8cykqzedfFVGtyiAuUC3jmu1Soc=; b=CZJYT6gvxiu8aPirU2d5vKRIjc1yqHxls3sZCGmy65tTy9Sc2/C1em1IbaL+ogrwCoLJ9JbxMH8Y4qJSe/pV3F37RMtweD5xCbUXGxLxxFjmLCxM9N5ALir92oa+YfdiyslchMeX0TpXDorZG8QV4U3WqFxOun/QQldTyHHhGXm9yWuSAbaZq4iA2K60G2uyYcy3/lXtAh/cuuFTGHNqqIVYJZYXWQtpSNcKI48tg16E8elvK1KbXW/il1xyYFPHHssgIMCd5gmh9RE+i0lFgnvYY2trgUP6mqKLkiggFZqoHI6uFZ/ZYzEQySKe/aUpGkqNBWYy5zoq+5FBbpKbuA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:43:04 +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:43:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:05 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [g4n11sTnrB7n65IcUgH59kiuQ/T/hbyd] 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-3-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:43:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d8c95868-5852-407b-1229-08d9841839c3 X-MS-Exchange-SLBlob-MailProps: ZTmCor6bjd/izO7AyfCE+rynK/Z9ZWf3lekT1Rk9jzrkyMlfMNQsm3RE6E08P/2k9bnzKDND1OOOcp5uaBMoj6JamaDTicfOn1PiMBXhAlFgJM9mwIGyciY6KMzZXpaBUT0a2BSaAGV7fzgF2bwYEQkNFh+Az+M/aqekK7kAf0y6jOFfKqmHRkBUaFneGVlHERPiK+TgNFz3IH+/w8JEhFDe2mxjZ2tieXLBOWy1NXQKtWSZ3++ysF6YPNqoSRWHlziQqwhJEyrmj8l0WYy75wGZrlviU0j7wPfuDLVxxnV8H9dwyQzdM7AMm8pgjZ3hWJYrqIkKTik2hJCMOlaWAJ3OMPIHo1e/0TzQqS07X5ctSnKPjKnRbtwxvhzfP3hE7NQ5Fz7v0Oun3U6PI7tXrtPTscsyCcjL7RudyrlzIFNmzB9AoPXxIntFRQZsypbvXYfb+GJQtSMyGLATKdpTSfXjtubscMhtu/ZjW4sY5r9BSlp+FFsi99R9RbcX+9oOdxcqxfrYY0V/TkZJ7v4seQStxrw4xNREMkXdczAncH3n5/skGpEinqO8lA2be7fUQ0fWPrpxc6lpFleJMLBcTzQTru8lPMaF5C4HFbCPP9IvXKBvctDUaTLDpq+3wt2AmbxdHoiQQ+m9x9bSAW0v3sAsW03eblNUraRYmf4INMg7s9u3b5ISmE3O1lCP2atoVnGmtrsx4jf/cWJNPE6zcSjbgbGfRo/CrI/VMjIUhEV8OV5H4D19/37dtUPtEW9Kw18mVVoU0Umsw6UDX7FkuTb6ek3ha0OztYXt0o7sEckvevtmsSk/VS18Reb6UO56 X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RcAXJrB8IKgifUbwJxtWYMXsrADEOxuKT7y9J76hY1l3ErD367lgTRz+7HG2K+wg//yP65y/7gn36PhofAGOTeUVaNGy7nVN03n60KpJdJZyuynTCQBMmAOYGHUZxOjS/0B7dx+cZq2P6JcuVKtyi9AZBUilY8JaA2BlQuNaMUTDV3PUrvT5Z1//zQUp6+KnE2TZBpJgJLnkImIFmQZ+wfh/JgXgwmDFqdH/22YTRCy6n5HQnNECScBb0Ct/PNp1ESNWsCmt4tsNfyY7U5F890u1yIq79255emfAjpHIXJHmj7D970F5vwoww5lVj60LAYWxrMBS6kFd+0UhrbM/lL9UUTgHnRSyMMffdIp+GdG1jRq923A9LcXDFn7FAaUihUSlWIt5wOXs0tCePBeyZ8HgO51mQYDA6GkeDCxh4cnlVlSZqaZbbb3S/VYYEN3TrG+gleCQ3XzrPnEwMk8J/qwWFtWJcur7grCQ7N5TKFANSo4GB0GGdtjWXVE3AIjSBTseWkWUqeaNPDBQxW2SGg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tXKT0JVsxb4qHRNkIxbqPo3NAvELlPjFzFu4Uem+YACf4/zXFVU818naowKW30Usvskd/HuJgIIdoAZcjRV07geRTuFbYRk2U3bE7Nf9C+iiEsxBX6UxhWzy7wTEfSPqpk+HGk9FBBIZBgRWUWn52g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8c95868-5852-407b-1229-08d9841839c3 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:43:04.0429 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 004/218] avfilter: Replace query_formats callback with union of list and callback 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: xiTYi87cr69p If one looks at the many query_formats callbacks in existence, one will immediately recognize that there is one type of default callback for video and a slightly different default callback for audio: It is "return ff_set_common_formats_from_list(ctx, pix_fmts);" for video with a filter-specific pix_fmts list. For audio, it is the same with a filter-specific sample_fmts list together with ff_set_common_all_samplerates() and ff_set_common_all_channel_counts(). This commit allows to remove the boilerplate query_formats callbacks by replacing said callback with a union consisting the old callback and pointers for pixel and sample format arrays. For the not uncommon case in which these lists only contain a single entry (besides the sentinel) enum AVPixelFormat and enum AVSampleFormat fields are also added to the union to store them directly in the AVFilter, thereby avoiding a relocation. The state of said union will be contained in a new, dedicated AVFilter field (the nb_inputs and nb_outputs fields have been shrunk to uint8_t in order to create a hole for this new field; this is no problem, as the maximum of all the nb_inputs is four; for nb_outputs it is only two). The state's default value coincides with the earlier default of query_formats being unset, namely that the filter accepts all formats (and also sample rates and channel counts/layouts for audio) provided that these properties agree coincide for all inputs and outputs. By using different union members for audio and video filters the type-unsafety of using the same functions for audio and video lists will furthermore be more confined to formats.c than before. When the new fields are used, they will also avoid allocations: Currently something nearly equivalent to ff_default_query_formats() is called after every successful call to a query_formats callback; yet in the common case that the newly allocated AVFilterFormats are not used at all (namely if there are no free links) these newly allocated AVFilterFormats are freed again without ever being used. Filters no longer using the callback will not exhibit this any more. Signed-off-by: Andreas Rheinhardt --- This patchset here aims to remove boilerplate code from the query-formats API. Despite touching lots of filters, there should be only very few conflicts (if at all) with Nicolas' earlier patch [1]. The reason for this is that the filters touched here typically only use ff_set_common_* functions, which are unaffected by his change. I will not send everything; those who wish to do so can take a look at [2]. [1]: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20210820090907.249707-1-george@nsup.org/ [2]: https://github.com/mkver/FFmpeg/commits/query_formats3 libavfilter/aeval.c | 4 +-- libavfilter/af_acontrast.c | 2 +- libavfilter/af_acrossover.c | 2 +- libavfilter/af_acrusher.c | 2 +- libavfilter/af_adeclick.c | 4 +-- libavfilter/af_adecorrelate.c | 2 +- libavfilter/af_adelay.c | 2 +- libavfilter/af_adenorm.c | 2 +- libavfilter/af_aderivative.c | 4 +-- libavfilter/af_aecho.c | 2 +- libavfilter/af_aemphasis.c | 2 +- libavfilter/af_aexciter.c | 2 +- libavfilter/af_afade.c | 4 +-- libavfilter/af_afftdn.c | 2 +- libavfilter/af_afftfilt.c | 2 +- libavfilter/af_afir.c | 2 +- libavfilter/af_aformat.c | 2 +- libavfilter/af_afreqshift.c | 4 +-- libavfilter/af_afwtdn.c | 2 +- libavfilter/af_agate.c | 4 +-- libavfilter/af_aiir.c | 2 +- libavfilter/af_alimiter.c | 2 +- libavfilter/af_amerge.c | 2 +- libavfilter/af_amix.c | 2 +- libavfilter/af_amultiply.c | 2 +- libavfilter/af_anequalizer.c | 2 +- libavfilter/af_anlmdn.c | 2 +- libavfilter/af_anlms.c | 2 +- libavfilter/af_aphaser.c | 2 +- libavfilter/af_apsyclip.c | 2 +- libavfilter/af_apulsator.c | 2 +- libavfilter/af_aresample.c | 2 +- libavfilter/af_arnndn.c | 2 +- libavfilter/af_asetrate.c | 2 +- libavfilter/af_asoftclip.c | 2 +- libavfilter/af_asr.c | 2 +- libavfilter/af_astats.c | 2 +- libavfilter/af_asubboost.c | 2 +- libavfilter/af_asupercut.c | 8 ++--- libavfilter/af_atempo.c | 2 +- libavfilter/af_atilt.c | 2 +- libavfilter/af_axcorrelate.c | 2 +- libavfilter/af_biquads.c | 2 +- libavfilter/af_bs2b.c | 2 +- libavfilter/af_channelmap.c | 2 +- libavfilter/af_channelsplit.c | 2 +- libavfilter/af_chorus.c | 2 +- libavfilter/af_compand.c | 2 +- libavfilter/af_compensationdelay.c | 2 +- libavfilter/af_crossfeed.c | 2 +- libavfilter/af_crystalizer.c | 2 +- libavfilter/af_dcshift.c | 2 +- libavfilter/af_deesser.c | 2 +- libavfilter/af_drmeter.c | 2 +- libavfilter/af_dynaudnorm.c | 2 +- libavfilter/af_earwax.c | 2 +- libavfilter/af_extrastereo.c | 2 +- libavfilter/af_firequalizer.c | 2 +- libavfilter/af_flanger.c | 2 +- libavfilter/af_haas.c | 2 +- libavfilter/af_hdcd.c | 2 +- libavfilter/af_headphone.c | 2 +- libavfilter/af_join.c | 2 +- libavfilter/af_ladspa.c | 2 +- libavfilter/af_loudnorm.c | 2 +- libavfilter/af_lv2.c | 2 +- libavfilter/af_mcompand.c | 2 +- libavfilter/af_pan.c | 2 +- libavfilter/af_replaygain.c | 2 +- libavfilter/af_rubberband.c | 2 +- libavfilter/af_sidechaincompress.c | 4 +-- libavfilter/af_silencedetect.c | 2 +- libavfilter/af_silenceremove.c | 2 +- libavfilter/af_sofalizer.c | 2 +- libavfilter/af_speechnorm.c | 2 +- libavfilter/af_stereotools.c | 2 +- libavfilter/af_stereowiden.c | 2 +- libavfilter/af_superequalizer.c | 2 +- libavfilter/af_surround.c | 2 +- libavfilter/af_tremolo.c | 2 +- libavfilter/af_vibrato.c | 2 +- libavfilter/af_volume.c | 2 +- libavfilter/af_volumedetect.c | 2 +- libavfilter/asrc_afirsrc.c | 2 +- libavfilter/asrc_anoisesrc.c | 2 +- libavfilter/asrc_anullsrc.c | 2 +- libavfilter/asrc_flite.c | 2 +- libavfilter/asrc_hilbert.c | 2 +- libavfilter/asrc_sinc.c | 2 +- libavfilter/asrc_sine.c | 2 +- libavfilter/avf_abitscope.c | 2 +- libavfilter/avf_ahistogram.c | 2 +- libavfilter/avf_aphasemeter.c | 2 +- libavfilter/avf_avectorscope.c | 2 +- libavfilter/avf_concat.c | 2 +- libavfilter/avf_showcqt.c | 2 +- libavfilter/avf_showfreqs.c | 2 +- libavfilter/avf_showspatial.c | 2 +- libavfilter/avf_showspectrum.c | 4 +-- libavfilter/avf_showvolume.c | 2 +- libavfilter/avf_showwaves.c | 4 +-- libavfilter/avfilter.h | 52 +++++++++++++++++++++++++---- libavfilter/avfiltergraph.c | 4 +-- libavfilter/buffersink.c | 4 +-- libavfilter/buffersrc.c | 4 +-- libavfilter/f_drawgraph.c | 4 +-- libavfilter/f_ebur128.c | 2 +- libavfilter/f_graphmonitor.c | 4 +-- libavfilter/f_select.c | 2 +- libavfilter/f_streamselect.c | 4 +-- libavfilter/formats.c | 36 +++++++++++++++++--- libavfilter/internal.h | 39 ++++++++++++++++++++++ libavfilter/src_movie.c | 4 +-- libavfilter/tests/filtfmts.c | 4 +-- libavfilter/vaf_spectrumsynth.c | 2 +- libavfilter/vf_alphamerge.c | 2 +- libavfilter/vf_amplify.c | 2 +- libavfilter/vf_atadenoise.c | 2 +- libavfilter/vf_avgblur.c | 2 +- libavfilter/vf_avgblur_opencl.c | 4 +-- libavfilter/vf_avgblur_vulkan.c | 2 +- libavfilter/vf_bbox.c | 2 +- libavfilter/vf_bilateral.c | 2 +- libavfilter/vf_bitplanenoise.c | 2 +- libavfilter/vf_blackdetect.c | 2 +- libavfilter/vf_blackframe.c | 2 +- libavfilter/vf_blend.c | 4 +-- libavfilter/vf_bm3d.c | 2 +- libavfilter/vf_boxblur.c | 2 +- libavfilter/vf_bwdif.c | 2 +- libavfilter/vf_cas.c | 2 +- libavfilter/vf_chromaber_vulkan.c | 2 +- libavfilter/vf_chromakey.c | 4 +-- libavfilter/vf_chromanr.c | 2 +- libavfilter/vf_chromashift.c | 4 +-- libavfilter/vf_ciescope.c | 2 +- libavfilter/vf_codecview.c | 2 +- libavfilter/vf_colorbalance.c | 2 +- libavfilter/vf_colorchannelmixer.c | 2 +- libavfilter/vf_colorconstancy.c | 2 +- libavfilter/vf_colorcontrast.c | 2 +- libavfilter/vf_colorcorrect.c | 2 +- libavfilter/vf_colorize.c | 2 +- libavfilter/vf_colorkey.c | 4 +-- libavfilter/vf_colorkey_opencl.c | 2 +- libavfilter/vf_colorlevels.c | 2 +- libavfilter/vf_colormatrix.c | 2 +- libavfilter/vf_colorspace.c | 2 +- libavfilter/vf_colortemperature.c | 2 +- libavfilter/vf_convolution.c | 12 +++---- libavfilter/vf_convolution_opencl.c | 8 ++--- libavfilter/vf_convolve.c | 4 +-- libavfilter/vf_copy.c | 2 +- libavfilter/vf_coreimage.m | 4 +-- libavfilter/vf_cover_rect.c | 2 +- libavfilter/vf_crop.c | 2 +- libavfilter/vf_cropdetect.c | 2 +- libavfilter/vf_curves.c | 2 +- libavfilter/vf_datascope.c | 6 ++-- libavfilter/vf_dblur.c | 2 +- libavfilter/vf_dctdnoiz.c | 2 +- libavfilter/vf_deband.c | 2 +- libavfilter/vf_deblock.c | 2 +- libavfilter/vf_decimate.c | 2 +- libavfilter/vf_dedot.c | 2 +- libavfilter/vf_deflicker.c | 2 +- libavfilter/vf_deinterlace_qsv.c | 2 +- libavfilter/vf_deinterlace_vaapi.c | 2 +- libavfilter/vf_delogo.c | 2 +- libavfilter/vf_derain.c | 2 +- libavfilter/vf_deshake.c | 2 +- libavfilter/vf_deshake_opencl.c | 2 +- libavfilter/vf_despill.c | 2 +- libavfilter/vf_detelecine.c | 2 +- libavfilter/vf_displace.c | 2 +- libavfilter/vf_dnn_classify.c | 2 +- libavfilter/vf_dnn_detect.c | 2 +- libavfilter/vf_dnn_processing.c | 2 +- libavfilter/vf_drawbox.c | 4 +-- libavfilter/vf_drawtext.c | 2 +- libavfilter/vf_edgedetect.c | 2 +- libavfilter/vf_elbg.c | 2 +- libavfilter/vf_entropy.c | 2 +- libavfilter/vf_epx.c | 2 +- libavfilter/vf_eq.c | 2 +- libavfilter/vf_estdif.c | 2 +- libavfilter/vf_exposure.c | 2 +- libavfilter/vf_extractplanes.c | 4 +-- libavfilter/vf_fade.c | 2 +- libavfilter/vf_fftdnoiz.c | 2 +- libavfilter/vf_fftfilt.c | 2 +- libavfilter/vf_fieldhint.c | 2 +- libavfilter/vf_fieldmatch.c | 2 +- libavfilter/vf_fieldorder.c | 2 +- libavfilter/vf_fillborders.c | 2 +- libavfilter/vf_find_rect.c | 2 +- libavfilter/vf_floodfill.c | 2 +- libavfilter/vf_format.c | 8 ++--- libavfilter/vf_framepack.c | 2 +- libavfilter/vf_framerate.c | 2 +- libavfilter/vf_freezedetect.c | 2 +- libavfilter/vf_frei0r.c | 4 +-- libavfilter/vf_fspp.c | 2 +- libavfilter/vf_gblur.c | 2 +- libavfilter/vf_geq.c | 2 +- libavfilter/vf_gradfun.c | 2 +- libavfilter/vf_grayworld.c | 2 +- libavfilter/vf_guided.c | 2 +- libavfilter/vf_hflip.c | 2 +- libavfilter/vf_histeq.c | 2 +- libavfilter/vf_histogram.c | 4 +-- libavfilter/vf_hqdn3d.c | 2 +- libavfilter/vf_hqx.c | 2 +- libavfilter/vf_hsvkey.c | 4 +-- libavfilter/vf_hue.c | 2 +- libavfilter/vf_hwdownload.c | 2 +- libavfilter/vf_hwmap.c | 2 +- libavfilter/vf_hwupload.c | 2 +- libavfilter/vf_hwupload_cuda.c | 4 +-- libavfilter/vf_hysteresis.c | 2 +- libavfilter/vf_identity.c | 4 +-- libavfilter/vf_idet.c | 2 +- libavfilter/vf_il.c | 2 +- libavfilter/vf_kerndeint.c | 2 +- libavfilter/vf_lagfun.c | 2 +- libavfilter/vf_lenscorrection.c | 2 +- libavfilter/vf_lensfun.c | 2 +- libavfilter/vf_libopencv.c | 2 +- libavfilter/vf_libvmaf.c | 2 +- libavfilter/vf_limiter.c | 2 +- libavfilter/vf_lumakey.c | 2 +- libavfilter/vf_lut.c | 2 +- libavfilter/vf_lut2.c | 4 +-- libavfilter/vf_lut3d.c | 6 ++-- libavfilter/vf_maskedclamp.c | 2 +- libavfilter/vf_maskedmerge.c | 2 +- libavfilter/vf_maskedminmax.c | 4 +-- libavfilter/vf_maskedthreshold.c | 2 +- libavfilter/vf_maskfun.c | 2 +- libavfilter/vf_mcdeint.c | 2 +- libavfilter/vf_median.c | 2 +- libavfilter/vf_mergeplanes.c | 2 +- libavfilter/vf_mestimate.c | 2 +- libavfilter/vf_midequalizer.c | 2 +- libavfilter/vf_minterpolate.c | 2 +- libavfilter/vf_misc_vaapi.c | 4 +-- libavfilter/vf_mix.c | 4 +-- libavfilter/vf_monochrome.c | 2 +- libavfilter/vf_morpho.c | 2 +- libavfilter/vf_mpdecimate.c | 2 +- libavfilter/vf_neighbor.c | 2 +- libavfilter/vf_neighbor_opencl.c | 4 +-- libavfilter/vf_nlmeans.c | 2 +- libavfilter/vf_nlmeans_opencl.c | 2 +- libavfilter/vf_nnedi.c | 2 +- libavfilter/vf_noise.c | 2 +- libavfilter/vf_normalize.c | 2 +- libavfilter/vf_ocr.c | 2 +- libavfilter/vf_overlay.c | 2 +- libavfilter/vf_overlay_cuda.c | 2 +- libavfilter/vf_overlay_opencl.c | 2 +- libavfilter/vf_overlay_qsv.c | 2 +- libavfilter/vf_overlay_vulkan.c | 2 +- libavfilter/vf_owdenoise.c | 2 +- libavfilter/vf_pad.c | 2 +- libavfilter/vf_pad_opencl.c | 2 +- libavfilter/vf_palettegen.c | 2 +- libavfilter/vf_paletteuse.c | 2 +- libavfilter/vf_perspective.c | 2 +- libavfilter/vf_phase.c | 2 +- libavfilter/vf_photosensitivity.c | 2 +- libavfilter/vf_pp.c | 2 +- libavfilter/vf_pp7.c | 2 +- libavfilter/vf_premultiply.c | 4 +-- libavfilter/vf_procamp_vaapi.c | 2 +- libavfilter/vf_program_opencl.c | 4 +-- libavfilter/vf_pseudocolor.c | 2 +- libavfilter/vf_psnr.c | 2 +- libavfilter/vf_pullup.c | 2 +- libavfilter/vf_readeia608.c | 2 +- libavfilter/vf_readvitc.c | 2 +- libavfilter/vf_remap.c | 2 +- libavfilter/vf_removegrain.c | 2 +- libavfilter/vf_removelogo.c | 2 +- libavfilter/vf_repeatfields.c | 2 +- libavfilter/vf_rotate.c | 2 +- libavfilter/vf_sab.c | 2 +- libavfilter/vf_scale.c | 4 +-- libavfilter/vf_scale_cuda.c | 3 +- libavfilter/vf_scale_npp.c | 3 +- libavfilter/vf_scale_qsv.c | 3 +- libavfilter/vf_scale_vaapi.c | 2 +- libavfilter/vf_scale_vulkan.c | 2 +- libavfilter/vf_scdet.c | 2 +- libavfilter/vf_scroll.c | 2 +- libavfilter/vf_selectivecolor.c | 2 +- libavfilter/vf_shear.c | 2 +- libavfilter/vf_showpalette.c | 2 +- libavfilter/vf_shufflepixels.c | 2 +- libavfilter/vf_shuffleplanes.c | 2 +- libavfilter/vf_signalstats.c | 2 +- libavfilter/vf_signature.c | 2 +- libavfilter/vf_smartblur.c | 2 +- libavfilter/vf_spp.c | 2 +- libavfilter/vf_sr.c | 2 +- libavfilter/vf_ssim.c | 2 +- libavfilter/vf_stack.c | 6 ++-- libavfilter/vf_stereo3d.c | 2 +- libavfilter/vf_subtitles.c | 4 +-- libavfilter/vf_super2xsai.c | 2 +- libavfilter/vf_swaprect.c | 2 +- libavfilter/vf_swapuv.c | 2 +- libavfilter/vf_telecine.c | 2 +- libavfilter/vf_threshold.c | 2 +- libavfilter/vf_thumbnail.c | 2 +- libavfilter/vf_thumbnail_cuda.c | 2 +- libavfilter/vf_tile.c | 2 +- libavfilter/vf_tinterlace.c | 4 +-- libavfilter/vf_tmidequalizer.c | 2 +- libavfilter/vf_tonemap.c | 2 +- libavfilter/vf_tonemap_opencl.c | 2 +- libavfilter/vf_tonemap_vaapi.c | 2 +- libavfilter/vf_tpad.c | 2 +- libavfilter/vf_transpose.c | 2 +- libavfilter/vf_transpose_npp.c | 2 +- libavfilter/vf_transpose_opencl.c | 2 +- libavfilter/vf_transpose_vaapi.c | 2 +- libavfilter/vf_unsharp.c | 2 +- libavfilter/vf_unsharp_opencl.c | 2 +- libavfilter/vf_untile.c | 2 +- libavfilter/vf_uspp.c | 2 +- libavfilter/vf_v360.c | 2 +- libavfilter/vf_vaguedenoiser.c | 2 +- libavfilter/vf_vectorscope.c | 2 +- libavfilter/vf_vibrance.c | 2 +- libavfilter/vf_vidstabdetect.c | 2 +- libavfilter/vf_vidstabtransform.c | 2 +- libavfilter/vf_vif.c | 2 +- libavfilter/vf_vignette.c | 2 +- libavfilter/vf_vmafmotion.c | 2 +- libavfilter/vf_vpp_qsv.c | 2 +- libavfilter/vf_w3fdif.c | 2 +- libavfilter/vf_waveform.c | 2 +- libavfilter/vf_weave.c | 4 +-- libavfilter/vf_xbr.c | 2 +- libavfilter/vf_xfade.c | 2 +- libavfilter/vf_xfade_opencl.c | 2 +- libavfilter/vf_xmedian.c | 4 +-- libavfilter/vf_yadif.c | 2 +- libavfilter/vf_yadif_cuda.c | 2 +- libavfilter/vf_yaepblur.c | 2 +- libavfilter/vf_zoompan.c | 2 +- libavfilter/vf_zscale.c | 2 +- libavfilter/vsrc_cellauto.c | 2 +- libavfilter/vsrc_gradients.c | 2 +- libavfilter/vsrc_life.c | 2 +- libavfilter/vsrc_mandelbrot.c | 2 +- libavfilter/vsrc_mptestsrc.c | 2 +- libavfilter/vsrc_sierpinski.c | 2 +- libavfilter/vsrc_testsrc.c | 24 ++++++------- 360 files changed, 551 insertions(+), 441 deletions(-) diff --git a/libavfilter/aeval.c b/libavfilter/aeval.c index 6c9aad4654..2dc8bace51 100644 --- a/libavfilter/aeval.c +++ b/libavfilter/aeval.c @@ -320,13 +320,13 @@ static const AVFilterPad aevalsrc_outputs[] = { const AVFilter ff_asrc_aevalsrc = { .name = "aevalsrc", .description = NULL_IF_CONFIG_SMALL("Generate an audio signal generated by an expression."), - .query_formats = query_formats, .init = init, .uninit = uninit, .activate = activate, .priv_size = sizeof(EvalContext), .inputs = NULL, FILTER_OUTPUTS(aevalsrc_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &aevalsrc_class, }; @@ -466,12 +466,12 @@ static const AVFilterPad aeval_outputs[] = { const AVFilter ff_af_aeval = { .name = "aeval", .description = NULL_IF_CONFIG_SMALL("Filter audio signal according to a specified expression."), - .query_formats = aeval_query_formats, .init = init, .uninit = uninit, .priv_size = sizeof(EvalContext), FILTER_INPUTS(aeval_inputs), FILTER_OUTPUTS(aeval_outputs), + FILTER_QUERY_FUNC(aeval_query_formats), .priv_class = &aeval_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/af_acontrast.c b/libavfilter/af_acontrast.c index b5a5381fba..91c4ecd19a 100644 --- a/libavfilter/af_acontrast.c +++ b/libavfilter/af_acontrast.c @@ -199,9 +199,9 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_acontrast = { .name = "acontrast", .description = NULL_IF_CONFIG_SMALL("Simple audio dynamic range compression/expansion filter."), - .query_formats = query_formats, .priv_size = sizeof(AudioContrastContext), .priv_class = &acontrast_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_acrossover.c b/libavfilter/af_acrossover.c index b339919142..1ba847d31b 100644 --- a/libavfilter/af_acrossover.c +++ b/libavfilter/af_acrossover.c @@ -559,7 +559,7 @@ const AVFilter ff_af_acrossover = { .priv_class = &acrossover_class, .init = init, .uninit = uninit, - .query_formats = query_formats, + FILTER_QUERY_FUNC(query_formats), FILTER_INPUTS(inputs), .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS | diff --git a/libavfilter/af_acrusher.c b/libavfilter/af_acrusher.c index 6130c9f2ec..88d6c644ad 100644 --- a/libavfilter/af_acrusher.c +++ b/libavfilter/af_acrusher.c @@ -357,7 +357,7 @@ const AVFilter ff_af_acrusher = { .priv_size = sizeof(ACrusherContext), .priv_class = &acrusher_class, .uninit = uninit, - .query_formats = query_formats, + FILTER_QUERY_FUNC(query_formats), FILTER_INPUTS(avfilter_af_acrusher_inputs), FILTER_OUTPUTS(avfilter_af_acrusher_outputs), .process_command = process_command, diff --git a/libavfilter/af_adeclick.c b/libavfilter/af_adeclick.c index 1e30ada03c..f9404b2a4a 100644 --- a/libavfilter/af_adeclick.c +++ b/libavfilter/af_adeclick.c @@ -753,7 +753,6 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_adeclick = { .name = "adeclick", .description = NULL_IF_CONFIG_SMALL("Remove impulsive noise from input audio."), - .query_formats = query_formats, .priv_size = sizeof(AudioDeclickContext), .priv_class = &adeclick_class, .init = init, @@ -761,6 +760,7 @@ const AVFilter ff_af_adeclick = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; @@ -789,7 +789,6 @@ AVFILTER_DEFINE_CLASS(adeclip); const AVFilter ff_af_adeclip = { .name = "adeclip", .description = NULL_IF_CONFIG_SMALL("Remove clipping from input audio."), - .query_formats = query_formats, .priv_size = sizeof(AudioDeclickContext), .priv_class = &adeclip_class, .init = init, @@ -797,5 +796,6 @@ const AVFilter ff_af_adeclip = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/af_adecorrelate.c b/libavfilter/af_adecorrelate.c index 6113574125..e0731b0945 100644 --- a/libavfilter/af_adecorrelate.c +++ b/libavfilter/af_adecorrelate.c @@ -257,12 +257,12 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_adecorrelate = { .name = "adecorrelate", .description = NULL_IF_CONFIG_SMALL("Apply decorrelation to input audio."), - .query_formats = query_formats, .priv_size = sizeof(ADecorrelateContext), .priv_class = &adecorrelate_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c index f9b4acd600..e67f081b97 100644 --- a/libavfilter/af_adelay.c +++ b/libavfilter/af_adelay.c @@ -338,12 +338,12 @@ static const AVFilterPad adelay_outputs[] = { const AVFilter ff_af_adelay = { .name = "adelay", .description = NULL_IF_CONFIG_SMALL("Delay one or more audio channels."), - .query_formats = query_formats, .priv_size = sizeof(AudioDelayContext), .priv_class = &adelay_class, .activate = activate, .uninit = uninit, FILTER_INPUTS(adelay_inputs), FILTER_OUTPUTS(adelay_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/af_adenorm.c b/libavfilter/af_adenorm.c index c48c02fc70..2cac605a2a 100644 --- a/libavfilter/af_adenorm.c +++ b/libavfilter/af_adenorm.c @@ -307,10 +307,10 @@ AVFILTER_DEFINE_CLASS(adenorm); const AVFilter ff_af_adenorm = { .name = "adenorm", .description = NULL_IF_CONFIG_SMALL("Remedy denormals by adding extremely low-level noise."), - .query_formats = query_formats, .priv_size = sizeof(ADenormContext), FILTER_INPUTS(adenorm_inputs), FILTER_OUTPUTS(adenorm_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &adenorm_class, .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | diff --git a/libavfilter/af_aderivative.c b/libavfilter/af_aderivative.c index e4b6267a1a..e37f978df6 100644 --- a/libavfilter/af_aderivative.c +++ b/libavfilter/af_aderivative.c @@ -175,19 +175,19 @@ static const AVFilterPad aderivative_outputs[] = { const AVFilter ff_af_aderivative = { .name = "aderivative", .description = NULL_IF_CONFIG_SMALL("Compute derivative of input audio."), - .query_formats = query_formats, .priv_size = sizeof(ADerivativeContext), .uninit = uninit, FILTER_INPUTS(aderivative_inputs), FILTER_OUTPUTS(aderivative_outputs), + FILTER_QUERY_FUNC(query_formats), }; const AVFilter ff_af_aintegral = { .name = "aintegral", .description = NULL_IF_CONFIG_SMALL("Compute integral of input audio."), - .query_formats = query_formats, .priv_size = sizeof(ADerivativeContext), .uninit = uninit, FILTER_INPUTS(aderivative_inputs), FILTER_OUTPUTS(aderivative_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_aecho.c b/libavfilter/af_aecho.c index d533bb610b..508d54b04e 100644 --- a/libavfilter/af_aecho.c +++ b/libavfilter/af_aecho.c @@ -364,7 +364,6 @@ static const AVFilterPad aecho_outputs[] = { const AVFilter ff_af_aecho = { .name = "aecho", .description = NULL_IF_CONFIG_SMALL("Add echoing to the audio."), - .query_formats = query_formats, .priv_size = sizeof(AudioEchoContext), .priv_class = &aecho_class, .init = init, @@ -372,4 +371,5 @@ const AVFilter ff_af_aecho = { .uninit = uninit, FILTER_INPUTS(aecho_inputs), FILTER_OUTPUTS(aecho_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_aemphasis.c b/libavfilter/af_aemphasis.c index a9c0cf599d..54a47d2c86 100644 --- a/libavfilter/af_aemphasis.c +++ b/libavfilter/af_aemphasis.c @@ -391,9 +391,9 @@ const AVFilter ff_af_aemphasis = { .priv_size = sizeof(AudioEmphasisContext), .priv_class = &aemphasis_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_af_aemphasis_inputs), FILTER_OUTPUTS(avfilter_af_aemphasis_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/af_aexciter.c b/libavfilter/af_aexciter.c index f9ece59d93..3300ebbd4f 100644 --- a/libavfilter/af_aexciter.c +++ b/libavfilter/af_aexciter.c @@ -294,9 +294,9 @@ const AVFilter ff_af_aexciter = { .priv_size = sizeof(AExciterContext), .priv_class = &aexciter_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_af_aexciter_inputs), FILTER_OUTPUTS(avfilter_af_aexciter_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index 3bd0331e77..c96a8fb7e3 100644 --- a/libavfilter/af_afade.c +++ b/libavfilter/af_afade.c @@ -353,11 +353,11 @@ static const AVFilterPad avfilter_af_afade_outputs[] = { const AVFilter ff_af_afade = { .name = "afade", .description = NULL_IF_CONFIG_SMALL("Fade in/out input audio."), - .query_formats = query_formats, .priv_size = sizeof(AudioFadeContext), .init = init, FILTER_INPUTS(avfilter_af_afade_inputs), FILTER_OUTPUTS(avfilter_af_afade_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &afade_class, .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, @@ -628,12 +628,12 @@ static const AVFilterPad avfilter_af_acrossfade_outputs[] = { const AVFilter ff_af_acrossfade = { .name = "acrossfade", .description = NULL_IF_CONFIG_SMALL("Cross fade two input audio streams."), - .query_formats = query_formats, .priv_size = sizeof(AudioFadeContext), .activate = activate, .priv_class = &acrossfade_class, FILTER_INPUTS(avfilter_af_acrossfade_inputs), FILTER_OUTPUTS(avfilter_af_acrossfade_outputs), + FILTER_QUERY_FUNC(query_formats), }; #endif /* CONFIG_ACROSSFADE_FILTER */ diff --git a/libavfilter/af_afftdn.c b/libavfilter/af_afftdn.c index 5e9cefcfc1..27a0780ce8 100644 --- a/libavfilter/af_afftdn.c +++ b/libavfilter/af_afftdn.c @@ -1411,13 +1411,13 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_afftdn = { .name = "afftdn", .description = NULL_IF_CONFIG_SMALL("Denoise audio samples using FFT."), - .query_formats = query_formats, .priv_size = sizeof(AudioFFTDeNoiseContext), .priv_class = &afftdn_class, .activate = activate, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/af_afftfilt.c b/libavfilter/af_afftfilt.c index 87e50f57e9..7714f1768f 100644 --- a/libavfilter/af_afftfilt.c +++ b/libavfilter/af_afftfilt.c @@ -489,8 +489,8 @@ const AVFilter ff_af_afftfilt = { .priv_class = &afftfilt_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .activate = activate, - .query_formats = query_formats, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index b74e7ddfae..ace5087e90 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -942,7 +942,7 @@ const AVFilter ff_af_afir = { .description = NULL_IF_CONFIG_SMALL("Apply Finite Impulse Response filter with supplied coefficients in additional stream(s)."), .priv_size = sizeof(AudioFIRContext), .priv_class = &afir_class, - .query_formats = query_formats, + FILTER_QUERY_FUNC(query_formats), .init = init, .activate = activate, .uninit = uninit, diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c index 1cab148d95..7e25c0c6a4 100644 --- a/libavfilter/af_aformat.c +++ b/libavfilter/af_aformat.c @@ -160,9 +160,9 @@ const AVFilter ff_af_aformat = { .description = NULL_IF_CONFIG_SMALL("Convert the input audio to one of the specified formats."), .init = init, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(AFormatContext), .priv_class = &aformat_class, FILTER_INPUTS(avfilter_af_aformat_inputs), FILTER_OUTPUTS(avfilter_af_aformat_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_afreqshift.c b/libavfilter/af_afreqshift.c index 0410bde70b..95fd4e31fc 100644 --- a/libavfilter/af_afreqshift.c +++ b/libavfilter/af_afreqshift.c @@ -388,12 +388,12 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_afreqshift = { .name = "afreqshift", .description = NULL_IF_CONFIG_SMALL("Apply frequency shifting to input audio."), - .query_formats = query_formats, .priv_size = sizeof(AFreqShift), .priv_class = &afreqshift_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = ff_filter_process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, @@ -411,12 +411,12 @@ AVFILTER_DEFINE_CLASS(aphaseshift); const AVFilter ff_af_aphaseshift = { .name = "aphaseshift", .description = NULL_IF_CONFIG_SMALL("Apply phase shifting to input audio."), - .query_formats = query_formats, .priv_size = sizeof(AFreqShift), .priv_class = &aphaseshift_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = ff_filter_process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/af_afwtdn.c b/libavfilter/af_afwtdn.c index f7e8211bb4..9235e6e28d 100644 --- a/libavfilter/af_afwtdn.c +++ b/libavfilter/af_afwtdn.c @@ -1324,13 +1324,13 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_afwtdn = { .name = "afwtdn", .description = NULL_IF_CONFIG_SMALL("Denoise audio stream using Wavelets."), - .query_formats = query_formats, .priv_size = sizeof(AudioFWTDNContext), .priv_class = &afwtdn_class, .activate = activate, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c index 5de2cc0f0e..568006c1f0 100644 --- a/libavfilter/af_agate.c +++ b/libavfilter/af_agate.c @@ -252,10 +252,10 @@ const AVFilter ff_af_agate = { .name = "agate", .description = NULL_IF_CONFIG_SMALL("Audio gate."), .priv_class = &agate_sidechaingate_class, - .query_formats = query_formats, .priv_size = sizeof(AudioGateContext), FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = ff_filter_process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; @@ -401,11 +401,11 @@ const AVFilter ff_af_sidechaingate = { .description = NULL_IF_CONFIG_SMALL("Audio sidechain gate."), .priv_class = &agate_sidechaingate_class, .priv_size = sizeof(AudioGateContext), - .query_formats = scquery_formats, .activate = activate, .uninit = uninit, FILTER_INPUTS(sidechaingate_inputs), FILTER_OUTPUTS(sidechaingate_outputs), + FILTER_QUERY_FUNC(scquery_formats), .process_command = ff_filter_process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c index cae2c365bf..8a4b4814f6 100644 --- a/libavfilter/af_aiir.c +++ b/libavfilter/af_aiir.c @@ -1572,8 +1572,8 @@ const AVFilter ff_af_aiir = { .priv_class = &aiir_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(inputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/af_alimiter.c b/libavfilter/af_alimiter.c index 9172f305f0..937f28383f 100644 --- a/libavfilter/af_alimiter.c +++ b/libavfilter/af_alimiter.c @@ -353,7 +353,7 @@ const AVFilter ff_af_alimiter = { .priv_class = &alimiter_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(alimiter_inputs), FILTER_OUTPUTS(alimiter_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 9c6da15a9f..9109af22c5 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -337,10 +337,10 @@ const AVFilter ff_af_amerge = { .priv_size = sizeof(AMergeContext), .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(amerge_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &amerge_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, }; diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 92557713c4..d2a363284f 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -639,9 +639,9 @@ const AVFilter ff_af_amix = { .init = init, .uninit = uninit, .activate = activate, - .query_formats = query_formats, .inputs = NULL, FILTER_OUTPUTS(avfilter_af_amix_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, }; diff --git a/libavfilter/af_amultiply.c b/libavfilter/af_amultiply.c index 7c44cadb2b..f9413c9fc9 100644 --- a/libavfilter/af_amultiply.c +++ b/libavfilter/af_amultiply.c @@ -196,7 +196,7 @@ const AVFilter ff_af_amultiply = { .init = init, .uninit = uninit, .activate = activate, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_anequalizer.c b/libavfilter/af_anequalizer.c index ab1838f990..57a9b7634b 100644 --- a/libavfilter/af_anequalizer.c +++ b/libavfilter/af_anequalizer.c @@ -770,9 +770,9 @@ const AVFilter ff_af_anequalizer = { .priv_class = &anequalizer_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(inputs), .outputs = NULL, + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | diff --git a/libavfilter/af_anlmdn.c b/libavfilter/af_anlmdn.c index 0ba725f59f..af6a6a69e9 100644 --- a/libavfilter/af_anlmdn.c +++ b/libavfilter/af_anlmdn.c @@ -402,12 +402,12 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_anlmdn = { .name = "anlmdn", .description = NULL_IF_CONFIG_SMALL("Reduce broadband noise from stream using Non-Local Means."), - .query_formats = query_formats, .priv_size = sizeof(AudioNLMeansContext), .priv_class = &anlmdn_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/af_anlms.c b/libavfilter/af_anlms.c index 75e932ca96..f1f82b491d 100644 --- a/libavfilter/af_anlms.c +++ b/libavfilter/af_anlms.c @@ -306,9 +306,9 @@ const AVFilter ff_af_anlms = { .init = init, .uninit = uninit, .activate = activate, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/af_aphaser.c b/libavfilter/af_aphaser.c index 3a365140db..962bfe6b16 100644 --- a/libavfilter/af_aphaser.c +++ b/libavfilter/af_aphaser.c @@ -278,11 +278,11 @@ static const AVFilterPad aphaser_outputs[] = { const AVFilter ff_af_aphaser = { .name = "aphaser", .description = NULL_IF_CONFIG_SMALL("Add a phasing effect to the audio."), - .query_formats = query_formats, .priv_size = sizeof(AudioPhaserContext), .init = init, .uninit = uninit, FILTER_INPUTS(aphaser_inputs), FILTER_OUTPUTS(aphaser_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &aphaser_class, }; diff --git a/libavfilter/af_apsyclip.c b/libavfilter/af_apsyclip.c index ef151bcb55..e9f1feb906 100644 --- a/libavfilter/af_apsyclip.c +++ b/libavfilter/af_apsyclip.c @@ -666,12 +666,12 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_apsyclip = { .name = "apsyclip", .description = NULL_IF_CONFIG_SMALL("Audio Psychoacoustic Clipper."), - .query_formats = query_formats, .priv_size = sizeof(AudioPsyClipContext), .priv_class = &apsyclip_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .activate = activate, diff --git a/libavfilter/af_apulsator.c b/libavfilter/af_apulsator.c index b9a194eb9d..c2a8de0e0b 100644 --- a/libavfilter/af_apulsator.c +++ b/libavfilter/af_apulsator.c @@ -249,7 +249,7 @@ const AVFilter ff_af_apulsator = { .description = NULL_IF_CONFIG_SMALL("Audio pulsator."), .priv_size = sizeof(AudioPulsatorContext), .priv_class = &apulsator_class, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index 8e0eaee17b..6e1be5b7eb 100644 --- a/libavfilter/af_aresample.c +++ b/libavfilter/af_aresample.c @@ -332,9 +332,9 @@ const AVFilter ff_af_aresample = { .description = NULL_IF_CONFIG_SMALL("Resample audio data."), .preinit = preinit, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(AResampleContext), .priv_class = &aresample_class, FILTER_INPUTS(aresample_inputs), FILTER_OUTPUTS(aresample_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_arnndn.c b/libavfilter/af_arnndn.c index 8225b1657e..3115c4ae0c 100644 --- a/libavfilter/af_arnndn.c +++ b/libavfilter/af_arnndn.c @@ -1608,7 +1608,6 @@ AVFILTER_DEFINE_CLASS(arnndn); const AVFilter ff_af_arnndn = { .name = "arnndn", .description = NULL_IF_CONFIG_SMALL("Reduce noise from speech using Recurrent Neural Networks."), - .query_formats = query_formats, .priv_size = sizeof(AudioRNNContext), .priv_class = &arnndn_class, .activate = activate, @@ -1616,6 +1615,7 @@ const AVFilter ff_af_arnndn = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, diff --git a/libavfilter/af_asetrate.c b/libavfilter/af_asetrate.c index 920baedad2..637fa4fbb8 100644 --- a/libavfilter/af_asetrate.c +++ b/libavfilter/af_asetrate.c @@ -108,9 +108,9 @@ const AVFilter ff_af_asetrate = { .name = "asetrate", .description = NULL_IF_CONFIG_SMALL("Change the sample rate without " "altering the data."), - .query_formats = query_formats, .priv_size = sizeof(ASetRateContext), FILTER_INPUTS(asetrate_inputs), FILTER_OUTPUTS(asetrate_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &asetrate_class, }; diff --git a/libavfilter/af_asoftclip.c b/libavfilter/af_asoftclip.c index 9b3d58747a..50646738a4 100644 --- a/libavfilter/af_asoftclip.c +++ b/libavfilter/af_asoftclip.c @@ -500,11 +500,11 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_asoftclip = { .name = "asoftclip", .description = NULL_IF_CONFIG_SMALL("Audio Soft Clipper."), - .query_formats = query_formats, .priv_size = sizeof(ASoftClipContext), .priv_class = &asoftclip_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .uninit = uninit, .process_command = ff_filter_process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | diff --git a/libavfilter/af_asr.c b/libavfilter/af_asr.c index c7dc3b2db6..b9c7068526 100644 --- a/libavfilter/af_asr.c +++ b/libavfilter/af_asr.c @@ -172,7 +172,7 @@ const AVFilter ff_af_asr = { .priv_class = &asr_class, .init = asr_init, .uninit = asr_uninit, - .query_formats = query_formats, FILTER_INPUTS(asr_inputs), FILTER_OUTPUTS(asr_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c index 899746864d..d43dd086f1 100644 --- a/libavfilter/af_astats.c +++ b/libavfilter/af_astats.c @@ -863,11 +863,11 @@ static const AVFilterPad astats_outputs[] = { const AVFilter ff_af_astats = { .name = "astats", .description = NULL_IF_CONFIG_SMALL("Show time domain statistics about audio frames."), - .query_formats = query_formats, .priv_size = sizeof(AudioStatsContext), .priv_class = &astats_class, .uninit = uninit, FILTER_INPUTS(astats_inputs), FILTER_OUTPUTS(astats_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/af_asubboost.c b/libavfilter/af_asubboost.c index 7543601b8a..9e97cbf375 100644 --- a/libavfilter/af_asubboost.c +++ b/libavfilter/af_asubboost.c @@ -233,12 +233,12 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_asubboost = { .name = "asubboost", .description = NULL_IF_CONFIG_SMALL("Boost subwoofer frequencies."), - .query_formats = query_formats, .priv_size = sizeof(ASubBoostContext), .priv_class = &asubboost_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/af_asupercut.c b/libavfilter/af_asupercut.c index 29f24c7055..0efcbf8d37 100644 --- a/libavfilter/af_asupercut.c +++ b/libavfilter/af_asupercut.c @@ -357,12 +357,12 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_asupercut = { .name = "asupercut", .description = NULL_IF_CONFIG_SMALL("Cut super frequencies."), - .query_formats = query_formats, .priv_size = sizeof(ASuperCutContext), .priv_class = &asupercut_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, @@ -380,12 +380,12 @@ AVFILTER_DEFINE_CLASS(asubcut); const AVFilter ff_af_asubcut = { .name = "asubcut", .description = NULL_IF_CONFIG_SMALL("Cut subwoofer frequencies."), - .query_formats = query_formats, .priv_size = sizeof(ASuperCutContext), .priv_class = &asubcut_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, @@ -406,11 +406,11 @@ const AVFilter ff_af_asuperpass = { .name = "asuperpass", .description = NULL_IF_CONFIG_SMALL("Apply high order Butterworth band-pass filter."), .priv_class = &asuperpass_asuperstop_class, - .query_formats = query_formats, .priv_size = sizeof(ASuperCutContext), .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, @@ -420,11 +420,11 @@ const AVFilter ff_af_asuperstop = { .name = "asuperstop", .description = NULL_IF_CONFIG_SMALL("Apply high order Butterworth band-stop filter."), .priv_class = &asuperpass_asuperstop_class, - .query_formats = query_formats, .priv_size = sizeof(ASuperCutContext), .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index 16fa59701a..6376cdc03e 100644 --- a/libavfilter/af_atempo.c +++ b/libavfilter/af_atempo.c @@ -1188,10 +1188,10 @@ const AVFilter ff_af_atempo = { .description = NULL_IF_CONFIG_SMALL("Adjust audio tempo."), .init = init, .uninit = uninit, - .query_formats = query_formats, .process_command = process_command, .priv_size = sizeof(ATempoContext), .priv_class = &atempo_class, FILTER_INPUTS(atempo_inputs), FILTER_OUTPUTS(atempo_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_atilt.c b/libavfilter/af_atilt.c index 833e0c571b..e242ad2bd5 100644 --- a/libavfilter/af_atilt.c +++ b/libavfilter/af_atilt.c @@ -275,12 +275,12 @@ static const AVFilterPad outputs[] = { AVFilter ff_af_atilt = { .name = "atilt", .description = NULL_IF_CONFIG_SMALL("Apply spectral tilt to audio."), - .query_formats = query_formats, .priv_size = sizeof(ATiltContext), .priv_class = &atilt_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/af_axcorrelate.c b/libavfilter/af_axcorrelate.c index 18fc3004b1..1d9c805b29 100644 --- a/libavfilter/af_axcorrelate.c +++ b/libavfilter/af_axcorrelate.c @@ -354,9 +354,9 @@ const AVFilter ff_af_axcorrelate = { .description = NULL_IF_CONFIG_SMALL("Cross-correlate two audio streams."), .priv_size = sizeof(AudioXCorrelateContext), .priv_class = &axcorrelate_class, - .query_formats = query_formats, .activate = activate, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c index 828af05b20..adbae5892d 100644 --- a/libavfilter/af_biquads.c +++ b/libavfilter/af_biquads.c @@ -868,9 +868,9 @@ const AVFilter ff_af_##name_ = { \ .priv_size = sizeof(BiquadsContext), \ .init = name_##_init, \ .uninit = uninit, \ - .query_formats = query_formats, \ FILTER_INPUTS(inputs), \ FILTER_OUTPUTS(outputs), \ + FILTER_QUERY_FUNC(query_formats), \ .process_command = process_command, \ .flags = AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, \ } diff --git a/libavfilter/af_bs2b.c b/libavfilter/af_bs2b.c index 55b4d2ac6f..90ae846d95 100644 --- a/libavfilter/af_bs2b.c +++ b/libavfilter/af_bs2b.c @@ -205,11 +205,11 @@ static const AVFilterPad bs2b_outputs[] = { const AVFilter ff_af_bs2b = { .name = "bs2b", .description = NULL_IF_CONFIG_SMALL("Bauer stereo-to-binaural filter."), - .query_formats = query_formats, .priv_size = sizeof(Bs2bContext), .priv_class = &bs2b_class, .init = init, .uninit = uninit, FILTER_INPUTS(bs2b_inputs), FILTER_OUTPUTS(bs2b_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index f5a57539fe..d3ab77920f 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -400,9 +400,9 @@ const AVFilter ff_af_channelmap = { .name = "channelmap", .description = NULL_IF_CONFIG_SMALL("Remap audio channels."), .init = channelmap_init, - .query_formats = channelmap_query_formats, .priv_size = sizeof(ChannelMapContext), .priv_class = &channelmap_class, FILTER_INPUTS(avfilter_af_channelmap_inputs), FILTER_OUTPUTS(avfilter_af_channelmap_outputs), + FILTER_QUERY_FUNC(channelmap_query_formats), }; diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c index 2bb34881a6..1a2519dd32 100644 --- a/libavfilter/af_channelsplit.c +++ b/libavfilter/af_channelsplit.c @@ -172,8 +172,8 @@ const AVFilter ff_af_channelsplit = { .priv_size = sizeof(ChannelSplitContext), .priv_class = &channelsplit_class, .init = init, - .query_formats = query_formats, FILTER_INPUTS(avfilter_af_channelsplit_inputs), .outputs = NULL, + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, }; diff --git a/libavfilter/af_chorus.c b/libavfilter/af_chorus.c index 9c9090e4cc..cb6de9a85f 100644 --- a/libavfilter/af_chorus.c +++ b/libavfilter/af_chorus.c @@ -357,11 +357,11 @@ static const AVFilterPad chorus_outputs[] = { const AVFilter ff_af_chorus = { .name = "chorus", .description = NULL_IF_CONFIG_SMALL("Add a chorus effect to the audio."), - .query_formats = query_formats, .priv_size = sizeof(ChorusContext), .priv_class = &chorus_class, .init = init, .uninit = uninit, FILTER_INPUTS(chorus_inputs), FILTER_OUTPUTS(chorus_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c index 0172b5f876..6eb68dfa19 100644 --- a/libavfilter/af_compand.c +++ b/libavfilter/af_compand.c @@ -574,11 +574,11 @@ const AVFilter ff_af_compand = { .name = "compand", .description = NULL_IF_CONFIG_SMALL( "Compress or expand audio dynamic range."), - .query_formats = query_formats, .priv_size = sizeof(CompandContext), .priv_class = &compand_class, .init = init, .uninit = uninit, FILTER_INPUTS(compand_inputs), FILTER_OUTPUTS(compand_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_compensationdelay.c b/libavfilter/af_compensationdelay.c index 1620750760..ff6f640370 100644 --- a/libavfilter/af_compensationdelay.c +++ b/libavfilter/af_compensationdelay.c @@ -174,10 +174,10 @@ static const AVFilterPad compensationdelay_outputs[] = { const AVFilter ff_af_compensationdelay = { .name = "compensationdelay", .description = NULL_IF_CONFIG_SMALL("Audio Compensation Delay Line."), - .query_formats = query_formats, .priv_size = sizeof(CompensationDelayContext), .priv_class = &compensationdelay_class, .uninit = uninit, FILTER_INPUTS(compensationdelay_inputs), FILTER_OUTPUTS(compensationdelay_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_crossfeed.c b/libavfilter/af_crossfeed.c index bbab8f423c..ecfbb978d4 100644 --- a/libavfilter/af_crossfeed.c +++ b/libavfilter/af_crossfeed.c @@ -176,11 +176,11 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_crossfeed = { .name = "crossfeed", .description = NULL_IF_CONFIG_SMALL("Apply headphone crossfeed filter."), - .query_formats = query_formats, .priv_size = sizeof(CrossfeedContext), .priv_class = &crossfeed_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .process_command = process_command, }; diff --git a/libavfilter/af_crystalizer.c b/libavfilter/af_crystalizer.c index b20d360bee..9e1a4ef9d2 100644 --- a/libavfilter/af_crystalizer.c +++ b/libavfilter/af_crystalizer.c @@ -379,12 +379,12 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_crystalizer = { .name = "crystalizer", .description = NULL_IF_CONFIG_SMALL("Simple audio noise sharpening filter."), - .query_formats = query_formats, .priv_size = sizeof(CrystalizerContext), .priv_class = &crystalizer_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/af_dcshift.c b/libavfilter/af_dcshift.c index d2751df441..80f2600e7a 100644 --- a/libavfilter/af_dcshift.c +++ b/libavfilter/af_dcshift.c @@ -148,11 +148,11 @@ static const AVFilterPad dcshift_outputs[] = { const AVFilter ff_af_dcshift = { .name = "dcshift", .description = NULL_IF_CONFIG_SMALL("Apply a DC shift to the audio."), - .query_formats = query_formats, .priv_size = sizeof(DCShiftContext), .priv_class = &dcshift_class, .init = init, FILTER_INPUTS(dcshift_inputs), FILTER_OUTPUTS(dcshift_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/af_deesser.c b/libavfilter/af_deesser.c index defea49e41..a5cc0e63ed 100644 --- a/libavfilter/af_deesser.c +++ b/libavfilter/af_deesser.c @@ -220,11 +220,11 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_deesser = { .name = "deesser", .description = NULL_IF_CONFIG_SMALL("Apply de-essing to the audio."), - .query_formats = query_formats, .priv_size = sizeof(DeesserContext), .priv_class = &deesser_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/af_drmeter.c b/libavfilter/af_drmeter.c index 338fce3fc9..010c675271 100644 --- a/libavfilter/af_drmeter.c +++ b/libavfilter/af_drmeter.c @@ -214,10 +214,10 @@ static const AVFilterPad drmeter_outputs[] = { const AVFilter ff_af_drmeter = { .name = "drmeter", .description = NULL_IF_CONFIG_SMALL("Measure audio dynamic range."), - .query_formats = query_formats, .priv_size = sizeof(DRMeterContext), .priv_class = &drmeter_class, .uninit = uninit, FILTER_INPUTS(drmeter_inputs), FILTER_OUTPUTS(drmeter_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_dynaudnorm.c b/libavfilter/af_dynaudnorm.c index b78b3df85e..73dd9fb04b 100644 --- a/libavfilter/af_dynaudnorm.c +++ b/libavfilter/af_dynaudnorm.c @@ -859,13 +859,13 @@ static const AVFilterPad avfilter_af_dynaudnorm_outputs[] = { const AVFilter ff_af_dynaudnorm = { .name = "dynaudnorm", .description = NULL_IF_CONFIG_SMALL("Dynamic Audio Normalizer."), - .query_formats = query_formats, .priv_size = sizeof(DynamicAudioNormalizerContext), .init = init, .uninit = uninit, .activate = activate, FILTER_INPUTS(avfilter_af_dynaudnorm_inputs), FILTER_OUTPUTS(avfilter_af_dynaudnorm_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &dynaudnorm_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .process_command = process_command, diff --git a/libavfilter/af_earwax.c b/libavfilter/af_earwax.c index 2d219181d4..fa0162abb2 100644 --- a/libavfilter/af_earwax.c +++ b/libavfilter/af_earwax.c @@ -232,9 +232,9 @@ static const AVFilterPad earwax_outputs[] = { const AVFilter ff_af_earwax = { .name = "earwax", .description = NULL_IF_CONFIG_SMALL("Widen the stereo image."), - .query_formats = query_formats, .priv_size = sizeof(EarwaxContext), .uninit = uninit, FILTER_INPUTS(earwax_inputs), FILTER_OUTPUTS(earwax_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_extrastereo.c b/libavfilter/af_extrastereo.c index 0fcf840a4a..1645ccb944 100644 --- a/libavfilter/af_extrastereo.c +++ b/libavfilter/af_extrastereo.c @@ -120,11 +120,11 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_extrastereo = { .name = "extrastereo", .description = NULL_IF_CONFIG_SMALL("Increase difference between stereo audio channels."), - .query_formats = query_formats, .priv_size = sizeof(ExtraStereoContext), .priv_class = &extrastereo_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/af_firequalizer.c b/libavfilter/af_firequalizer.c index e147118d08..83dc3ce7ed 100644 --- a/libavfilter/af_firequalizer.c +++ b/libavfilter/af_firequalizer.c @@ -958,10 +958,10 @@ const AVFilter ff_af_firequalizer = { .name = "firequalizer", .description = NULL_IF_CONFIG_SMALL("Finite Impulse Response Equalizer."), .uninit = uninit, - .query_formats = query_formats, .process_command = process_command, .priv_size = sizeof(FIREqualizerContext), FILTER_INPUTS(firequalizer_inputs), FILTER_OUTPUTS(firequalizer_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &firequalizer_class, }; diff --git a/libavfilter/af_flanger.c b/libavfilter/af_flanger.c index b0d765365c..ecf7f9365b 100644 --- a/libavfilter/af_flanger.c +++ b/libavfilter/af_flanger.c @@ -221,11 +221,11 @@ static const AVFilterPad flanger_outputs[] = { const AVFilter ff_af_flanger = { .name = "flanger", .description = NULL_IF_CONFIG_SMALL("Apply a flanging effect to the audio."), - .query_formats = query_formats, .priv_size = sizeof(FlangerContext), .priv_class = &flanger_class, .init = init, .uninit = uninit, FILTER_INPUTS(flanger_inputs), FILTER_OUTPUTS(flanger_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_haas.c b/libavfilter/af_haas.c index e162e4b7f0..281ec276f9 100644 --- a/libavfilter/af_haas.c +++ b/libavfilter/af_haas.c @@ -216,10 +216,10 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_haas = { .name = "haas", .description = NULL_IF_CONFIG_SMALL("Apply Haas Stereo Enhancer."), - .query_formats = query_formats, .priv_size = sizeof(HaasContext), .priv_class = &haas_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c index 94a9c701a5..494642106d 100644 --- a/libavfilter/af_hdcd.c +++ b/libavfilter/af_hdcd.c @@ -1777,7 +1777,7 @@ const AVFilter ff_af_hdcd = { .priv_class = &hdcd_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_af_hdcd_inputs), FILTER_OUTPUTS(avfilter_af_hdcd_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_headphone.c b/libavfilter/af_headphone.c index 0cb188b61d..b2030dbbbb 100644 --- a/libavfilter/af_headphone.c +++ b/libavfilter/af_headphone.c @@ -763,9 +763,9 @@ const AVFilter ff_af_headphone = { .priv_class = &headphone_class, .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_DYNAMIC_INPUTS, }; diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index 2fe1fc9429..6cc21f465c 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -541,8 +541,8 @@ const AVFilter ff_af_join = { .init = join_init, .uninit = join_uninit, .activate = activate, - .query_formats = join_query_formats, .inputs = NULL, FILTER_OUTPUTS(avfilter_af_join_outputs), + FILTER_QUERY_FUNC(join_query_formats), .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, }; diff --git a/libavfilter/af_ladspa.c b/libavfilter/af_ladspa.c index 73cbd288c0..ff16388a56 100644 --- a/libavfilter/af_ladspa.c +++ b/libavfilter/af_ladspa.c @@ -778,9 +778,9 @@ const AVFilter ff_af_ladspa = { .priv_class = &ladspa_class, .init = init, .uninit = uninit, - .query_formats = query_formats, .process_command = process_command, .inputs = 0, FILTER_OUTPUTS(ladspa_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, }; diff --git a/libavfilter/af_loudnorm.c b/libavfilter/af_loudnorm.c index 7807ed927a..dbe7fba986 100644 --- a/libavfilter/af_loudnorm.c +++ b/libavfilter/af_loudnorm.c @@ -911,9 +911,9 @@ const AVFilter ff_af_loudnorm = { .description = NULL_IF_CONFIG_SMALL("EBU R128 loudness normalization"), .priv_size = sizeof(LoudNormContext), .priv_class = &loudnorm_class, - .query_formats = query_formats, .init = init, .uninit = uninit, FILTER_INPUTS(avfilter_af_loudnorm_inputs), FILTER_OUTPUTS(avfilter_af_loudnorm_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_lv2.c b/libavfilter/af_lv2.c index 75c7494cc8..0f0c797989 100644 --- a/libavfilter/af_lv2.c +++ b/libavfilter/af_lv2.c @@ -578,8 +578,8 @@ const AVFilter ff_af_lv2 = { .priv_class = &lv2_class, .init = init, .uninit = uninit, - .query_formats = query_formats, .inputs = 0, FILTER_OUTPUTS(lv2_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, }; diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c index 0ae84221b6..5b689caa49 100644 --- a/libavfilter/af_mcompand.c +++ b/libavfilter/af_mcompand.c @@ -654,10 +654,10 @@ const AVFilter ff_af_mcompand = { .name = "mcompand", .description = NULL_IF_CONFIG_SMALL( "Multiband Compress or expand audio dynamic range."), - .query_formats = query_formats, .priv_size = sizeof(MCompandContext), .priv_class = &mcompand_class, .uninit = uninit, FILTER_INPUTS(mcompand_inputs), FILTER_OUTPUTS(mcompand_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index d17e45438d..a8a18960c4 100644 --- a/libavfilter/af_pan.c +++ b/libavfilter/af_pan.c @@ -451,7 +451,7 @@ const AVFilter ff_af_pan = { .priv_class = &pan_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(pan_inputs), FILTER_OUTPUTS(pan_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_replaygain.c b/libavfilter/af_replaygain.c index 7db7fe4178..4bf2763bcf 100644 --- a/libavfilter/af_replaygain.c +++ b/libavfilter/af_replaygain.c @@ -604,9 +604,9 @@ static const AVFilterPad replaygain_outputs[] = { const AVFilter ff_af_replaygain = { .name = "replaygain", .description = NULL_IF_CONFIG_SMALL("ReplayGain scanner."), - .query_formats = query_formats, .uninit = uninit, .priv_size = sizeof(ReplayGainContext), FILTER_INPUTS(replaygain_inputs), FILTER_OUTPUTS(replaygain_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_rubberband.c b/libavfilter/af_rubberband.c index 6a4b71d09d..77f6c820be 100644 --- a/libavfilter/af_rubberband.c +++ b/libavfilter/af_rubberband.c @@ -222,12 +222,12 @@ static const AVFilterPad rubberband_outputs[] = { const AVFilter ff_af_rubberband = { .name = "rubberband", .description = NULL_IF_CONFIG_SMALL("Apply time-stretching and pitch-shifting."), - .query_formats = query_formats, .priv_size = sizeof(RubberBandContext), .priv_class = &rubberband_class, .uninit = uninit, .activate = activate, FILTER_INPUTS(rubberband_inputs), FILTER_OUTPUTS(rubberband_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, }; diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index 22a86ae2a7..7359ba8e7e 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -366,11 +366,11 @@ const AVFilter ff_af_sidechaincompress = { .description = NULL_IF_CONFIG_SMALL("Sidechain compressor."), .priv_class = &sidechaincompress_acompressor_class, .priv_size = sizeof(SidechainCompressContext), - .query_formats = query_formats, .activate = activate, .uninit = uninit, FILTER_INPUTS(sidechaincompress_inputs), FILTER_OUTPUTS(sidechaincompress_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, }; #endif /* CONFIG_SIDECHAINCOMPRESS_FILTER */ @@ -444,9 +444,9 @@ const AVFilter ff_af_acompressor = { .description = NULL_IF_CONFIG_SMALL("Audio compressor."), .priv_class = &sidechaincompress_acompressor_class, .priv_size = sizeof(SidechainCompressContext), - .query_formats = acompressor_query_formats, FILTER_INPUTS(acompressor_inputs), FILTER_OUTPUTS(acompressor_outputs), + FILTER_QUERY_FUNC(acompressor_query_formats), .process_command = process_command, }; #endif /* CONFIG_ACOMPRESSOR_FILTER */ diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c index eb38d2811c..482270d3f7 100644 --- a/libavfilter/af_silencedetect.c +++ b/libavfilter/af_silencedetect.c @@ -284,9 +284,9 @@ const AVFilter ff_af_silencedetect = { .name = "silencedetect", .description = NULL_IF_CONFIG_SMALL("Detect silence."), .priv_size = sizeof(SilenceDetectContext), - .query_formats = query_formats, .uninit = uninit, FILTER_INPUTS(silencedetect_inputs), FILTER_OUTPUTS(silencedetect_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &silencedetect_class, }; diff --git a/libavfilter/af_silenceremove.c b/libavfilter/af_silenceremove.c index 42cdb4efad..1b420d7838 100644 --- a/libavfilter/af_silenceremove.c +++ b/libavfilter/af_silenceremove.c @@ -979,7 +979,7 @@ const AVFilter ff_af_silenceremove = { .priv_class = &silenceremove_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(silenceremove_inputs), FILTER_OUTPUTS(silenceremove_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_sofalizer.c b/libavfilter/af_sofalizer.c index 52832e0ee2..20b717bdf8 100644 --- a/libavfilter/af_sofalizer.c +++ b/libavfilter/af_sofalizer.c @@ -1112,8 +1112,8 @@ const AVFilter ff_af_sofalizer = { .init = init, .activate = activate, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/af_speechnorm.c b/libavfilter/af_speechnorm.c index f56ca8e558..bc83a347e9 100644 --- a/libavfilter/af_speechnorm.c +++ b/libavfilter/af_speechnorm.c @@ -562,13 +562,13 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_speechnorm = { .name = "speechnorm", .description = NULL_IF_CONFIG_SMALL("Speech Normalizer."), - .query_formats = query_formats, .priv_size = sizeof(SpeechNormalizerContext), .priv_class = &speechnorm_class, .activate = activate, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .process_command = process_command, }; diff --git a/libavfilter/af_stereotools.c b/libavfilter/af_stereotools.c index d4aca66a92..27ec4a2e4a 100644 --- a/libavfilter/af_stereotools.c +++ b/libavfilter/af_stereotools.c @@ -375,12 +375,12 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_stereotools = { .name = "stereotools", .description = NULL_IF_CONFIG_SMALL("Apply various stereo tools."), - .query_formats = query_formats, .priv_size = sizeof(StereoToolsContext), .priv_class = &stereotools_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/af_stereowiden.c b/libavfilter/af_stereowiden.c index ce194ec5b4..7cce1a8f28 100644 --- a/libavfilter/af_stereowiden.c +++ b/libavfilter/af_stereowiden.c @@ -156,12 +156,12 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_stereowiden = { .name = "stereowiden", .description = NULL_IF_CONFIG_SMALL("Apply stereo widening effect."), - .query_formats = query_formats, .priv_size = sizeof(StereoWidenContext), .priv_class = &stereowiden_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/af_superequalizer.c b/libavfilter/af_superequalizer.c index 69e03e8820..bf55f3ab94 100644 --- a/libavfilter/af_superequalizer.c +++ b/libavfilter/af_superequalizer.c @@ -368,10 +368,10 @@ const AVFilter ff_af_superequalizer = { .description = NULL_IF_CONFIG_SMALL("Apply 18 band equalization filter."), .priv_size = sizeof(SuperEqualizerContext), .priv_class = &superequalizer_class, - .query_formats = query_formats, .init = init, .activate = activate, .uninit = uninit, FILTER_INPUTS(superequalizer_inputs), FILTER_OUTPUTS(superequalizer_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_surround.c b/libavfilter/af_surround.c index 33190de248..e3601b9df0 100644 --- a/libavfilter/af_surround.c +++ b/libavfilter/af_surround.c @@ -1783,7 +1783,6 @@ static const AVFilterPad outputs[] = { const AVFilter ff_af_surround = { .name = "surround", .description = NULL_IF_CONFIG_SMALL("Apply audio surround upmix filter."), - .query_formats = query_formats, .priv_size = sizeof(AudioSurroundContext), .priv_class = &surround_class, .init = init, @@ -1791,5 +1790,6 @@ const AVFilter ff_af_surround = { .activate = activate, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/af_tremolo.c b/libavfilter/af_tremolo.c index 1ab7832d47..df101cd032 100644 --- a/libavfilter/af_tremolo.c +++ b/libavfilter/af_tremolo.c @@ -151,7 +151,7 @@ const AVFilter ff_af_tremolo = { .priv_size = sizeof(TremoloContext), .priv_class = &tremolo_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_af_tremolo_inputs), FILTER_OUTPUTS(avfilter_af_tremolo_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_vibrato.c b/libavfilter/af_vibrato.c index ec6f6558b0..46b6b766bf 100644 --- a/libavfilter/af_vibrato.c +++ b/libavfilter/af_vibrato.c @@ -189,7 +189,7 @@ const AVFilter ff_af_vibrato = { .priv_size = sizeof(VibratoContext), .priv_class = &vibrato_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_af_vibrato_inputs), FILTER_OUTPUTS(avfilter_af_vibrato_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c index 2d4012bfbf..76ccddc316 100644 --- a/libavfilter/af_volume.c +++ b/libavfilter/af_volume.c @@ -465,13 +465,13 @@ static const AVFilterPad avfilter_af_volume_outputs[] = { const AVFilter ff_af_volume = { .name = "volume", .description = NULL_IF_CONFIG_SMALL("Change input volume."), - .query_formats = query_formats, .priv_size = sizeof(VolumeContext), .priv_class = &volume_class, .init = init, .uninit = uninit, FILTER_INPUTS(avfilter_af_volume_inputs), FILTER_OUTPUTS(avfilter_af_volume_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = process_command, }; diff --git a/libavfilter/af_volumedetect.c b/libavfilter/af_volumedetect.c index 412b690302..ba49b3ca37 100644 --- a/libavfilter/af_volumedetect.c +++ b/libavfilter/af_volumedetect.c @@ -147,8 +147,8 @@ const AVFilter ff_af_volumedetect = { .name = "volumedetect", .description = NULL_IF_CONFIG_SMALL("Detect audio volume."), .priv_size = sizeof(VolDetectContext), - .query_formats = query_formats, .uninit = uninit, FILTER_INPUTS(volumedetect_inputs), FILTER_OUTPUTS(volumedetect_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/asrc_afirsrc.c b/libavfilter/asrc_afirsrc.c index cea9b2fe8a..79e7842cea 100644 --- a/libavfilter/asrc_afirsrc.c +++ b/libavfilter/asrc_afirsrc.c @@ -311,12 +311,12 @@ static const AVFilterPad afirsrc_outputs[] = { const AVFilter ff_asrc_afirsrc = { .name = "afirsrc", .description = NULL_IF_CONFIG_SMALL("Generate a FIR coefficients audio stream."), - .query_formats = query_formats, .init = init, .uninit = uninit, .activate = activate, .priv_size = sizeof(AudioFIRSourceContext), .inputs = NULL, FILTER_OUTPUTS(afirsrc_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &afirsrc_class, }; diff --git a/libavfilter/asrc_anoisesrc.c b/libavfilter/asrc_anoisesrc.c index ca86658040..8c834492fe 100644 --- a/libavfilter/asrc_anoisesrc.c +++ b/libavfilter/asrc_anoisesrc.c @@ -235,10 +235,10 @@ static const AVFilterPad anoisesrc_outputs[] = { const AVFilter ff_asrc_anoisesrc = { .name = "anoisesrc", .description = NULL_IF_CONFIG_SMALL("Generate a noise audio signal."), - .query_formats = query_formats, .priv_size = sizeof(ANoiseSrcContext), .inputs = NULL, .activate = activate, FILTER_OUTPUTS(anoisesrc_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &anoisesrc_class, }; diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c index 698102deda..7ee2fa5a5d 100644 --- a/libavfilter/asrc_anullsrc.c +++ b/libavfilter/asrc_anullsrc.c @@ -140,10 +140,10 @@ const AVFilter ff_asrc_anullsrc = { .name = "anullsrc", .description = NULL_IF_CONFIG_SMALL("Null audio source, return empty audio frames."), .init = init, - .query_formats = query_formats, .priv_size = sizeof(ANullContext), .inputs = NULL, FILTER_OUTPUTS(avfilter_asrc_anullsrc_outputs), + FILTER_QUERY_FUNC(query_formats), .activate = activate, .priv_class = &anullsrc_class, }; diff --git a/libavfilter/asrc_flite.c b/libavfilter/asrc_flite.c index 61c177e0ba..c861f5c238 100644 --- a/libavfilter/asrc_flite.c +++ b/libavfilter/asrc_flite.c @@ -276,11 +276,11 @@ static const AVFilterPad flite_outputs[] = { const AVFilter ff_asrc_flite = { .name = "flite", .description = NULL_IF_CONFIG_SMALL("Synthesize voice from text using libflite."), - .query_formats = query_formats, .init = init, .uninit = uninit, .priv_size = sizeof(FliteContext), .inputs = NULL, FILTER_OUTPUTS(flite_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &flite_class, }; diff --git a/libavfilter/asrc_hilbert.c b/libavfilter/asrc_hilbert.c index 8ff9934967..56abe4611c 100644 --- a/libavfilter/asrc_hilbert.c +++ b/libavfilter/asrc_hilbert.c @@ -181,12 +181,12 @@ static const AVFilterPad hilbert_outputs[] = { const AVFilter ff_asrc_hilbert = { .name = "hilbert", .description = NULL_IF_CONFIG_SMALL("Generate a Hilbert transform FIR coefficients."), - .query_formats = query_formats, .init = init, .uninit = uninit, .activate = activate, .priv_size = sizeof(HilbertContext), .inputs = NULL, FILTER_OUTPUTS(hilbert_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &hilbert_class, }; diff --git a/libavfilter/asrc_sinc.c b/libavfilter/asrc_sinc.c index e2d3ea62ff..aaa81291a8 100644 --- a/libavfilter/asrc_sinc.c +++ b/libavfilter/asrc_sinc.c @@ -441,9 +441,9 @@ const AVFilter ff_asrc_sinc = { .description = NULL_IF_CONFIG_SMALL("Generate a sinc kaiser-windowed low-pass, high-pass, band-pass, or band-reject FIR coefficients."), .priv_size = sizeof(SincContext), .priv_class = &sinc_class, - .query_formats = query_formats, .uninit = uninit, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(sinc_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/asrc_sine.c b/libavfilter/asrc_sine.c index ef4e346e7b..c8995ae2c9 100644 --- a/libavfilter/asrc_sine.c +++ b/libavfilter/asrc_sine.c @@ -263,12 +263,12 @@ static const AVFilterPad sine_outputs[] = { const AVFilter ff_asrc_sine = { .name = "sine", .description = NULL_IF_CONFIG_SMALL("Generate sine wave audio signal."), - .query_formats = query_formats, .init = init, .uninit = uninit, .activate = activate, .priv_size = sizeof(SineContext), .inputs = NULL, FILTER_OUTPUTS(sine_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &sine_class, }; diff --git a/libavfilter/avf_abitscope.c b/libavfilter/avf_abitscope.c index c394091b7b..f74a6eacb0 100644 --- a/libavfilter/avf_abitscope.c +++ b/libavfilter/avf_abitscope.c @@ -261,10 +261,10 @@ static const AVFilterPad outputs[] = { const AVFilter ff_avf_abitscope = { .name = "abitscope", .description = NULL_IF_CONFIG_SMALL("Convert input audio to audio bit scope video output."), - .query_formats = query_formats, .priv_size = sizeof(AudioBitScopeContext), FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .activate = activate, .priv_class = &abitscope_class, }; diff --git a/libavfilter/avf_ahistogram.c b/libavfilter/avf_ahistogram.c index 96baf6da83..258b062873 100644 --- a/libavfilter/avf_ahistogram.c +++ b/libavfilter/avf_ahistogram.c @@ -426,10 +426,10 @@ const AVFilter ff_avf_ahistogram = { .name = "ahistogram", .description = NULL_IF_CONFIG_SMALL("Convert input audio to histogram video output."), .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(AudioHistogramContext), .activate = activate, FILTER_INPUTS(ahistogram_inputs), FILTER_OUTPUTS(ahistogram_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &ahistogram_class, }; diff --git a/libavfilter/avf_aphasemeter.c b/libavfilter/avf_aphasemeter.c index 13035328e9..d9302cf867 100644 --- a/libavfilter/avf_aphasemeter.c +++ b/libavfilter/avf_aphasemeter.c @@ -387,10 +387,10 @@ const AVFilter ff_avf_aphasemeter = { .description = NULL_IF_CONFIG_SMALL("Convert input audio to phase meter video output."), .init = init, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(AudioPhaseMeterContext), FILTER_INPUTS(inputs), .outputs = NULL, + FILTER_QUERY_FUNC(query_formats), .priv_class = &aphasemeter_class, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, }; diff --git a/libavfilter/avf_avectorscope.c b/libavfilter/avf_avectorscope.c index e927b241ff..ba392153f3 100644 --- a/libavfilter/avf_avectorscope.c +++ b/libavfilter/avf_avectorscope.c @@ -445,11 +445,11 @@ const AVFilter ff_avf_avectorscope = { .name = "avectorscope", .description = NULL_IF_CONFIG_SMALL("Convert input audio to vectorscope video output."), .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(AudioVectorScopeContext), .activate = activate, FILTER_INPUTS(audiovectorscope_inputs), FILTER_OUTPUTS(audiovectorscope_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &avectorscope_class, .flags = AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 2ae24e9b39..84c2a52094 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -449,12 +449,12 @@ const AVFilter ff_avf_concat = { .description = NULL_IF_CONFIG_SMALL("Concatenate audio and video streams."), .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .priv_size = sizeof(ConcatContext), .inputs = NULL, .outputs = NULL, .priv_class = &concat_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS, + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, }; diff --git a/libavfilter/avf_showcqt.c b/libavfilter/avf_showcqt.c index aab4aa28d6..6f63574a8f 100644 --- a/libavfilter/avf_showcqt.c +++ b/libavfilter/avf_showcqt.c @@ -1593,9 +1593,9 @@ const AVFilter ff_avf_showcqt = { .description = NULL_IF_CONFIG_SMALL("Convert input audio to a CQT (Constant/Clamped Q Transform) spectrum video output."), .init = init, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(ShowCQTContext), FILTER_INPUTS(showcqt_inputs), FILTER_OUTPUTS(showcqt_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &showcqt_class, }; diff --git a/libavfilter/avf_showfreqs.c b/libavfilter/avf_showfreqs.c index 7eff726139..52beb75a5b 100644 --- a/libavfilter/avf_showfreqs.c +++ b/libavfilter/avf_showfreqs.c @@ -567,10 +567,10 @@ const AVFilter ff_avf_showfreqs = { .description = NULL_IF_CONFIG_SMALL("Convert input audio to a frequencies video output."), .init = init, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(ShowFreqsContext), .activate = activate, FILTER_INPUTS(showfreqs_inputs), FILTER_OUTPUTS(showfreqs_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &showfreqs_class, }; diff --git a/libavfilter/avf_showspatial.c b/libavfilter/avf_showspatial.c index c5af903216..3069fcb4a3 100644 --- a/libavfilter/avf_showspatial.c +++ b/libavfilter/avf_showspatial.c @@ -360,10 +360,10 @@ const AVFilter ff_avf_showspatial = { .name = "showspatial", .description = NULL_IF_CONFIG_SMALL("Convert input audio to a spatial video output."), .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(ShowSpatialContext), FILTER_INPUTS(showspatial_inputs), FILTER_OUTPUTS(showspatial_outputs), + FILTER_QUERY_FUNC(query_formats), .activate = spatial_activate, .priv_class = &showspatial_class, .flags = AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index a33ef71689..2c0a3d1395 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -1646,10 +1646,10 @@ const AVFilter ff_avf_showspectrum = { .name = "showspectrum", .description = NULL_IF_CONFIG_SMALL("Convert input audio to a spectrum video output."), .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(ShowSpectrumContext), FILTER_INPUTS(showspectrum_inputs), FILTER_OUTPUTS(showspectrum_outputs), + FILTER_QUERY_FUNC(query_formats), .activate = activate, .priv_class = &showspectrum_class, .flags = AVFILTER_FLAG_SLICE_THREADS, @@ -1829,10 +1829,10 @@ const AVFilter ff_avf_showspectrumpic = { .name = "showspectrumpic", .description = NULL_IF_CONFIG_SMALL("Convert input audio to a spectrum video output single picture."), .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(ShowSpectrumContext), FILTER_INPUTS(showspectrumpic_inputs), FILTER_OUTPUTS(showspectrumpic_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &showspectrumpic_class, .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/avf_showvolume.c b/libavfilter/avf_showvolume.c index 2fd8298b85..401b65ca69 100644 --- a/libavfilter/avf_showvolume.c +++ b/libavfilter/avf_showvolume.c @@ -502,9 +502,9 @@ const AVFilter ff_avf_showvolume = { .init = init, .activate = activate, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(ShowVolumeContext), FILTER_INPUTS(showvolume_inputs), FILTER_OUTPUTS(showvolume_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &showvolume_class, }; diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c index 90180309dd..853f6bbdcb 100644 --- a/libavfilter/avf_showwaves.c +++ b/libavfilter/avf_showwaves.c @@ -778,11 +778,11 @@ const AVFilter ff_avf_showwaves = { .description = NULL_IF_CONFIG_SMALL("Convert input audio to a video output."), .init = init, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(ShowWavesContext), FILTER_INPUTS(showwaves_inputs), .activate = activate, FILTER_OUTPUTS(showwaves_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &showwaves_class, }; @@ -891,10 +891,10 @@ const AVFilter ff_avf_showwavespic = { .description = NULL_IF_CONFIG_SMALL("Convert input audio to a video output single picture."), .init = init, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(ShowWavesContext), FILTER_INPUTS(showwavespic_inputs), FILTER_OUTPUTS(showwavespic_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &showwavespic_class, }; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 69ecb0186d..566c1b87ce 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -203,12 +203,18 @@ typedef struct AVFilter { /** * The number of entries in the list of inputs. */ - uint16_t nb_inputs; + uint8_t nb_inputs; /** * The number of entries in the list of outputs. */ - uint16_t nb_outputs; + uint8_t nb_outputs; + + /** + * This field determines the state of the formats union. + * It is an enum FilterFormatsState value. + */ + uint8_t formats_state; /** * Filter pre-initialization function @@ -273,6 +279,11 @@ typedef struct AVFilter { */ void (*uninit)(AVFilterContext *ctx); + /** + * The state of the following union is determined by formats_state. + * See the documentation of enum FilterFormatsState in internal.h. + */ + union { /** * Query formats supported by the filter on its inputs and outputs. * @@ -288,14 +299,43 @@ typedef struct AVFilter { * @ref AVFilterLink.incfg.channel_layouts "in_channel_layouts" / * @ref AVFilterLink.outcfg.channel_layouts "out_channel_layouts" analogously. * - * This callback may be NULL for filters with one input, in which case - * libavfilter assumes that it supports all input formats and preserves - * them on output. + * This callback must never be NULL if the union is in this state. * * @return zero on success, a negative value corresponding to an * AVERROR code otherwise */ - int (*query_formats)(AVFilterContext *); + int (*query_func)(AVFilterContext *); + /** + * A pointer to an array of admissible pixel formats delimited + * by AV_PIX_FMT_NONE. The generic code will use this list + * to indicate that this filter supports each of these pixel formats, + * provided that all inputs and outputs use the same pixel format. + * + * This list must never be NULL if the union is in this state. + * The type of all inputs and outputs of filters using this must + * be AVMEDIA_TYPE_VIDEO. + */ + const enum AVPixelFormat *pixels_list; + /** + * Analogous to pixels, but delimited by AV_SAMPLE_FMT_NONE + * and restricted to filters that only have AVMEDIA_TYPE_AUDIO + * inputs and outputs. + * + * In addition to that the generic code will mark all inputs + * and all outputs as supporting all sample rates and every + * channel count and channel layout, as long as all inputs + * and outputs use the same sample rate and channel count/layout. + */ + const enum AVSampleFormat *samples_list; + /** + * Equivalent to { pix_fmt, AV_PIX_FMT_NONE } as pixels_list. + */ + enum AVPixelFormat pix_fmt; + /** + * Equivalent to { sample_fmt, AV_SAMPLE_FMT_NONE } as samples_list. + */ + enum AVSampleFormat sample_fmt; + } formats; int priv_size; ///< size of private data to allocate for the filter diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 45b028cd9c..7165bb722d 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -352,7 +352,7 @@ static int filter_query_formats(AVFilterContext *ctx) ctx->outputs && ctx->outputs[0] ? ctx->outputs[0]->type : AVMEDIA_TYPE_VIDEO; - if ((ret = ctx->filter->query_formats(ctx)) < 0) { + if ((ret = ctx->filter->formats.query_func(ctx)) < 0) { if (ret != AVERROR(EAGAIN)) av_log(ctx, AV_LOG_ERROR, "Query format failed for '%s': %s\n", ctx->name, av_err2str(ret)); @@ -421,7 +421,7 @@ static int query_formats(AVFilterGraph *graph, void *log_ctx) AVFilterContext *f = graph->filters[i]; if (formats_declared(f)) continue; - if (f->filter->query_formats) + if (f->filter->formats_state == FF_FILTER_FORMATS_QUERY_FUNC) ret = filter_query_formats(f); else ret = ff_default_query_formats(f); diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 8b46dcb15e..b8ddafec35 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -339,10 +339,10 @@ const AVFilter ff_vsink_buffer = { .priv_size = sizeof(BufferSinkContext), .priv_class = &buffersink_class, .init = common_init, - .query_formats = vsink_query_formats, .activate = activate, FILTER_INPUTS(avfilter_vsink_buffer_inputs), .outputs = NULL, + FILTER_QUERY_FUNC(vsink_query_formats), }; static const AVFilterPad avfilter_asink_abuffer_inputs[] = { @@ -358,8 +358,8 @@ const AVFilter ff_asink_abuffer = { .priv_class = &abuffersink_class, .priv_size = sizeof(BufferSinkContext), .init = common_init, - .query_formats = asink_query_formats, .activate = activate, FILTER_INPUTS(avfilter_asink_abuffer_inputs), .outputs = NULL, + FILTER_QUERY_FUNC(asink_query_formats), }; diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 632bfc7ad8..b0611872f1 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -440,13 +440,13 @@ const AVFilter ff_vsrc_buffer = { .name = "buffer", .description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them accessible to the filterchain."), .priv_size = sizeof(BufferSourceContext), - .query_formats = query_formats, .init = init_video, .uninit = uninit, .inputs = NULL, FILTER_OUTPUTS(avfilter_vsrc_buffer_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &buffer_class, }; @@ -463,12 +463,12 @@ const AVFilter ff_asrc_abuffer = { .name = "abuffer", .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them accessible to the filterchain."), .priv_size = sizeof(BufferSourceContext), - .query_formats = query_formats, .init = init_audio, .uninit = uninit, .inputs = NULL, FILTER_OUTPUTS(avfilter_asrc_abuffer_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &abuffer_class, }; diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c index 9996eb3b0e..b6fcb3b75e 100644 --- a/libavfilter/f_drawgraph.c +++ b/libavfilter/f_drawgraph.c @@ -474,11 +474,11 @@ const AVFilter ff_vf_drawgraph = { .description = NULL_IF_CONFIG_SMALL("Draw a graph using input video metadata."), .priv_size = sizeof(DrawGraphContext), .priv_class = &drawgraph_class, - .query_formats = query_formats, .init = init, .uninit = uninit, FILTER_INPUTS(drawgraph_inputs), FILTER_OUTPUTS(drawgraph_outputs), + FILTER_QUERY_FUNC(query_formats), }; #endif // CONFIG_DRAWGRAPH_FILTER @@ -507,10 +507,10 @@ const AVFilter ff_avf_adrawgraph = { .description = NULL_IF_CONFIG_SMALL("Draw a graph using input audio metadata."), .priv_class = &drawgraph_class, .priv_size = sizeof(DrawGraphContext), - .query_formats = query_formats, .init = init, .uninit = uninit, FILTER_INPUTS(adrawgraph_inputs), FILTER_OUTPUTS(adrawgraph_outputs), + FILTER_QUERY_FUNC(query_formats), }; #endif // CONFIG_ADRAWGRAPH_FILTER diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c index 2ce8a749cf..88d6a1fe46 100644 --- a/libavfilter/f_ebur128.c +++ b/libavfilter/f_ebur128.c @@ -1025,9 +1025,9 @@ const AVFilter ff_af_ebur128 = { .priv_size = sizeof(EBUR128Context), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(ebur128_inputs), .outputs = NULL, + FILTER_QUERY_FUNC(query_formats), .priv_class = &ebur128_class, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, }; diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c index de91a863c2..51d0a568e3 100644 --- a/libavfilter/f_graphmonitor.c +++ b/libavfilter/f_graphmonitor.c @@ -410,10 +410,10 @@ const AVFilter ff_vf_graphmonitor = { .description = NULL_IF_CONFIG_SMALL("Show various filtergraph stats."), .priv_size = sizeof(GraphMonitorContext), .priv_class = &graphmonitor_class, - .query_formats = query_formats, .activate = activate, FILTER_INPUTS(graphmonitor_inputs), FILTER_OUTPUTS(graphmonitor_outputs), + FILTER_QUERY_FUNC(query_formats), }; #endif // CONFIG_GRAPHMONITOR_FILTER @@ -440,9 +440,9 @@ const AVFilter ff_avf_agraphmonitor = { .description = NULL_IF_CONFIG_SMALL("Show various filtergraph stats."), .priv_class = &graphmonitor_class, .priv_size = sizeof(GraphMonitorContext), - .query_formats = query_formats, .activate = activate, FILTER_INPUTS(agraphmonitor_inputs), FILTER_OUTPUTS(agraphmonitor_outputs), + FILTER_QUERY_FUNC(query_formats), }; #endif // CONFIG_AGRAPHMONITOR_FILTER diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index 187e98a1a7..47e7d1fef8 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -529,10 +529,10 @@ const AVFilter ff_vf_select = { .description = NULL_IF_CONFIG_SMALL("Select video frames to pass in output."), .init = select_init, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(SelectContext), .priv_class = &select_class, FILTER_INPUTS(avfilter_vf_select_inputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, }; #endif /* CONFIG_SELECT_FILTER */ diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c index 80a133fec3..3708d2b256 100644 --- a/libavfilter/f_streamselect.c +++ b/libavfilter/f_streamselect.c @@ -318,7 +318,7 @@ const AVFilter ff_vf_streamselect = { .name = "streamselect", .description = NULL_IF_CONFIG_SMALL("Select video streams"), .init = init, - .query_formats = query_formats, + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .uninit = uninit, .activate = activate, @@ -332,7 +332,7 @@ const AVFilter ff_af_astreamselect = { .description = NULL_IF_CONFIG_SMALL("Select audio streams"), .priv_class = &streamselect_class, .init = init, - .query_formats = query_formats, + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .uninit = uninit, .activate = activate, diff --git a/libavfilter/formats.c b/libavfilter/formats.c index d5b8fa8e50..48927842c2 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -709,12 +709,40 @@ int ff_set_common_formats_from_list(AVFilterContext *ctx, const int *fmts) int ff_default_query_formats(AVFilterContext *ctx) { + const AVFilter *const f = ctx->filter; + AVFilterFormats *formats; + enum AVMediaType type; int ret; - enum AVMediaType type = ctx->nb_inputs ? ctx->inputs [0]->type : - ctx->nb_outputs ? ctx->outputs[0]->type : - AVMEDIA_TYPE_VIDEO; - ret = ff_set_common_formats(ctx, ff_all_formats(type)); + switch (f->formats_state) { + case FF_FILTER_FORMATS_PIXFMT_LIST: + type = AVMEDIA_TYPE_VIDEO; + formats = ff_make_format_list(f->formats.pixels_list); + break; + case FF_FILTER_FORMATS_SAMPLEFMTS_LIST: + type = AVMEDIA_TYPE_AUDIO; + formats = ff_make_format_list(f->formats.samples_list); + break; + case FF_FILTER_FORMATS_SINGLE_PIXFMT: + type = AVMEDIA_TYPE_VIDEO; + formats = ff_make_format_from_entry(f->formats.pix_fmt); + break; + case FF_FILTER_FORMATS_SINGLE_SAMPLEFMT: + type = AVMEDIA_TYPE_AUDIO; + formats = ff_make_format_from_entry(f->formats.sample_fmt); + break; + default: + av_assert2(!"Unreachable"); + /* Intended fallthrough */ + case FF_FILTER_FORMATS_PASSTHROUGH: + case FF_FILTER_FORMATS_QUERY_FUNC: + type = ctx->nb_inputs ? ctx->inputs [0]->type : + ctx->nb_outputs ? ctx->outputs[0]->type : AVMEDIA_TYPE_VIDEO; + formats = ff_all_formats(type); + break; + } + + ret = ff_set_common_formats(ctx, formats); if (ret < 0) return ret; if (type == AVMEDIA_TYPE_AUDIO) { diff --git a/libavfilter/internal.h b/libavfilter/internal.h index e7c154aff0..5ac9b04050 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -146,6 +146,45 @@ static av_always_inline int ff_filter_execute(AVFilterContext *ctx, avfilter_act return ctx->internal->execute(ctx, func, arg, ret, nb_jobs); } +enum FilterFormatsState { + /** + * The default value meaning that this filter supports all formats + * and (for audio) sample rates and channel layouts/counts as long + * as these properties agree for all inputs and outputs. + * This state is only allowed in case all inputs and outputs actually + * have the same type. + * The union is unused in this state. + * + * This value must always be zero (for default static initialization). + */ + FF_FILTER_FORMATS_PASSTHROUGH = 0, + FF_FILTER_FORMATS_QUERY_FUNC, ///< formats.query active. + FF_FILTER_FORMATS_PIXFMT_LIST, ///< formats.pixels_list active. + FF_FILTER_FORMATS_SAMPLEFMTS_LIST, ///< formats.samples_list active. + FF_FILTER_FORMATS_SINGLE_PIXFMT, ///< formats.pix_fmt active + FF_FILTER_FORMATS_SINGLE_SAMPLEFMT, ///< formats.sample_fmt active. +}; + +#define FILTER_QUERY_FUNC(func) \ + .formats.query_func = func, \ + .formats_state = FF_FILTER_FORMATS_QUERY_FUNC +#define FILTER_PIXFMTS_ARRAY(array) \ + .formats.pixels_list = array, \ + .formats_state = FF_FILTER_FORMATS_PIXFMT_LIST +#define FILTER_SAMPLEFMTS_ARRAY(array) \ + .formats.samples_list = array, \ + .formats_state = FF_FILTER_FORMATS_SAMPLEFMTS_LIST +#define FILTER_PIXFMTS(...) \ + FILTER_PIXFMTS_ARRAY(((const enum AVPixelFormat []) { __VA_ARGS__, AV_PIX_FMT_NONE })) +#define FILTER_SAMPLEFMTS(...) \ + FILTER_SAMPLEFMTS_ARRAY(((const enum AVSampleFormat[]) { __VA_ARGS__, AV_SAMPLE_FMT_NONE })) +#define FILTER_SINGLE_PIXFMT(pix_fmt_) \ + .formats.pix_fmt = pix_fmt_, \ + .formats_state = FF_FILTER_FORMATS_SINGLE_PIXFMT +#define FILTER_SINGLE_SAMPLEFMT(sample_fmt_) \ + .formats.sample_fmt = sample_fmt_, \ + .formats_state = FF_FILTER_FORMATS_SINGLE_SAMPLEFMT + #define FILTER_INOUTPADS(inout, array) \ .inout = array, \ .nb_ ## inout = FF_ARRAY_ELEMS(array) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 27b17c6a9d..573f363705 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -641,7 +641,7 @@ const AVFilter ff_avsrc_movie = { .priv_class = &movie_class, .init = movie_common_init, .uninit = movie_uninit, - .query_formats = movie_query_formats, + FILTER_QUERY_FUNC(movie_query_formats), .inputs = NULL, .outputs = NULL, @@ -660,7 +660,7 @@ const AVFilter ff_avsrc_amovie = { .priv_size = sizeof(MovieContext), .init = movie_common_init, .uninit = movie_uninit, - .query_formats = movie_query_formats, + FILTER_QUERY_FUNC(movie_query_formats), .inputs = NULL, .outputs = NULL, diff --git a/libavfilter/tests/filtfmts.c b/libavfilter/tests/filtfmts.c index 356f467331..55bb64abc5 100644 --- a/libavfilter/tests/filtfmts.c +++ b/libavfilter/tests/filtfmts.c @@ -137,8 +137,8 @@ int main(int argc, char **argv) filter_ctx->outputs[i] = link; } - if (filter->query_formats) - ret = filter->query_formats(filter_ctx); + if (filter->formats_state == FF_FILTER_FORMATS_QUERY_FUNC) + ret = filter->formats.query_func(filter_ctx); else ret = ff_default_query_formats(filter_ctx); diff --git a/libavfilter/vaf_spectrumsynth.c b/libavfilter/vaf_spectrumsynth.c index a59170ea02..a558da244e 100644 --- a/libavfilter/vaf_spectrumsynth.c +++ b/libavfilter/vaf_spectrumsynth.c @@ -546,10 +546,10 @@ const AVFilter ff_vaf_spectrumsynth = { .name = "spectrumsynth", .description = NULL_IF_CONFIG_SMALL("Convert input spectrum videos to audio output."), .uninit = uninit, - .query_formats = query_formats, .activate = activate, .priv_size = sizeof(SpectrumSynthContext), FILTER_INPUTS(spectrumsynth_inputs), FILTER_OUTPUTS(spectrumsynth_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &spectrumsynth_class, }; diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c index 8fb601ce06..4bbc06da36 100644 --- a/libavfilter/vf_alphamerge.c +++ b/libavfilter/vf_alphamerge.c @@ -194,9 +194,9 @@ const AVFilter ff_vf_alphamerge = { .priv_size = sizeof(AlphaMergeContext), .priv_class = &alphamerge_class, .init = init, - .query_formats = query_formats, FILTER_INPUTS(alphamerge_inputs), FILTER_OUTPUTS(alphamerge_outputs), + FILTER_QUERY_FUNC(query_formats), .uninit = uninit, .activate = activate, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, diff --git a/libavfilter/vf_amplify.c b/libavfilter/vf_amplify.c index 713e1560b0..558cbd918e 100644 --- a/libavfilter/vf_amplify.c +++ b/libavfilter/vf_amplify.c @@ -314,9 +314,9 @@ const AVFilter ff_vf_amplify = { .description = NULL_IF_CONFIG_SMALL("Amplify changes between successive video frames."), .priv_size = sizeof(AmplifyContext), .priv_class = &lify_class, - .query_formats = query_formats, FILTER_OUTPUTS(outputs), FILTER_INPUTS(inputs), + FILTER_QUERY_FUNC(query_formats), .init = init, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/vf_atadenoise.c b/libavfilter/vf_atadenoise.c index d21726aa5e..40f983cd9e 100644 --- a/libavfilter/vf_atadenoise.c +++ b/libavfilter/vf_atadenoise.c @@ -574,9 +574,9 @@ const AVFilter ff_vf_atadenoise = { .priv_class = &atadenoise_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; diff --git a/libavfilter/vf_avgblur.c b/libavfilter/vf_avgblur.c index a838285bb4..01f055e5bb 100644 --- a/libavfilter/vf_avgblur.c +++ b/libavfilter/vf_avgblur.c @@ -350,9 +350,9 @@ const AVFilter ff_vf_avgblur = { .priv_size = sizeof(AverageBlurContext), .priv_class = &avgblur_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avgblur_inputs), FILTER_OUTPUTS(avgblur_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = process_command, }; diff --git a/libavfilter/vf_avgblur_opencl.c b/libavfilter/vf_avgblur_opencl.c index e9a3bc6100..241c312576 100644 --- a/libavfilter/vf_avgblur_opencl.c +++ b/libavfilter/vf_avgblur_opencl.c @@ -345,9 +345,9 @@ const AVFilter ff_vf_avgblur_opencl = { .priv_class = &avgblur_opencl_class, .init = &ff_opencl_filter_init, .uninit = &avgblur_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, FILTER_INPUTS(avgblur_opencl_inputs), FILTER_OUTPUTS(avgblur_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; @@ -384,9 +384,9 @@ const AVFilter ff_vf_boxblur_opencl = { .priv_class = &boxblur_opencl_class, .init = &ff_opencl_filter_init, .uninit = &avgblur_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, FILTER_INPUTS(avgblur_opencl_inputs), FILTER_OUTPUTS(avgblur_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_avgblur_vulkan.c b/libavfilter/vf_avgblur_vulkan.c index 5ae487fc8c..a4d855754f 100644 --- a/libavfilter/vf_avgblur_vulkan.c +++ b/libavfilter/vf_avgblur_vulkan.c @@ -402,9 +402,9 @@ const AVFilter ff_vf_avgblur_vulkan = { .priv_size = sizeof(AvgBlurVulkanContext), .init = &ff_vk_filter_init, .uninit = &avgblur_vulkan_uninit, - .query_formats = &ff_vk_filter_query_formats, FILTER_INPUTS(avgblur_vulkan_inputs), FILTER_OUTPUTS(avgblur_vulkan_outputs), + FILTER_QUERY_FUNC(&ff_vk_filter_query_formats), .priv_class = &avgblur_vulkan_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_bbox.c b/libavfilter/vf_bbox.c index 9f03db3cfd..181cbf0bfe 100644 --- a/libavfilter/vf_bbox.c +++ b/libavfilter/vf_bbox.c @@ -153,9 +153,9 @@ const AVFilter ff_vf_bbox = { .description = NULL_IF_CONFIG_SMALL("Compute bounding box for each frame."), .priv_size = sizeof(BBoxContext), .priv_class = &bbox_class, - .query_formats = query_formats, FILTER_INPUTS(bbox_inputs), FILTER_OUTPUTS(bbox_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_bilateral.c b/libavfilter/vf_bilateral.c index 6d7fa8b30d..b292629c62 100644 --- a/libavfilter/vf_bilateral.c +++ b/libavfilter/vf_bilateral.c @@ -383,9 +383,9 @@ const AVFilter ff_vf_bilateral = { .priv_size = sizeof(BilateralContext), .priv_class = &bilateral_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(bilateral_inputs), FILTER_OUTPUTS(bilateral_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = process_command, }; diff --git a/libavfilter/vf_bitplanenoise.c b/libavfilter/vf_bitplanenoise.c index d45dd7777f..8b895ff680 100644 --- a/libavfilter/vf_bitplanenoise.c +++ b/libavfilter/vf_bitplanenoise.c @@ -213,9 +213,9 @@ const AVFilter ff_vf_bitplanenoise = { .name = "bitplanenoise", .description = NULL_IF_CONFIG_SMALL("Measure bit plane noise."), .priv_size = sizeof(BPNContext), - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &bitplanenoise_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_blackdetect.c b/libavfilter/vf_blackdetect.c index b3a03c6e91..e2471f27c2 100644 --- a/libavfilter/vf_blackdetect.c +++ b/libavfilter/vf_blackdetect.c @@ -257,9 +257,9 @@ const AVFilter ff_vf_blackdetect = { .name = "blackdetect", .description = NULL_IF_CONFIG_SMALL("Detect video intervals that are (almost) black."), .priv_size = sizeof(BlackDetectContext), - .query_formats = query_formats, FILTER_INPUTS(blackdetect_inputs), FILTER_OUTPUTS(blackdetect_outputs), + FILTER_QUERY_FUNC(query_formats), .uninit = uninit, .priv_class = &blackdetect_class, .flags = AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c index ac7f7347c6..29bed4af68 100644 --- a/libavfilter/vf_blackframe.c +++ b/libavfilter/vf_blackframe.c @@ -132,7 +132,7 @@ const AVFilter ff_vf_blackframe = { .description = NULL_IF_CONFIG_SMALL("Detect frames that are (almost) black."), .priv_size = sizeof(BlackFrameContext), .priv_class = &blackframe_class, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_blackframe_inputs), FILTER_OUTPUTS(avfilter_vf_blackframe_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index ddfd6cf0f0..1401849bc3 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -584,10 +584,10 @@ const AVFilter ff_vf_blend = { .init = init, .uninit = uninit, .priv_size = sizeof(BlendContext), - .query_formats = query_formats, .activate = activate, FILTER_INPUTS(blend_inputs), FILTER_OUTPUTS(blend_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &blend_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, @@ -641,11 +641,11 @@ const AVFilter ff_vf_tblend = { .description = NULL_IF_CONFIG_SMALL("Blend successive frames."), .priv_size = sizeof(BlendContext), .priv_class = &tblend_class, - .query_formats = query_formats, .init = init, .uninit = uninit, FILTER_INPUTS(tblend_inputs), FILTER_OUTPUTS(tblend_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; diff --git a/libavfilter/vf_bm3d.c b/libavfilter/vf_bm3d.c index 007f8bbf8c..46f4c65676 100644 --- a/libavfilter/vf_bm3d.c +++ b/libavfilter/vf_bm3d.c @@ -1053,9 +1053,9 @@ const AVFilter ff_vf_bm3d = { .init = init, .uninit = uninit, .activate = activate, - .query_formats = query_formats, .inputs = NULL, FILTER_OUTPUTS(bm3d_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &bm3d_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_DYNAMIC_INPUTS | diff --git a/libavfilter/vf_boxblur.c b/libavfilter/vf_boxblur.c index 3ace88e5b6..e13c2472b3 100644 --- a/libavfilter/vf_boxblur.c +++ b/libavfilter/vf_boxblur.c @@ -308,8 +308,8 @@ const AVFilter ff_vf_boxblur = { .priv_size = sizeof(BoxBlurContext), .priv_class = &boxblur_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_boxblur_inputs), FILTER_OUTPUTS(avfilter_vf_boxblur_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c index 7f3fb0034b..cb880c7241 100644 --- a/libavfilter/vf_bwdif.c +++ b/libavfilter/vf_bwdif.c @@ -409,8 +409,8 @@ const AVFilter ff_vf_bwdif = { .priv_size = sizeof(BWDIFContext), .priv_class = &bwdif_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_bwdif_inputs), FILTER_OUTPUTS(avfilter_vf_bwdif_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_cas.c b/libavfilter/vf_cas.c index d28932a62b..32ac6aa04b 100644 --- a/libavfilter/vf_cas.c +++ b/libavfilter/vf_cas.c @@ -283,9 +283,9 @@ const AVFilter ff_vf_cas = { .description = NULL_IF_CONFIG_SMALL("Contrast Adaptive Sharpen."), .priv_size = sizeof(CASContext), .priv_class = &cas_class, - .query_formats = query_formats, FILTER_INPUTS(cas_inputs), FILTER_OUTPUTS(cas_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_chromaber_vulkan.c b/libavfilter/vf_chromaber_vulkan.c index 96fdd7bd9c..87e55a9c4f 100644 --- a/libavfilter/vf_chromaber_vulkan.c +++ b/libavfilter/vf_chromaber_vulkan.c @@ -337,9 +337,9 @@ const AVFilter ff_vf_chromaber_vulkan = { .priv_size = sizeof(ChromaticAberrationVulkanContext), .init = &ff_vk_filter_init, .uninit = &chromaber_vulkan_uninit, - .query_formats = &ff_vk_filter_query_formats, FILTER_INPUTS(chromaber_vulkan_inputs), FILTER_OUTPUTS(chromaber_vulkan_outputs), + FILTER_QUERY_FUNC(&ff_vk_filter_query_formats), .priv_class = &chromaber_vulkan_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_chromakey.c b/libavfilter/vf_chromakey.c index 304cb9ee6c..532d81ecf6 100644 --- a/libavfilter/vf_chromakey.c +++ b/libavfilter/vf_chromakey.c @@ -399,9 +399,9 @@ const AVFilter ff_vf_chromakey = { .description = NULL_IF_CONFIG_SMALL("Turns a certain color into transparency. Operates on YUV colors."), .priv_size = sizeof(ChromakeyContext), .priv_class = &chromakey_class, - .query_formats = query_formats, FILTER_INPUTS(chromakey_inputs), FILTER_OUTPUTS(chromakey_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; @@ -439,9 +439,9 @@ const AVFilter ff_vf_chromahold = { .description = NULL_IF_CONFIG_SMALL("Turns a certain color range into gray."), .priv_size = sizeof(ChromakeyContext), .priv_class = &chromahold_class, - .query_formats = query_formats, FILTER_INPUTS(chromahold_inputs), FILTER_OUTPUTS(chromahold_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; diff --git a/libavfilter/vf_chromanr.c b/libavfilter/vf_chromanr.c index fe9bca1d9d..0f16f68b3f 100644 --- a/libavfilter/vf_chromanr.c +++ b/libavfilter/vf_chromanr.c @@ -280,9 +280,9 @@ const AVFilter ff_vf_chromanr = { .description = NULL_IF_CONFIG_SMALL("Reduce chrominance noise."), .priv_size = sizeof(ChromaNRContext), .priv_class = &chromanr_class, - .query_formats = query_formats, FILTER_OUTPUTS(outputs), FILTER_INPUTS(inputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_chromashift.c b/libavfilter/vf_chromashift.c index bcff4144e3..18e362adb8 100644 --- a/libavfilter/vf_chromashift.c +++ b/libavfilter/vf_chromashift.c @@ -445,9 +445,9 @@ const AVFilter ff_vf_chromashift = { .description = NULL_IF_CONFIG_SMALL("Shift chroma."), .priv_size = sizeof(ChromaShiftContext), .priv_class = &chromashift_class, - .query_formats = query_formats, FILTER_OUTPUTS(outputs), FILTER_INPUTS(inputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; @@ -474,9 +474,9 @@ const AVFilter ff_vf_rgbashift = { .description = NULL_IF_CONFIG_SMALL("Shift RGBA."), .priv_size = sizeof(ChromaShiftContext), .priv_class = &rgbashift_class, - .query_formats = query_formats, FILTER_OUTPUTS(outputs), FILTER_INPUTS(inputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; diff --git a/libavfilter/vf_ciescope.c b/libavfilter/vf_ciescope.c index b09012920c..fcb28d2b5e 100644 --- a/libavfilter/vf_ciescope.c +++ b/libavfilter/vf_ciescope.c @@ -1507,8 +1507,8 @@ const AVFilter ff_vf_ciescope = { .description = NULL_IF_CONFIG_SMALL("Video CIE scope."), .priv_size = sizeof(CiescopeContext), .priv_class = &ciescope_class, - .query_formats = query_formats, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_codecview.c b/libavfilter/vf_codecview.c index dc3d3acd82..4226bab8d8 100644 --- a/libavfilter/vf_codecview.c +++ b/libavfilter/vf_codecview.c @@ -317,9 +317,9 @@ const AVFilter ff_vf_codecview = { .name = "codecview", .description = NULL_IF_CONFIG_SMALL("Visualize information about some codecs."), .priv_size = sizeof(CodecViewContext), - .query_formats = query_formats, FILTER_INPUTS(codecview_inputs), FILTER_OUTPUTS(codecview_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &codecview_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_colorbalance.c b/libavfilter/vf_colorbalance.c index 8055829adf..9ca0078ecc 100644 --- a/libavfilter/vf_colorbalance.c +++ b/libavfilter/vf_colorbalance.c @@ -440,9 +440,9 @@ const AVFilter ff_vf_colorbalance = { .description = NULL_IF_CONFIG_SMALL("Adjust the color balance."), .priv_size = sizeof(ColorBalanceContext), .priv_class = &colorbalance_class, - .query_formats = query_formats, FILTER_INPUTS(colorbalance_inputs), FILTER_OUTPUTS(colorbalance_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_colorchannelmixer.c b/libavfilter/vf_colorchannelmixer.c index f1a193116e..4453d901bd 100644 --- a/libavfilter/vf_colorchannelmixer.c +++ b/libavfilter/vf_colorchannelmixer.c @@ -780,9 +780,9 @@ const AVFilter ff_vf_colorchannelmixer = { .priv_size = sizeof(ColorChannelMixerContext), .priv_class = &colorchannelmixer_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(colorchannelmixer_inputs), FILTER_OUTPUTS(colorchannelmixer_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; diff --git a/libavfilter/vf_colorconstancy.c b/libavfilter/vf_colorconstancy.c index 8c54f7c238..9ccb462d0f 100644 --- a/libavfilter/vf_colorconstancy.c +++ b/libavfilter/vf_colorconstancy.c @@ -752,10 +752,10 @@ const AVFilter ff_vf_greyedge = { .description = NULL_IF_CONFIG_SMALL("Estimates scene illumination by grey edge assumption."), .priv_size = sizeof(ColorConstancyContext), .priv_class = &greyedge_class, - .query_formats = query_formats, .uninit = uninit, FILTER_INPUTS(colorconstancy_inputs), FILTER_OUTPUTS(colorconstancy_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_colorcontrast.c b/libavfilter/vf_colorcontrast.c index e89b3e7af4..b0f856a85e 100644 --- a/libavfilter/vf_colorcontrast.c +++ b/libavfilter/vf_colorcontrast.c @@ -392,9 +392,9 @@ const AVFilter ff_vf_colorcontrast = { .description = NULL_IF_CONFIG_SMALL("Adjust color contrast between RGB components."), .priv_size = sizeof(ColorContrastContext), .priv_class = &colorcontrast_class, - .query_formats = query_formats, FILTER_INPUTS(colorcontrast_inputs), FILTER_OUTPUTS(colorcontrast_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_colorcorrect.c b/libavfilter/vf_colorcorrect.c index 2570bb105c..dd4783306d 100644 --- a/libavfilter/vf_colorcorrect.c +++ b/libavfilter/vf_colorcorrect.c @@ -546,10 +546,10 @@ const AVFilter ff_vf_colorcorrect = { .description = NULL_IF_CONFIG_SMALL("Adjust color white balance selectively for blacks and whites."), .priv_size = sizeof(ColorCorrectContext), .priv_class = &colorcorrect_class, - .query_formats = query_formats, .uninit = uninit, FILTER_INPUTS(colorcorrect_inputs), FILTER_OUTPUTS(colorcorrect_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_colorize.c b/libavfilter/vf_colorize.c index 4b57998a22..3ad832b6d9 100644 --- a/libavfilter/vf_colorize.c +++ b/libavfilter/vf_colorize.c @@ -290,9 +290,9 @@ const AVFilter ff_vf_colorize = { .description = NULL_IF_CONFIG_SMALL("Overlay a solid color on the video stream."), .priv_size = sizeof(ColorizeContext), .priv_class = &colorize_class, - .query_formats = query_formats, FILTER_INPUTS(colorize_inputs), FILTER_OUTPUTS(colorize_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_colorkey.c b/libavfilter/vf_colorkey.c index bef3e37414..93f2ae3ec9 100644 --- a/libavfilter/vf_colorkey.c +++ b/libavfilter/vf_colorkey.c @@ -208,10 +208,10 @@ const AVFilter ff_vf_colorkey = { .description = NULL_IF_CONFIG_SMALL("Turns a certain color into transparency. Operates on RGB colors."), .priv_size = sizeof(ColorkeyContext), .priv_class = &colorkey_class, - .query_formats = query_formats, .init = init_filter, FILTER_INPUTS(colorkey_inputs), FILTER_OUTPUTS(colorkey_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; @@ -233,10 +233,10 @@ const AVFilter ff_vf_colorhold = { .description = NULL_IF_CONFIG_SMALL("Turns a certain color range into gray. Operates on RGB colors."), .priv_size = sizeof(ColorkeyContext), .priv_class = &colorhold_class, - .query_formats = query_formats, .init = init_filter, FILTER_INPUTS(colorkey_inputs), FILTER_OUTPUTS(colorkey_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_colorkey_opencl.c b/libavfilter/vf_colorkey_opencl.c index f4015cbf21..d54dd86c21 100644 --- a/libavfilter/vf_colorkey_opencl.c +++ b/libavfilter/vf_colorkey_opencl.c @@ -235,8 +235,8 @@ const AVFilter ff_vf_colorkey_opencl = { .priv_class = &colorkey_opencl_class, .init = &ff_opencl_filter_init, .uninit = &colorkey_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, FILTER_INPUTS(colorkey_opencl_inputs), FILTER_OUTPUTS(colorkey_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE }; diff --git a/libavfilter/vf_colorlevels.c b/libavfilter/vf_colorlevels.c index 89021e95d0..552b701a2d 100644 --- a/libavfilter/vf_colorlevels.c +++ b/libavfilter/vf_colorlevels.c @@ -386,9 +386,9 @@ const AVFilter ff_vf_colorlevels = { .description = NULL_IF_CONFIG_SMALL("Adjust the color levels."), .priv_size = sizeof(ColorLevelsContext), .priv_class = &colorlevels_class, - .query_formats = query_formats, FILTER_INPUTS(colorlevels_inputs), FILTER_OUTPUTS(colorlevels_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_colormatrix.c b/libavfilter/vf_colormatrix.c index 87bf478398..73bc0e9cf0 100644 --- a/libavfilter/vf_colormatrix.c +++ b/libavfilter/vf_colormatrix.c @@ -507,9 +507,9 @@ const AVFilter ff_vf_colormatrix = { .description = NULL_IF_CONFIG_SMALL("Convert color matrix."), .priv_size = sizeof(ColorMatrixContext), .init = init, - .query_formats = query_formats, FILTER_INPUTS(colormatrix_inputs), FILTER_OUTPUTS(colormatrix_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &colormatrix_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c index 6b23b27ea5..0bd8e2b0cf 100644 --- a/libavfilter/vf_colorspace.c +++ b/libavfilter/vf_colorspace.c @@ -1072,10 +1072,10 @@ const AVFilter ff_vf_colorspace = { .description = NULL_IF_CONFIG_SMALL("Convert between colorspaces."), .init = init, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(ColorSpaceContext), .priv_class = &colorspace_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_colortemperature.c b/libavfilter/vf_colortemperature.c index da2e3bf908..919ad81c69 100644 --- a/libavfilter/vf_colortemperature.c +++ b/libavfilter/vf_colortemperature.c @@ -354,9 +354,9 @@ const AVFilter ff_vf_colortemperature = { .description = NULL_IF_CONFIG_SMALL("Adjust color temperature of video."), .priv_size = sizeof(ColorTemperatureContext), .priv_class = &colortemperature_class, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index c1ebf4c791..707f2dd4e3 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -965,9 +965,9 @@ const AVFilter ff_vf_convolution = { .priv_size = sizeof(ConvolutionContext), .priv_class = &convolution_class, .init = init, - .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), FILTER_OUTPUTS(convolution_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; @@ -992,9 +992,9 @@ const AVFilter ff_vf_prewitt = { .priv_size = sizeof(ConvolutionContext), .priv_class = &common_class, .init = init, - .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), FILTER_OUTPUTS(convolution_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; @@ -1009,9 +1009,9 @@ const AVFilter ff_vf_sobel = { .priv_size = sizeof(ConvolutionContext), .priv_class = &common_class, .init = init, - .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), FILTER_OUTPUTS(convolution_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; @@ -1026,9 +1026,9 @@ const AVFilter ff_vf_roberts = { .priv_size = sizeof(ConvolutionContext), .priv_class = &common_class, .init = init, - .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), FILTER_OUTPUTS(convolution_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; @@ -1043,9 +1043,9 @@ const AVFilter ff_vf_kirsch = { .priv_size = sizeof(ConvolutionContext), .priv_class = &common_class, .init = init, - .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), FILTER_OUTPUTS(convolution_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; @@ -1060,9 +1060,9 @@ const AVFilter ff_vf_scharr = { .priv_size = sizeof(ConvolutionContext), .priv_class = &common_class, .init = init, - .query_formats = query_formats, FILTER_INPUTS(convolution_inputs), FILTER_OUTPUTS(convolution_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; diff --git a/libavfilter/vf_convolution_opencl.c b/libavfilter/vf_convolution_opencl.c index 6932eff246..3871ddcff4 100644 --- a/libavfilter/vf_convolution_opencl.c +++ b/libavfilter/vf_convolution_opencl.c @@ -367,9 +367,9 @@ const AVFilter ff_vf_convolution_opencl = { .priv_class = &convolution_opencl_class, .init = &ff_opencl_filter_init, .uninit = &convolution_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, FILTER_INPUTS(convolution_opencl_inputs), FILTER_OUTPUTS(convolution_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; @@ -393,9 +393,9 @@ const AVFilter ff_vf_sobel_opencl = { .priv_class = &sobel_opencl_class, .init = &ff_opencl_filter_init, .uninit = &convolution_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, FILTER_INPUTS(convolution_opencl_inputs), FILTER_OUTPUTS(convolution_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; @@ -419,9 +419,9 @@ const AVFilter ff_vf_prewitt_opencl = { .priv_class = &prewitt_opencl_class, .init = &ff_opencl_filter_init, .uninit = &convolution_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, FILTER_INPUTS(convolution_opencl_inputs), FILTER_OUTPUTS(convolution_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; @@ -445,9 +445,9 @@ const AVFilter ff_vf_roberts_opencl = { .priv_class = &roberts_opencl_class, .init = &ff_opencl_filter_init, .uninit = &convolution_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, FILTER_INPUTS(convolution_opencl_inputs), FILTER_OUTPUTS(convolution_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_convolve.c b/libavfilter/vf_convolve.c index 65e7bde107..d7fdb9b121 100644 --- a/libavfilter/vf_convolve.c +++ b/libavfilter/vf_convolve.c @@ -663,12 +663,12 @@ const AVFilter ff_vf_convolve = { .preinit = convolve_framesync_preinit, .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .priv_size = sizeof(ConvolveContext), .priv_class = &convolve_class, FILTER_INPUTS(convolve_inputs), FILTER_OUTPUTS(convolve_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; @@ -693,12 +693,12 @@ const AVFilter ff_vf_deconvolve = { .preinit = convolve_framesync_preinit, .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .priv_size = sizeof(ConvolveContext), .priv_class = &deconvolve_class, FILTER_INPUTS(convolve_inputs), FILTER_OUTPUTS(convolve_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_copy.c b/libavfilter/vf_copy.c index 0ed61324e7..5554565bae 100644 --- a/libavfilter/vf_copy.c +++ b/libavfilter/vf_copy.c @@ -77,5 +77,5 @@ const AVFilter ff_vf_copy = { .description = NULL_IF_CONFIG_SMALL("Copy the input video unchanged to the output."), FILTER_INPUTS(avfilter_vf_copy_inputs), FILTER_OUTPUTS(avfilter_vf_copy_outputs), - .query_formats = query_formats, + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_coreimage.m b/libavfilter/vf_coreimage.m index 5c7d272616..4e1f89ee71 100644 --- a/libavfilter/vf_coreimage.m +++ b/libavfilter/vf_coreimage.m @@ -629,7 +629,7 @@ const AVFilter ff_vf_coreimage = { .priv_class = &coreimage_class, FILTER_INPUTS(vf_coreimage_inputs), FILTER_OUTPUTS(vf_coreimage_outputs), - .query_formats = query_formats, + FILTER_QUERY_FUNC(query_formats), }; // definitions for coreimagesrc video source @@ -650,5 +650,5 @@ const AVFilter ff_vsrc_coreimagesrc = { .priv_class = &coreimagesrc_class, .inputs = NULL, FILTER_OUTPUTS(vsrc_coreimagesrc_outputs), - .query_formats = query_formats, + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_cover_rect.c b/libavfilter/vf_cover_rect.c index 0a8c10e06d..90e19ea8a6 100644 --- a/libavfilter/vf_cover_rect.c +++ b/libavfilter/vf_cover_rect.c @@ -251,8 +251,8 @@ const AVFilter ff_vf_cover_rect = { .priv_size = sizeof(CoverContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(cover_rect_inputs), FILTER_OUTPUTS(cover_rect_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &cover_rect_class, }; diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 27ae1b8118..c7cbfa51ef 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -391,9 +391,9 @@ const AVFilter ff_vf_crop = { .description = NULL_IF_CONFIG_SMALL("Crop the input video."), .priv_size = sizeof(CropContext), .priv_class = &crop_class, - .query_formats = query_formats, .uninit = uninit, FILTER_INPUTS(avfilter_vf_crop_inputs), FILTER_OUTPUTS(avfilter_vf_crop_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, }; diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c index 500ef7fa7f..22e8885e01 100644 --- a/libavfilter/vf_cropdetect.c +++ b/libavfilter/vf_cropdetect.c @@ -275,8 +275,8 @@ const AVFilter ff_vf_cropdetect = { .priv_size = sizeof(CropDetectContext), .priv_class = &cropdetect_class, .init = init, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_cropdetect_inputs), FILTER_OUTPUTS(avfilter_vf_cropdetect_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_curves.c b/libavfilter/vf_curves.c index 7d7773419e..4aeb9e36ae 100644 --- a/libavfilter/vf_curves.c +++ b/libavfilter/vf_curves.c @@ -815,9 +815,9 @@ const AVFilter ff_vf_curves = { .priv_size = sizeof(CurvesContext), .init = curves_init, .uninit = curves_uninit, - .query_formats = query_formats, FILTER_INPUTS(curves_inputs), FILTER_OUTPUTS(curves_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &curves_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, diff --git a/libavfilter/vf_datascope.c b/libavfilter/vf_datascope.c index a60d061d18..0a605985f1 100644 --- a/libavfilter/vf_datascope.c +++ b/libavfilter/vf_datascope.c @@ -453,9 +453,9 @@ const AVFilter ff_vf_datascope = { .description = NULL_IF_CONFIG_SMALL("Video data analysis."), .priv_size = sizeof(DatascopeContext), .priv_class = &datascope_class, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; @@ -740,9 +740,9 @@ const AVFilter ff_vf_pixscope = { .description = NULL_IF_CONFIG_SMALL("Pixel data analysis."), .priv_size = sizeof(PixscopeContext), .priv_class = &pixscope_class, - .query_formats = query_formats, FILTER_INPUTS(pixscope_inputs), FILTER_OUTPUTS(pixscope_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = pixscope_process_command, }; @@ -1144,10 +1144,10 @@ const AVFilter ff_vf_oscilloscope = { .description = NULL_IF_CONFIG_SMALL("2D Video Oscilloscope."), .priv_size = sizeof(OscilloscopeContext), .priv_class = &oscilloscope_class, - .query_formats = query_formats, .uninit = oscilloscope_uninit, FILTER_INPUTS(oscilloscope_inputs), FILTER_OUTPUTS(oscilloscope_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = oscilloscope_process_command, }; diff --git a/libavfilter/vf_dblur.c b/libavfilter/vf_dblur.c index 931c6c689d..91c0023a13 100644 --- a/libavfilter/vf_dblur.c +++ b/libavfilter/vf_dblur.c @@ -296,9 +296,9 @@ const AVFilter ff_vf_dblur = { .priv_size = sizeof(DBlurContext), .priv_class = &dblur_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(dblur_inputs), FILTER_OUTPUTS(dblur_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_dctdnoiz.c b/libavfilter/vf_dctdnoiz.c index 3192a2f8ae..a967eb72d3 100644 --- a/libavfilter/vf_dctdnoiz.c +++ b/libavfilter/vf_dctdnoiz.c @@ -826,9 +826,9 @@ const AVFilter ff_vf_dctdnoiz = { .priv_size = sizeof(DCTdnoizContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(dctdnoiz_inputs), FILTER_OUTPUTS(dctdnoiz_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &dctdnoiz_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_deband.c b/libavfilter/vf_deband.c index 6d9fd2c52b..ec91cb1548 100644 --- a/libavfilter/vf_deband.c +++ b/libavfilter/vf_deband.c @@ -471,9 +471,9 @@ const AVFilter ff_vf_deband = { .priv_size = sizeof(DebandContext), .priv_class = &deband_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_deband_inputs), FILTER_OUTPUTS(avfilter_vf_deband_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; diff --git a/libavfilter/vf_deblock.c b/libavfilter/vf_deblock.c index 60f2d206bb..809e004ae9 100644 --- a/libavfilter/vf_deblock.c +++ b/libavfilter/vf_deblock.c @@ -415,9 +415,9 @@ const AVFilter ff_vf_deblock = { .description = NULL_IF_CONFIG_SMALL("Deblock video."), .priv_size = sizeof(DeblockContext), .priv_class = &deblock_class, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = process_command, }; diff --git a/libavfilter/vf_decimate.c b/libavfilter/vf_decimate.c index cc75aecf81..a547f272de 100644 --- a/libavfilter/vf_decimate.c +++ b/libavfilter/vf_decimate.c @@ -437,8 +437,8 @@ const AVFilter ff_vf_decimate = { .activate = activate, .uninit = decimate_uninit, .priv_size = sizeof(DecimateContext), - .query_formats = query_formats, FILTER_OUTPUTS(decimate_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &decimate_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, }; diff --git a/libavfilter/vf_dedot.c b/libavfilter/vf_dedot.c index a61c08ab02..9d31af3f6d 100644 --- a/libavfilter/vf_dedot.c +++ b/libavfilter/vf_dedot.c @@ -401,10 +401,10 @@ const AVFilter ff_vf_dedot = { .description = NULL_IF_CONFIG_SMALL("Reduce cross-luminance and cross-color."), .priv_size = sizeof(DedotContext), .priv_class = &dedot_class, - .query_formats = query_formats, .activate = activate, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_deflicker.c b/libavfilter/vf_deflicker.c index c15f8cec33..11652c40ec 100644 --- a/libavfilter/vf_deflicker.c +++ b/libavfilter/vf_deflicker.c @@ -467,7 +467,7 @@ const AVFilter ff_vf_deflicker = { .priv_size = sizeof(DeflickerContext), .priv_class = &deflicker_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c index 173c314bb8..c30e1e7fc2 100644 --- a/libavfilter/vf_deinterlace_qsv.c +++ b/libavfilter/vf_deinterlace_qsv.c @@ -598,13 +598,13 @@ const AVFilter ff_vf_deinterlace_qsv = { .description = NULL_IF_CONFIG_SMALL("QuickSync video deinterlacing"), .uninit = qsvdeint_uninit, - .query_formats = qsvdeint_query_formats, .priv_size = sizeof(QSVDeintContext), .priv_class = &qsvdeint_class, FILTER_INPUTS(qsvdeint_inputs), FILTER_OUTPUTS(qsvdeint_outputs), + FILTER_QUERY_FUNC(qsvdeint_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_deinterlace_vaapi.c b/libavfilter/vf_deinterlace_vaapi.c index 5ec830213e..65f319ba9a 100644 --- a/libavfilter/vf_deinterlace_vaapi.c +++ b/libavfilter/vf_deinterlace_vaapi.c @@ -385,9 +385,9 @@ const AVFilter ff_vf_deinterlace_vaapi = { .priv_size = sizeof(DeintVAAPIContext), .init = &deint_vaapi_init, .uninit = &ff_vaapi_vpp_ctx_uninit, - .query_formats = &ff_vaapi_vpp_query_formats, FILTER_INPUTS(deint_vaapi_inputs), FILTER_OUTPUTS(deint_vaapi_outputs), + FILTER_QUERY_FUNC(&ff_vaapi_vpp_query_formats), .priv_class = &deint_vaapi_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c index f7320aa0fe..ce24aa92a7 100644 --- a/libavfilter/vf_delogo.c +++ b/libavfilter/vf_delogo.c @@ -400,8 +400,8 @@ const AVFilter ff_vf_delogo = { .priv_class = &delogo_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_delogo_inputs), FILTER_OUTPUTS(avfilter_vf_delogo_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_derain.c b/libavfilter/vf_derain.c index 97bdb4e843..2950527f69 100644 --- a/libavfilter/vf_derain.c +++ b/libavfilter/vf_derain.c @@ -134,9 +134,9 @@ const AVFilter ff_vf_derain = { .priv_size = sizeof(DRContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(derain_inputs), FILTER_OUTPUTS(derain_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &derain_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index 4d3d950191..a2b410c3c8 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -552,8 +552,8 @@ const AVFilter ff_vf_deshake = { .priv_size = sizeof(DeshakeContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(deshake_inputs), FILTER_OUTPUTS(deshake_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &deshake_class, }; diff --git a/libavfilter/vf_deshake_opencl.c b/libavfilter/vf_deshake_opencl.c index 93c50a410d..848f4a4f30 100644 --- a/libavfilter/vf_deshake_opencl.c +++ b/libavfilter/vf_deshake_opencl.c @@ -2192,9 +2192,9 @@ const AVFilter ff_vf_deshake_opencl = { .priv_class = &deshake_opencl_class, .init = &ff_opencl_filter_init, .uninit = &deshake_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, .activate = activate, FILTER_INPUTS(deshake_opencl_inputs), FILTER_OUTPUTS(deshake_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE }; diff --git a/libavfilter/vf_despill.c b/libavfilter/vf_despill.c index 2c60112b48..ecaaddac11 100644 --- a/libavfilter/vf_despill.c +++ b/libavfilter/vf_despill.c @@ -168,9 +168,9 @@ const AVFilter ff_vf_despill = { .description = NULL_IF_CONFIG_SMALL("Despill video."), .priv_size = sizeof(DespillContext), .priv_class = &despill_class, - .query_formats = query_formats, FILTER_INPUTS(despill_inputs), FILTER_OUTPUTS(despill_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = ff_filter_process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_detelecine.c b/libavfilter/vf_detelecine.c index e36e1a6245..e1f0587b6a 100644 --- a/libavfilter/vf_detelecine.c +++ b/libavfilter/vf_detelecine.c @@ -372,7 +372,7 @@ const AVFilter ff_vf_detelecine = { .priv_class = &detelecine_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(detelecine_inputs), FILTER_OUTPUTS(detelecine_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_displace.c b/libavfilter/vf_displace.c index 3dbba3b95c..8afef87d7a 100644 --- a/libavfilter/vf_displace.c +++ b/libavfilter/vf_displace.c @@ -398,10 +398,10 @@ const AVFilter ff_vf_displace = { .description = NULL_IF_CONFIG_SMALL("Displace pixels."), .priv_size = sizeof(DisplaceContext), .uninit = uninit, - .query_formats = query_formats, .activate = activate, FILTER_INPUTS(displace_inputs), FILTER_OUTPUTS(displace_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &displace_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/vf_dnn_classify.c b/libavfilter/vf_dnn_classify.c index d1ba8dffbc..ea929c2c19 100644 --- a/libavfilter/vf_dnn_classify.c +++ b/libavfilter/vf_dnn_classify.c @@ -321,9 +321,9 @@ const AVFilter ff_vf_dnn_classify = { .priv_size = sizeof(DnnClassifyContext), .init = dnn_classify_init, .uninit = dnn_classify_uninit, - .query_formats = dnn_classify_query_formats, FILTER_INPUTS(dnn_classify_inputs), FILTER_OUTPUTS(dnn_classify_outputs), + FILTER_QUERY_FUNC(dnn_classify_query_formats), .priv_class = &dnn_classify_class, .activate = dnn_classify_activate, }; diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index 637874b2a1..2cfff00a4a 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -464,9 +464,9 @@ const AVFilter ff_vf_dnn_detect = { .priv_size = sizeof(DnnDetectContext), .init = dnn_detect_init, .uninit = dnn_detect_uninit, - .query_formats = dnn_detect_query_formats, FILTER_INPUTS(dnn_detect_inputs), FILTER_OUTPUTS(dnn_detect_outputs), + FILTER_QUERY_FUNC(dnn_detect_query_formats), .priv_class = &dnn_detect_class, .activate = dnn_detect_activate, }; diff --git a/libavfilter/vf_dnn_processing.c b/libavfilter/vf_dnn_processing.c index 55634efde5..d193205550 100644 --- a/libavfilter/vf_dnn_processing.c +++ b/libavfilter/vf_dnn_processing.c @@ -370,9 +370,9 @@ const AVFilter ff_vf_dnn_processing = { .priv_size = sizeof(DnnProcessingContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(dnn_processing_inputs), FILTER_OUTPUTS(dnn_processing_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &dnn_processing_class, .activate = activate, }; diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index 2d36da89cd..c5ced11bbe 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -403,9 +403,9 @@ const AVFilter ff_vf_drawbox = { .priv_size = sizeof(DrawBoxContext), .priv_class = &drawbox_class, .init = init, - .query_formats = query_formats, FILTER_INPUTS(drawbox_inputs), FILTER_OUTPUTS(drawbox_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; @@ -485,9 +485,9 @@ const AVFilter ff_vf_drawgrid = { .priv_size = sizeof(DrawBoxContext), .priv_class = &drawgrid_class, .init = init, - .query_formats = query_formats, FILTER_INPUTS(drawgrid_inputs), FILTER_OUTPUTS(drawgrid_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = process_command, }; diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index b1ea58f30a..2a88692cbd 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -1635,9 +1635,9 @@ const AVFilter ff_vf_drawtext = { .priv_class = &drawtext_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_drawtext_inputs), FILTER_OUTPUTS(avfilter_vf_drawtext_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_edgedetect.c b/libavfilter/vf_edgedetect.c index 982ed729cf..3eea34e325 100644 --- a/libavfilter/vf_edgedetect.c +++ b/libavfilter/vf_edgedetect.c @@ -431,9 +431,9 @@ const AVFilter ff_vf_edgedetect = { .priv_size = sizeof(EdgeDetectContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(edgedetect_inputs), FILTER_OUTPUTS(edgedetect_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &edgedetect_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_elbg.c b/libavfilter/vf_elbg.c index 7f40be6092..fc73346ae1 100644 --- a/libavfilter/vf_elbg.c +++ b/libavfilter/vf_elbg.c @@ -265,9 +265,9 @@ const AVFilter ff_vf_elbg = { .description = NULL_IF_CONFIG_SMALL("Apply posterize effect, using the ELBG algorithm."), .priv_size = sizeof(ELBGFilterContext), .priv_class = &elbg_class, - .query_formats = query_formats, .init = init, .uninit = uninit, FILTER_INPUTS(elbg_inputs), FILTER_OUTPUTS(elbg_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_entropy.c b/libavfilter/vf_entropy.c index bac962fbd9..2d29ad16d3 100644 --- a/libavfilter/vf_entropy.c +++ b/libavfilter/vf_entropy.c @@ -193,9 +193,9 @@ const AVFilter ff_vf_entropy = { .description = NULL_IF_CONFIG_SMALL("Measure video frames entropy."), .priv_size = sizeof(EntropyContext), .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &entropy_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_epx.c b/libavfilter/vf_epx.c index 4adf6d5a32..be0749463f 100644 --- a/libavfilter/vf_epx.c +++ b/libavfilter/vf_epx.c @@ -275,7 +275,7 @@ const AVFilter ff_vf_epx = { .description = NULL_IF_CONFIG_SMALL("Scale the input using EPX algorithm."), FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - .query_formats = query_formats, + FILTER_QUERY_FUNC(query_formats), .priv_size = sizeof(EPXContext), .priv_class = &epx_class, .flags = AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/vf_eq.c b/libavfilter/vf_eq.c index 7763601935..74fc4d4968 100644 --- a/libavfilter/vf_eq.c +++ b/libavfilter/vf_eq.c @@ -379,8 +379,8 @@ const AVFilter ff_vf_eq = { .priv_class = &eq_class, FILTER_INPUTS(eq_inputs), FILTER_OUTPUTS(eq_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, - .query_formats = query_formats, .init = initialize, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, diff --git a/libavfilter/vf_estdif.c b/libavfilter/vf_estdif.c index 70e804a3c6..dea393e7b9 100644 --- a/libavfilter/vf_estdif.c +++ b/libavfilter/vf_estdif.c @@ -576,9 +576,9 @@ const AVFilter ff_vf_estdif = { .priv_size = sizeof(ESTDIFContext), .priv_class = &estdif_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(estdif_inputs), FILTER_OUTPUTS(estdif_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_exposure.c b/libavfilter/vf_exposure.c index 2b6e6f1586..6443eb77f1 100644 --- a/libavfilter/vf_exposure.c +++ b/libavfilter/vf_exposure.c @@ -128,9 +128,9 @@ const AVFilter ff_vf_exposure = { .description = NULL_IF_CONFIG_SMALL("Adjust exposure of the video stream."), .priv_size = sizeof(ExposureContext), .priv_class = &exposure_class, - .query_formats = query_formats, FILTER_INPUTS(exposure_inputs), FILTER_OUTPUTS(exposure_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index 6e7931b3e3..80fbc6e4b8 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -374,9 +374,9 @@ const AVFilter ff_vf_extractplanes = { .priv_size = sizeof(ExtractPlanesContext), .priv_class = &extractplanes_class, .init = init, - .query_formats = query_formats, FILTER_INPUTS(extractplanes_inputs), .outputs = NULL, + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, }; @@ -406,8 +406,8 @@ const AVFilter ff_vf_alphaextract = { "grayscale image component."), .priv_size = sizeof(ExtractPlanesContext), .init = init_alphaextract, - .query_formats = query_formats, FILTER_INPUTS(extractplanes_inputs), FILTER_OUTPUTS(alphaextract_outputs), + FILTER_QUERY_FUNC(query_formats), }; #endif /* CONFIG_ALPHAEXTRACT_FILTER */ diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c index 71d40c4928..868e7cc16a 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -570,9 +570,9 @@ const AVFilter ff_vf_fade = { .init = init, .priv_size = sizeof(FadeContext), .priv_class = &fade_class, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_fade_inputs), FILTER_OUTPUTS(avfilter_vf_fade_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_fftdnoiz.c b/libavfilter/vf_fftdnoiz.c index 110674d5a1..e5b1156b9b 100644 --- a/libavfilter/vf_fftdnoiz.c +++ b/libavfilter/vf_fftdnoiz.c @@ -685,9 +685,9 @@ const AVFilter ff_vf_fftdnoiz = { .priv_size = sizeof(FFTdnoizContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(fftdnoiz_inputs), FILTER_OUTPUTS(fftdnoiz_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &fftdnoiz_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/vf_fftfilt.c b/libavfilter/vf_fftfilt.c index b1b657596d..3f044ec157 100644 --- a/libavfilter/vf_fftfilt.c +++ b/libavfilter/vf_fftfilt.c @@ -430,7 +430,7 @@ const AVFilter ff_vf_fftfilt = { .priv_class = &fftfilt_class, FILTER_INPUTS(fftfilt_inputs), FILTER_OUTPUTS(fftfilt_outputs), - .query_formats = query_formats, + FILTER_QUERY_FUNC(query_formats), .init = initialize, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, diff --git a/libavfilter/vf_fieldhint.c b/libavfilter/vf_fieldhint.c index c41f2ef751..e4513dddfa 100644 --- a/libavfilter/vf_fieldhint.c +++ b/libavfilter/vf_fieldhint.c @@ -296,7 +296,7 @@ const AVFilter ff_vf_fieldhint = { .priv_class = &fieldhint_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_fieldmatch.c b/libavfilter/vf_fieldmatch.c index 45285eade7..ab027b80eb 100644 --- a/libavfilter/vf_fieldmatch.c +++ b/libavfilter/vf_fieldmatch.c @@ -1042,13 +1042,13 @@ static const AVFilterPad fieldmatch_outputs[] = { const AVFilter ff_vf_fieldmatch = { .name = "fieldmatch", .description = NULL_IF_CONFIG_SMALL("Field matching for inverse telecine."), - .query_formats = query_formats, .priv_size = sizeof(FieldMatchContext), .init = fieldmatch_init, .activate = activate, .uninit = fieldmatch_uninit, .inputs = NULL, FILTER_OUTPUTS(fieldmatch_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &fieldmatch_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, }; diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c index 40bfd6549f..85b6688fb3 100644 --- a/libavfilter/vf_fieldorder.c +++ b/libavfilter/vf_fieldorder.c @@ -181,8 +181,8 @@ const AVFilter ff_vf_fieldorder = { .description = NULL_IF_CONFIG_SMALL("Set the field order."), .priv_size = sizeof(FieldOrderContext), .priv_class = &fieldorder_class, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_fieldorder_inputs), FILTER_OUTPUTS(avfilter_vf_fieldorder_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_fillborders.c b/libavfilter/vf_fillborders.c index 4a799422b4..88955736d5 100644 --- a/libavfilter/vf_fillborders.c +++ b/libavfilter/vf_fillborders.c @@ -723,9 +723,9 @@ const AVFilter ff_vf_fillborders = { .description = NULL_IF_CONFIG_SMALL("Fill borders of the input video."), .priv_size = sizeof(FillBordersContext), .priv_class = &fillborders_class, - .query_formats = query_formats, FILTER_INPUTS(fillborders_inputs), FILTER_OUTPUTS(fillborders_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = process_command, }; diff --git a/libavfilter/vf_find_rect.c b/libavfilter/vf_find_rect.c index 6c126af721..32d9a8a67a 100644 --- a/libavfilter/vf_find_rect.c +++ b/libavfilter/vf_find_rect.c @@ -305,8 +305,8 @@ const AVFilter ff_vf_find_rect = { .priv_size = sizeof(FOCContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(foc_inputs), FILTER_OUTPUTS(foc_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &find_rect_class, }; diff --git a/libavfilter/vf_floodfill.c b/libavfilter/vf_floodfill.c index 5f2a4f4392..2e98fb5b71 100644 --- a/libavfilter/vf_floodfill.c +++ b/libavfilter/vf_floodfill.c @@ -418,9 +418,9 @@ const AVFilter ff_vf_floodfill = { .description = NULL_IF_CONFIG_SMALL("Fill area with same color with another color."), .priv_size = sizeof(FloodfillContext), .priv_class = &floodfill_class, - .query_formats = query_formats, .uninit = uninit, FILTER_INPUTS(floodfill_inputs), FILTER_OUTPUTS(floodfill_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index 0a5c739db6..7e15c43086 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -166,13 +166,13 @@ const AVFilter ff_vf_format = { .init = init, .uninit = uninit, - .query_formats = query_formats, - .priv_size = sizeof(FormatContext), .priv_class = &format_class, FILTER_INPUTS(avfilter_vf_format_inputs), FILTER_OUTPUTS(avfilter_vf_format_outputs), + + FILTER_QUERY_FUNC(query_formats), }; #endif /* CONFIG_FORMAT_FILTER */ @@ -201,11 +201,11 @@ const AVFilter ff_vf_noformat = { .init = init, .uninit = uninit, - .query_formats = query_formats, - .priv_size = sizeof(FormatContext), FILTER_INPUTS(avfilter_vf_noformat_inputs), FILTER_OUTPUTS(avfilter_vf_noformat_outputs), + + FILTER_QUERY_FUNC(query_formats), }; #endif /* CONFIG_NOFORMAT_FILTER */ diff --git a/libavfilter/vf_framepack.c b/libavfilter/vf_framepack.c index 73c973036a..eb6fb70ae7 100644 --- a/libavfilter/vf_framepack.c +++ b/libavfilter/vf_framepack.c @@ -469,9 +469,9 @@ const AVFilter ff_vf_framepack = { .description = NULL_IF_CONFIG_SMALL("Generate a frame packed stereoscopic video."), .priv_size = sizeof(FramepackContext), .priv_class = &framepack_class, - .query_formats = query_formats, FILTER_INPUTS(framepack_inputs), FILTER_OUTPUTS(framepack_outputs), + FILTER_QUERY_FUNC(query_formats), .activate = activate, .uninit = framepack_uninit, }; diff --git a/libavfilter/vf_framerate.c b/libavfilter/vf_framerate.c index 0f9994e1ac..fff5b2232a 100644 --- a/libavfilter/vf_framerate.c +++ b/libavfilter/vf_framerate.c @@ -444,9 +444,9 @@ const AVFilter ff_vf_framerate = { .priv_class = &framerate_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(framerate_inputs), FILTER_OUTPUTS(framerate_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, .activate = activate, }; diff --git a/libavfilter/vf_freezedetect.c b/libavfilter/vf_freezedetect.c index 152ffdbe30..0852cc3472 100644 --- a/libavfilter/vf_freezedetect.c +++ b/libavfilter/vf_freezedetect.c @@ -222,8 +222,8 @@ const AVFilter ff_vf_freezedetect = { .priv_size = sizeof(FreezeDetectContext), .priv_class = &freezedetect_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(freezedetect_inputs), FILTER_OUTPUTS(freezedetect_outputs), + FILTER_QUERY_FUNC(query_formats), .activate = activate, }; diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index 827f9c7082..9cd0098e73 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -414,13 +414,13 @@ static const AVFilterPad avfilter_vf_frei0r_outputs[] = { const AVFilter ff_vf_frei0r = { .name = "frei0r", .description = NULL_IF_CONFIG_SMALL("Apply a frei0r effect."), - .query_formats = query_formats, .init = filter_init, .uninit = uninit, .priv_size = sizeof(Frei0rContext), .priv_class = &frei0r_class, FILTER_INPUTS(avfilter_vf_frei0r_inputs), FILTER_OUTPUTS(avfilter_vf_frei0r_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; @@ -505,7 +505,7 @@ const AVFilter ff_vsrc_frei0r_src = { .priv_class = &frei0r_src_class, .init = source_init, .uninit = uninit, - .query_formats = query_formats, .inputs = NULL, FILTER_OUTPUTS(avfilter_vsrc_frei0r_src_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_fspp.c b/libavfilter/vf_fspp.c index 238dbcb429..622614c071 100644 --- a/libavfilter/vf_fspp.c +++ b/libavfilter/vf_fspp.c @@ -667,9 +667,9 @@ const AVFilter ff_vf_fspp = { .description = NULL_IF_CONFIG_SMALL("Apply Fast Simple Post-processing filter."), .priv_size = sizeof(FSPPContext), .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(fspp_inputs), FILTER_OUTPUTS(fspp_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &fspp_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/vf_gblur.c b/libavfilter/vf_gblur.c index ad48eae672..eb83360dfe 100644 --- a/libavfilter/vf_gblur.c +++ b/libavfilter/vf_gblur.c @@ -415,9 +415,9 @@ const AVFilter ff_vf_gblur = { .priv_size = sizeof(GBlurContext), .priv_class = &gblur_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(gblur_inputs), FILTER_OUTPUTS(gblur_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c index 1dc59dc1fa..eef1ac0958 100644 --- a/libavfilter/vf_geq.c +++ b/libavfilter/vf_geq.c @@ -489,9 +489,9 @@ const AVFilter ff_vf_geq = { .priv_size = sizeof(GEQContext), .init = geq_init, .uninit = geq_uninit, - .query_formats = geq_query_formats, FILTER_INPUTS(geq_inputs), FILTER_OUTPUTS(geq_outputs), + FILTER_QUERY_FUNC(geq_query_formats), .priv_class = &geq_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c index 6171e75a28..5eb346cd90 100644 --- a/libavfilter/vf_gradfun.c +++ b/libavfilter/vf_gradfun.c @@ -253,8 +253,8 @@ const AVFilter ff_vf_gradfun = { .priv_class = &gradfun_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_gradfun_inputs), FILTER_OUTPUTS(avfilter_vf_gradfun_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_grayworld.c b/libavfilter/vf_grayworld.c index fd424527e2..d3a935ebe3 100644 --- a/libavfilter/vf_grayworld.c +++ b/libavfilter/vf_grayworld.c @@ -329,9 +329,9 @@ const AVFilter ff_vf_grayworld = { .description = NULL_IF_CONFIG_SMALL("Adjust white balance using LAB gray world algorithm"), .priv_size = sizeof(GrayWorldContext), .priv_class = &grayworld_class, - .query_formats = query_formats, FILTER_INPUTS(grayworld_inputs), FILTER_OUTPUTS(grayworld_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .uninit = uninit, }; diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c index 6720213219..ea33f5fee4 100644 --- a/libavfilter/vf_guided.c +++ b/libavfilter/vf_guided.c @@ -488,12 +488,12 @@ const AVFilter ff_vf_guided = { .description = NULL_IF_CONFIG_SMALL("Apply Guided filter."), .init = init, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(GuidedContext), .priv_class = &guided_class, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(guided_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = process_command, diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index fa3fd72bd9..0362660679 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -249,8 +249,8 @@ const AVFilter ff_vf_hflip = { .description = NULL_IF_CONFIG_SMALL("Horizontally flip the input video."), .priv_size = sizeof(FlipContext), .priv_class = &hflip_class, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_hflip_inputs), FILTER_OUTPUTS(avfilter_vf_hflip_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_histeq.c b/libavfilter/vf_histeq.c index d37dc07389..e08315c50c 100644 --- a/libavfilter/vf_histeq.c +++ b/libavfilter/vf_histeq.c @@ -270,9 +270,9 @@ const AVFilter ff_vf_histeq = { .description = NULL_IF_CONFIG_SMALL("Apply global color histogram equalization."), .priv_size = sizeof(HisteqContext), .init = init, - .query_formats = query_formats, FILTER_INPUTS(histeq_inputs), FILTER_OUTPUTS(histeq_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &histeq_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index ff79d2130c..52ef26d9b6 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -504,9 +504,9 @@ const AVFilter ff_vf_histogram = { .name = "histogram", .description = NULL_IF_CONFIG_SMALL("Compute and draw a histogram."), .priv_size = sizeof(HistogramContext), - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &histogram_class, }; @@ -546,9 +546,9 @@ const AVFilter ff_vf_thistogram = { .name = "thistogram", .description = NULL_IF_CONFIG_SMALL("Compute and draw a temporal histogram."), .priv_size = sizeof(HistogramContext), - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .uninit = uninit, .priv_class = &thistogram_class, }; diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c index f11fc46ae5..6621ea8846 100644 --- a/libavfilter/vf_hqdn3d.c +++ b/libavfilter/vf_hqdn3d.c @@ -400,9 +400,9 @@ const AVFilter ff_vf_hqdn3d = { .priv_class = &hqdn3d_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_hqdn3d_inputs), FILTER_OUTPUTS(avfilter_vf_hqdn3d_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; diff --git a/libavfilter/vf_hqx.c b/libavfilter/vf_hqx.c index 8adb1524b0..7f4dc7af37 100644 --- a/libavfilter/vf_hqx.c +++ b/libavfilter/vf_hqx.c @@ -554,9 +554,9 @@ const AVFilter ff_vf_hqx = { .description = NULL_IF_CONFIG_SMALL("Scale the input by 2, 3 or 4 using the hq*x magnification algorithm."), .priv_size = sizeof(HQXContext), .init = init, - .query_formats = query_formats, FILTER_INPUTS(hqx_inputs), FILTER_OUTPUTS(hqx_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &hqx_class, .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_hsvkey.c b/libavfilter/vf_hsvkey.c index 2f2f037714..30dcbfc029 100644 --- a/libavfilter/vf_hsvkey.c +++ b/libavfilter/vf_hsvkey.c @@ -331,9 +331,9 @@ const AVFilter ff_vf_hsvkey = { .description = NULL_IF_CONFIG_SMALL("Turns a certain HSV range into transparency. Operates on YUV colors."), .priv_size = sizeof(HSVKeyContext), .priv_class = &hsvkey_class, - .query_formats = query_formats, FILTER_INPUTS(hsvkey_inputs), FILTER_OUTPUTS(hsvkey_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; @@ -372,9 +372,9 @@ const AVFilter ff_vf_hsvhold = { .description = NULL_IF_CONFIG_SMALL("Turns a certain HSV range into gray."), .priv_size = sizeof(HSVKeyContext), .priv_class = &hsvhold_class, - .query_formats = query_formats, FILTER_INPUTS(hsvhold_inputs), FILTER_OUTPUTS(hsvhold_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_hue.c b/libavfilter/vf_hue.c index c35722eb4b..a9f96a02f7 100644 --- a/libavfilter/vf_hue.c +++ b/libavfilter/vf_hue.c @@ -517,10 +517,10 @@ const AVFilter ff_vf_hue = { .priv_size = sizeof(HueContext), .init = init, .uninit = uninit, - .query_formats = query_formats, .process_command = process_command, FILTER_INPUTS(hue_inputs), FILTER_OUTPUTS(hue_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &hue_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_hwdownload.c b/libavfilter/vf_hwdownload.c index 5bd63a8a8f..5ef23cb5d4 100644 --- a/libavfilter/vf_hwdownload.c +++ b/libavfilter/vf_hwdownload.c @@ -193,10 +193,10 @@ const AVFilter ff_vf_hwdownload = { .name = "hwdownload", .description = NULL_IF_CONFIG_SMALL("Download a hardware frame to a normal frame"), .uninit = hwdownload_uninit, - .query_formats = hwdownload_query_formats, .priv_size = sizeof(HWDownloadContext), .priv_class = &hwdownload_class, FILTER_INPUTS(hwdownload_inputs), FILTER_OUTPUTS(hwdownload_outputs), + FILTER_QUERY_FUNC(hwdownload_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_hwmap.c b/libavfilter/vf_hwmap.c index be29261223..2e03dfc1fe 100644 --- a/libavfilter/vf_hwmap.c +++ b/libavfilter/vf_hwmap.c @@ -423,8 +423,8 @@ const AVFilter ff_vf_hwmap = { .uninit = hwmap_uninit, .priv_size = sizeof(HWMapContext), .priv_class = &hwmap_class, - .query_formats = hwmap_query_formats, FILTER_INPUTS(hwmap_inputs), FILTER_OUTPUTS(hwmap_outputs), + FILTER_QUERY_FUNC(hwmap_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_hwupload.c b/libavfilter/vf_hwupload.c index 4cbc621af3..dbc41734cc 100644 --- a/libavfilter/vf_hwupload.c +++ b/libavfilter/vf_hwupload.c @@ -252,10 +252,10 @@ const AVFilter ff_vf_hwupload = { .name = "hwupload", .description = NULL_IF_CONFIG_SMALL("Upload a normal frame to a hardware frame"), .uninit = hwupload_uninit, - .query_formats = hwupload_query_formats, .priv_size = sizeof(HWUploadContext), .priv_class = &hwupload_class, FILTER_INPUTS(hwupload_inputs), FILTER_OUTPUTS(hwupload_outputs), + FILTER_QUERY_FUNC(hwupload_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_hwupload_cuda.c b/libavfilter/vf_hwupload_cuda.c index 31c1cdbddb..f5fe3ddbbe 100644 --- a/libavfilter/vf_hwupload_cuda.c +++ b/libavfilter/vf_hwupload_cuda.c @@ -188,13 +188,13 @@ const AVFilter ff_vf_hwupload_cuda = { .init = cudaupload_init, .uninit = cudaupload_uninit, - .query_formats = cudaupload_query_formats, - .priv_size = sizeof(CudaUploadContext), .priv_class = &cudaupload_class, FILTER_INPUTS(cudaupload_inputs), FILTER_OUTPUTS(cudaupload_outputs), + FILTER_QUERY_FUNC(cudaupload_query_formats), + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_hysteresis.c b/libavfilter/vf_hysteresis.c index 0346465e43..abdf224f83 100644 --- a/libavfilter/vf_hysteresis.c +++ b/libavfilter/vf_hysteresis.c @@ -374,10 +374,10 @@ const AVFilter ff_vf_hysteresis = { .preinit = hysteresis_framesync_preinit, .priv_size = sizeof(HysteresisContext), .uninit = uninit, - .query_formats = query_formats, .activate = activate, FILTER_INPUTS(hysteresis_inputs), FILTER_OUTPUTS(hysteresis_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &hysteresis_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/vf_identity.c b/libavfilter/vf_identity.c index 5f0b4e9834..22ee744c2d 100644 --- a/libavfilter/vf_identity.c +++ b/libavfilter/vf_identity.c @@ -411,12 +411,12 @@ const AVFilter ff_vf_identity = { .preinit = identity_framesync_preinit, .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .priv_size = sizeof(IdentityContext), .priv_class = &identity_class, FILTER_INPUTS(identity_inputs), FILTER_OUTPUTS(identity_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; @@ -433,12 +433,12 @@ const AVFilter ff_vf_msad = { .preinit = msad_framesync_preinit, .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .priv_size = sizeof(IdentityContext), .priv_class = &msad_class, FILTER_INPUTS(identity_inputs), FILTER_OUTPUTS(identity_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c index e006e72da9..5048b1ae46 100644 --- a/libavfilter/vf_idet.c +++ b/libavfilter/vf_idet.c @@ -441,8 +441,8 @@ const AVFilter ff_vf_idet = { .priv_size = sizeof(IDETContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(idet_inputs), FILTER_OUTPUTS(idet_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &idet_class, }; diff --git a/libavfilter/vf_il.c b/libavfilter/vf_il.c index 38ef1ac47a..e1c380a2cf 100644 --- a/libavfilter/vf_il.c +++ b/libavfilter/vf_il.c @@ -194,9 +194,9 @@ const AVFilter ff_vf_il = { .name = "il", .description = NULL_IF_CONFIG_SMALL("Deinterleave or interleave fields."), .priv_size = sizeof(IlContext), - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &il_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = ff_filter_process_command, diff --git a/libavfilter/vf_kerndeint.c b/libavfilter/vf_kerndeint.c index 85b426d0b0..5d3e32a3ce 100644 --- a/libavfilter/vf_kerndeint.c +++ b/libavfilter/vf_kerndeint.c @@ -308,7 +308,7 @@ const AVFilter ff_vf_kerndeint = { .priv_size = sizeof(KerndeintContext), .priv_class = &kerndeint_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(kerndeint_inputs), FILTER_OUTPUTS(kerndeint_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_lagfun.c b/libavfilter/vf_lagfun.c index fee371b25f..0b400524ed 100644 --- a/libavfilter/vf_lagfun.c +++ b/libavfilter/vf_lagfun.c @@ -220,10 +220,10 @@ const AVFilter ff_vf_lagfun = { .description = NULL_IF_CONFIG_SMALL("Slowly update darker pixels."), .priv_size = sizeof(LagfunContext), .priv_class = &lagfun_class, - .query_formats = query_formats, .uninit = uninit, FILTER_OUTPUTS(outputs), FILTER_INPUTS(inputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_lenscorrection.c b/libavfilter/vf_lenscorrection.c index 1140e1d484..fc13ffd4c2 100644 --- a/libavfilter/vf_lenscorrection.c +++ b/libavfilter/vf_lenscorrection.c @@ -357,9 +357,9 @@ const AVFilter ff_vf_lenscorrection = { .name = "lenscorrection", .description = NULL_IF_CONFIG_SMALL("Rectify the image by correcting for lens distortion."), .priv_size = sizeof(LenscorrectionCtx), - .query_formats = query_formats, FILTER_INPUTS(lenscorrection_inputs), FILTER_OUTPUTS(lenscorrection_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &lenscorrection_class, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/vf_lensfun.c b/libavfilter/vf_lensfun.c index 3837500481..c9a62ccee7 100644 --- a/libavfilter/vf_lensfun.c +++ b/libavfilter/vf_lensfun.c @@ -534,9 +534,9 @@ const AVFilter ff_vf_lensfun = { .priv_size = sizeof(LensfunContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(lensfun_inputs), FILTER_OUTPUTS(lensfun_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &lensfun_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c index f886395ab7..2f45f70fd4 100644 --- a/libavfilter/vf_libopencv.c +++ b/libavfilter/vf_libopencv.c @@ -427,9 +427,9 @@ const AVFilter ff_vf_ocv = { .description = NULL_IF_CONFIG_SMALL("Apply transform using libopencv."), .priv_size = sizeof(OCVContext), .priv_class = &ocv_class, - .query_formats = query_formats, .init = init, .uninit = uninit, FILTER_INPUTS(avfilter_vf_ocv_inputs), FILTER_OUTPUTS(avfilter_vf_ocv_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index 00b2661f5e..db008d5c05 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -362,10 +362,10 @@ const AVFilter ff_vf_libvmaf = { .preinit = libvmaf_framesync_preinit, .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .priv_size = sizeof(LIBVMAFContext), .priv_class = &libvmaf_class, FILTER_INPUTS(libvmaf_inputs), FILTER_OUTPUTS(libvmaf_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_limiter.c b/libavfilter/vf_limiter.c index 022b9ebf39..cd21fd0319 100644 --- a/libavfilter/vf_limiter.c +++ b/libavfilter/vf_limiter.c @@ -261,9 +261,9 @@ const AVFilter ff_vf_limiter = { .priv_size = sizeof(LimiterContext), .priv_class = &limiter_class, .init = init, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; diff --git a/libavfilter/vf_lumakey.c b/libavfilter/vf_lumakey.c index b3bfb0a278..9c3329925c 100644 --- a/libavfilter/vf_lumakey.c +++ b/libavfilter/vf_lumakey.c @@ -202,9 +202,9 @@ const AVFilter ff_vf_lumakey = { .description = NULL_IF_CONFIG_SMALL("Turns a certain luma into transparency."), .priv_size = sizeof(LumakeyContext), .priv_class = &lumakey_class, - .query_formats = query_formats, FILTER_INPUTS(lumakey_inputs), FILTER_OUTPUTS(lumakey_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index d335fd6c39..64668039d1 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -595,9 +595,9 @@ static const AVFilterPad outputs[] = { .priv_size = sizeof(LutContext), \ .init = name_##_init, \ .uninit = uninit, \ - .query_formats = query_formats, \ FILTER_INPUTS(inputs), \ FILTER_OUTPUTS(outputs), \ + FILTER_QUERY_FUNC(query_formats), \ .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | \ AVFILTER_FLAG_SLICE_THREADS, \ .process_command = process_command, \ diff --git a/libavfilter/vf_lut2.c b/libavfilter/vf_lut2.c index 9fde3a08ee..868c0496fa 100644 --- a/libavfilter/vf_lut2.c +++ b/libavfilter/vf_lut2.c @@ -566,10 +566,10 @@ const AVFilter ff_vf_lut2 = { .priv_size = sizeof(LUT2Context), .priv_class = &lut2_class, .uninit = uninit, - .query_formats = query_formats, .activate = activate, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, @@ -655,11 +655,11 @@ const AVFilter ff_vf_tlut2 = { .description = NULL_IF_CONFIG_SMALL("Compute and apply a lookup table from two successive frames."), .priv_size = sizeof(LUT2Context), .priv_class = &tlut2_class, - .query_formats = query_formats, .init = init, .uninit = uninit, FILTER_INPUTS(tlut2_inputs), FILTER_OUTPUTS(tlut2_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 9fbda833b9..bb26bb3068 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -1364,9 +1364,9 @@ const AVFilter ff_vf_lut3d = { .priv_size = sizeof(LUT3DContext), .init = lut3d_init, .uninit = lut3d_uninit, - .query_formats = query_formats, FILTER_INPUTS(lut3d_inputs), FILTER_OUTPUTS(lut3d_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &lut3d_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, @@ -1627,10 +1627,10 @@ const AVFilter ff_vf_haldclut = { .preinit = haldclut_framesync_preinit, .init = haldclut_init, .uninit = haldclut_uninit, - .query_formats = query_formats, .activate = activate, FILTER_INPUTS(haldclut_inputs), FILTER_OUTPUTS(haldclut_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &haldclut_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, @@ -2291,9 +2291,9 @@ const AVFilter ff_vf_lut1d = { .description = NULL_IF_CONFIG_SMALL("Adjust colors using a 1D LUT."), .priv_size = sizeof(LUT1DContext), .init = lut1d_init, - .query_formats = query_formats, FILTER_INPUTS(lut1d_inputs), FILTER_OUTPUTS(lut1d_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &lut1d_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = lut1d_process_command, diff --git a/libavfilter/vf_maskedclamp.c b/libavfilter/vf_maskedclamp.c index f46c5c9934..6152ec5405 100644 --- a/libavfilter/vf_maskedclamp.c +++ b/libavfilter/vf_maskedclamp.c @@ -315,9 +315,9 @@ const AVFilter ff_vf_maskedclamp = { .priv_size = sizeof(MaskedClampContext), .uninit = uninit, .activate = activate, - .query_formats = query_formats, FILTER_INPUTS(maskedclamp_inputs), FILTER_OUTPUTS(maskedclamp_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &maskedclamp_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, diff --git a/libavfilter/vf_maskedmerge.c b/libavfilter/vf_maskedmerge.c index 26b54830b8..e3b3f01ef8 100644 --- a/libavfilter/vf_maskedmerge.c +++ b/libavfilter/vf_maskedmerge.c @@ -315,10 +315,10 @@ const AVFilter ff_vf_maskedmerge = { .description = NULL_IF_CONFIG_SMALL("Merge first stream with second stream using third stream as mask."), .priv_size = sizeof(MaskedMergeContext), .uninit = uninit, - .query_formats = query_formats, .activate = activate, FILTER_INPUTS(maskedmerge_inputs), FILTER_OUTPUTS(maskedmerge_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &maskedmerge_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, diff --git a/libavfilter/vf_maskedminmax.c b/libavfilter/vf_maskedminmax.c index 82b0eca8f0..9f4846b08b 100644 --- a/libavfilter/vf_maskedminmax.c +++ b/libavfilter/vf_maskedminmax.c @@ -328,9 +328,9 @@ const AVFilter ff_vf_maskedmin = { .init = maskedmin_init, .uninit = uninit, .activate = activate, - .query_formats = query_formats, FILTER_INPUTS(maskedminmax_inputs), FILTER_OUTPUTS(maskedminmax_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; @@ -342,9 +342,9 @@ const AVFilter ff_vf_maskedmax = { .priv_size = sizeof(MaskedMinMaxContext), .uninit = uninit, .activate = activate, - .query_formats = query_formats, FILTER_INPUTS(maskedminmax_inputs), FILTER_OUTPUTS(maskedminmax_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_maskedthreshold.c b/libavfilter/vf_maskedthreshold.c index a8f717364e..4f23f8369e 100644 --- a/libavfilter/vf_maskedthreshold.c +++ b/libavfilter/vf_maskedthreshold.c @@ -285,9 +285,9 @@ const AVFilter ff_vf_maskedthreshold = { .priv_size = sizeof(MaskedThresholdContext), .uninit = uninit, .activate = activate, - .query_formats = query_formats, FILTER_INPUTS(maskedthreshold_inputs), FILTER_OUTPUTS(maskedthreshold_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_maskfun.c b/libavfilter/vf_maskfun.c index 5f323385ee..4209205489 100644 --- a/libavfilter/vf_maskfun.c +++ b/libavfilter/vf_maskfun.c @@ -311,10 +311,10 @@ const AVFilter ff_vf_maskfun = { .name = "maskfun", .description = NULL_IF_CONFIG_SMALL("Create Mask."), .priv_size = sizeof(MaskFunContext), - .query_formats = query_formats, .uninit = uninit, FILTER_INPUTS(maskfun_inputs), FILTER_OUTPUTS(maskfun_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &maskfun_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index 88c8b25a6d..fcbc0257b9 100644 --- a/libavfilter/vf_mcdeint.c +++ b/libavfilter/vf_mcdeint.c @@ -304,8 +304,8 @@ const AVFilter ff_vf_mcdeint = { .description = NULL_IF_CONFIG_SMALL("Apply motion compensating deinterlacing."), .priv_size = sizeof(MCDeintContext), .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(mcdeint_inputs), FILTER_OUTPUTS(mcdeint_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &mcdeint_class, }; diff --git a/libavfilter/vf_median.c b/libavfilter/vf_median.c index 61a2656244..8fd5f95ad6 100644 --- a/libavfilter/vf_median.c +++ b/libavfilter/vf_median.c @@ -288,9 +288,9 @@ const AVFilter ff_vf_median = { .priv_size = sizeof(MedianContext), .priv_class = &median_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(median_inputs), FILTER_OUTPUTS(median_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c index 638a7065f2..fc1d50a72e 100644 --- a/libavfilter/vf_mergeplanes.c +++ b/libavfilter/vf_mergeplanes.c @@ -296,9 +296,9 @@ const AVFilter ff_vf_mergeplanes = { .priv_class = &mergeplanes_class, .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(mergeplanes_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, }; diff --git a/libavfilter/vf_mestimate.c b/libavfilter/vf_mestimate.c index 578c3be812..2856d121c3 100644 --- a/libavfilter/vf_mestimate.c +++ b/libavfilter/vf_mestimate.c @@ -368,7 +368,7 @@ const AVFilter ff_vf_mestimate = { .priv_size = sizeof(MEContext), .priv_class = &mestimate_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(mestimate_inputs), FILTER_OUTPUTS(mestimate_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_midequalizer.c b/libavfilter/vf_midequalizer.c index 069bf47174..93d1ebff2d 100644 --- a/libavfilter/vf_midequalizer.c +++ b/libavfilter/vf_midequalizer.c @@ -373,10 +373,10 @@ const AVFilter ff_vf_midequalizer = { .description = NULL_IF_CONFIG_SMALL("Apply Midway Equalization."), .priv_size = sizeof(MidEqualizerContext), .uninit = uninit, - .query_formats = query_formats, .activate = activate, FILTER_INPUTS(midequalizer_inputs), FILTER_OUTPUTS(midequalizer_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &midequalizer_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c index f4e791a19e..28ba2633d1 100644 --- a/libavfilter/vf_minterpolate.c +++ b/libavfilter/vf_minterpolate.c @@ -1258,7 +1258,7 @@ const AVFilter ff_vf_minterpolate = { .priv_size = sizeof(MIContext), .priv_class = &minterpolate_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(minterpolate_inputs), FILTER_OUTPUTS(minterpolate_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c index 83aedcdc31..db3e69679a 100644 --- a/libavfilter/vf_misc_vaapi.c +++ b/libavfilter/vf_misc_vaapi.c @@ -238,9 +238,9 @@ const AVFilter ff_vf_denoise_vaapi = { .priv_size = sizeof(DenoiseVAAPIContext), .init = &denoise_vaapi_init, .uninit = &ff_vaapi_vpp_ctx_uninit, - .query_formats = &ff_vaapi_vpp_query_formats, FILTER_INPUTS(misc_vaapi_inputs), FILTER_OUTPUTS(misc_vaapi_outputs), + FILTER_QUERY_FUNC(&ff_vaapi_vpp_query_formats), .priv_class = &denoise_vaapi_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; @@ -251,9 +251,9 @@ const AVFilter ff_vf_sharpness_vaapi = { .priv_size = sizeof(SharpnessVAAPIContext), .init = &sharpness_vaapi_init, .uninit = &ff_vaapi_vpp_ctx_uninit, - .query_formats = &ff_vaapi_vpp_query_formats, FILTER_INPUTS(misc_vaapi_inputs), FILTER_OUTPUTS(misc_vaapi_outputs), + FILTER_QUERY_FUNC(&ff_vaapi_vpp_query_formats), .priv_class = &sharpness_vaapi_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index 13032e466a..27455657f2 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -353,8 +353,8 @@ const AVFilter ff_vf_mix = { .description = NULL_IF_CONFIG_SMALL("Mix video inputs."), .priv_size = sizeof(MixContext), .priv_class = &mix_class, - .query_formats = query_formats, FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .init = init, .uninit = uninit, .activate = activate, @@ -430,9 +430,9 @@ const AVFilter ff_vf_tmix = { .description = NULL_IF_CONFIG_SMALL("Mix successive video frames."), .priv_size = sizeof(MixContext), .priv_class = &tmix_class, - .query_formats = query_formats, FILTER_OUTPUTS(outputs), FILTER_INPUTS(inputs), + FILTER_QUERY_FUNC(query_formats), .init = init, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/vf_monochrome.c b/libavfilter/vf_monochrome.c index 5792e27cb9..b2db6eb864 100644 --- a/libavfilter/vf_monochrome.c +++ b/libavfilter/vf_monochrome.c @@ -298,9 +298,9 @@ const AVFilter ff_vf_monochrome = { .description = NULL_IF_CONFIG_SMALL("Convert video to gray using custom color filter."), .priv_size = sizeof(MonochromeContext), .priv_class = &monochrome_class, - .query_formats = query_formats, FILTER_INPUTS(monochrome_inputs), FILTER_OUTPUTS(monochrome_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_morpho.c b/libavfilter/vf_morpho.c index 13d58c4194..574f248153 100644 --- a/libavfilter/vf_morpho.c +++ b/libavfilter/vf_morpho.c @@ -1019,9 +1019,9 @@ const AVFilter ff_vf_morpho = { .priv_class = &morpho_class, .activate = activate, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(morpho_inputs), FILTER_OUTPUTS(morpho_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_mpdecimate.c b/libavfilter/vf_mpdecimate.c index 8d515396f3..c48cff8a4b 100644 --- a/libavfilter/vf_mpdecimate.c +++ b/libavfilter/vf_mpdecimate.c @@ -244,7 +244,7 @@ const AVFilter ff_vf_mpdecimate = { .uninit = uninit, .priv_size = sizeof(DecimateContext), .priv_class = &mpdecimate_class, - .query_formats = query_formats, FILTER_INPUTS(mpdecimate_inputs), FILTER_OUTPUTS(mpdecimate_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_neighbor.c b/libavfilter/vf_neighbor.c index c35a8a7917..8723350a63 100644 --- a/libavfilter/vf_neighbor.c +++ b/libavfilter/vf_neighbor.c @@ -360,9 +360,9 @@ const AVFilter ff_vf_##name_ = { \ .description = NULL_IF_CONFIG_SMALL(description_), \ .priv_class = &priv_class_##_class, \ .priv_size = sizeof(NContext), \ - .query_formats = query_formats, \ FILTER_INPUTS(neighbor_inputs), \ FILTER_OUTPUTS(neighbor_outputs), \ + FILTER_QUERY_FUNC(query_formats), \ .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC| \ AVFILTER_FLAG_SLICE_THREADS, \ .process_command = ff_filter_process_command, \ diff --git a/libavfilter/vf_neighbor_opencl.c b/libavfilter/vf_neighbor_opencl.c index 68becfe143..93c5fbbadc 100644 --- a/libavfilter/vf_neighbor_opencl.c +++ b/libavfilter/vf_neighbor_opencl.c @@ -278,9 +278,9 @@ const AVFilter ff_vf_erosion_opencl = { .priv_class = &erosion_opencl_class, .init = &ff_opencl_filter_init, .uninit = &neighbor_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, FILTER_INPUTS(neighbor_opencl_inputs), FILTER_OUTPUTS(neighbor_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; @@ -306,7 +306,7 @@ const AVFilter ff_vf_dilation_opencl = { .priv_class = &dilation_opencl_class, .init = &ff_opencl_filter_init, .uninit = &neighbor_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), FILTER_INPUTS(neighbor_opencl_inputs), FILTER_OUTPUTS(neighbor_opencl_outputs), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, diff --git a/libavfilter/vf_nlmeans.c b/libavfilter/vf_nlmeans.c index 20107022c4..30a845e93c 100644 --- a/libavfilter/vf_nlmeans.c +++ b/libavfilter/vf_nlmeans.c @@ -578,9 +578,9 @@ const AVFilter ff_vf_nlmeans = { .priv_size = sizeof(NLMeansContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(nlmeans_inputs), FILTER_OUTPUTS(nlmeans_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &nlmeans_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_nlmeans_opencl.c b/libavfilter/vf_nlmeans_opencl.c index 6e28f4be7a..6d6ac8136c 100644 --- a/libavfilter/vf_nlmeans_opencl.c +++ b/libavfilter/vf_nlmeans_opencl.c @@ -434,8 +434,8 @@ const AVFilter ff_vf_nlmeans_opencl = { .priv_class = &nlmeans_opencl_class, .init = &ff_opencl_filter_init, .uninit = &nlmeans_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, FILTER_INPUTS(nlmeans_opencl_inputs), FILTER_OUTPUTS(nlmeans_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_nnedi.c b/libavfilter/vf_nnedi.c index 944736a279..03f0541292 100644 --- a/libavfilter/vf_nnedi.c +++ b/libavfilter/vf_nnedi.c @@ -1159,9 +1159,9 @@ const AVFilter ff_vf_nnedi = { .priv_class = &nnedi_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_noise.c b/libavfilter/vf_noise.c index 50febf230d..0e3e72b6b5 100644 --- a/libavfilter/vf_noise.c +++ b/libavfilter/vf_noise.c @@ -342,9 +342,9 @@ const AVFilter ff_vf_noise = { .priv_size = sizeof(NoiseContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(noise_inputs), FILTER_OUTPUTS(noise_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &noise_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_normalize.c b/libavfilter/vf_normalize.c index 26f8e2f426..e185cd998c 100644 --- a/libavfilter/vf_normalize.c +++ b/libavfilter/vf_normalize.c @@ -531,9 +531,9 @@ const AVFilter ff_vf_normalize = { .priv_size = sizeof(NormalizeContext), .priv_class = &normalize_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_ocr.c b/libavfilter/vf_ocr.c index 7691f41932..bc088f0299 100644 --- a/libavfilter/vf_ocr.c +++ b/libavfilter/vf_ocr.c @@ -146,9 +146,9 @@ const AVFilter ff_vf_ocr = { .description = NULL_IF_CONFIG_SMALL("Optical Character Recognition."), .priv_size = sizeof(OCRContext), .priv_class = &ocr_class, - .query_formats = query_formats, .init = init, .uninit = uninit, FILTER_INPUTS(ocr_inputs), FILTER_OUTPUTS(ocr_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index afa694e100..2966cef09c 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -1112,11 +1112,11 @@ const AVFilter ff_vf_overlay = { .uninit = uninit, .priv_size = sizeof(OverlayContext), .priv_class = &overlay_class, - .query_formats = query_formats, .activate = activate, .process_command = process_command, FILTER_INPUTS(avfilter_vf_overlay_inputs), FILTER_OUTPUTS(avfilter_vf_overlay_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_overlay_cuda.c b/libavfilter/vf_overlay_cuda.c index 4c0719871b..38387780dc 100644 --- a/libavfilter/vf_overlay_cuda.c +++ b/libavfilter/vf_overlay_cuda.c @@ -583,9 +583,9 @@ const AVFilter ff_vf_overlay_cuda = { .init = &overlay_cuda_init, .uninit = &overlay_cuda_uninit, .activate = &overlay_cuda_activate, - .query_formats = &overlay_cuda_query_formats, FILTER_INPUTS(overlay_cuda_inputs), FILTER_OUTPUTS(overlay_cuda_outputs), + FILTER_QUERY_FUNC(&overlay_cuda_query_formats), .preinit = overlay_cuda_framesync_preinit, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_overlay_opencl.c b/libavfilter/vf_overlay_opencl.c index 4f1d6bbdd2..b17b60c980 100644 --- a/libavfilter/vf_overlay_opencl.c +++ b/libavfilter/vf_overlay_opencl.c @@ -317,9 +317,9 @@ const AVFilter ff_vf_overlay_opencl = { .priv_class = &overlay_opencl_class, .init = &overlay_opencl_init, .uninit = &overlay_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, .activate = &overlay_opencl_activate, FILTER_INPUTS(overlay_opencl_inputs), FILTER_OUTPUTS(overlay_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_overlay_qsv.c b/libavfilter/vf_overlay_qsv.c index 76bad4a984..7e76b39aa9 100644 --- a/libavfilter/vf_overlay_qsv.c +++ b/libavfilter/vf_overlay_qsv.c @@ -417,13 +417,13 @@ const AVFilter ff_vf_overlay_qsv = { .name = "overlay_qsv", .description = NULL_IF_CONFIG_SMALL("Quick Sync Video overlay."), .priv_size = sizeof(QSVOverlayContext), - .query_formats = overlay_qsv_query_formats, .preinit = overlay_qsv_framesync_preinit, .init = overlay_qsv_init, .uninit = overlay_qsv_uninit, .activate = activate, FILTER_INPUTS(overlay_qsv_inputs), FILTER_OUTPUTS(overlay_qsv_outputs), + FILTER_QUERY_FUNC(overlay_qsv_query_formats), .priv_class = &overlay_qsv_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_overlay_vulkan.c b/libavfilter/vf_overlay_vulkan.c index 1815709d82..5573e5e57d 100644 --- a/libavfilter/vf_overlay_vulkan.c +++ b/libavfilter/vf_overlay_vulkan.c @@ -479,10 +479,10 @@ const AVFilter ff_vf_overlay_vulkan = { .priv_size = sizeof(OverlayVulkanContext), .init = &overlay_vulkan_init, .uninit = &overlay_vulkan_uninit, - .query_formats = &ff_vk_filter_query_formats, .activate = &overlay_vulkan_activate, FILTER_INPUTS(overlay_vulkan_inputs), FILTER_OUTPUTS(overlay_vulkan_outputs), + FILTER_QUERY_FUNC(&ff_vk_filter_query_formats), .priv_class = &overlay_vulkan_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_owdenoise.c b/libavfilter/vf_owdenoise.c index 80ce3ca654..f0d2740ca1 100644 --- a/libavfilter/vf_owdenoise.c +++ b/libavfilter/vf_owdenoise.c @@ -365,9 +365,9 @@ const AVFilter ff_vf_owdenoise = { .description = NULL_IF_CONFIG_SMALL("Denoise using wavelets."), .priv_size = sizeof(OWDenoiseContext), .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(owdenoise_inputs), FILTER_OUTPUTS(owdenoise_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &owdenoise_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index ba1728f820..738e255621 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -456,7 +456,7 @@ const AVFilter ff_vf_pad = { .description = NULL_IF_CONFIG_SMALL("Pad the input video."), .priv_size = sizeof(PadContext), .priv_class = &pad_class, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_pad_inputs), FILTER_OUTPUTS(avfilter_vf_pad_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_pad_opencl.c b/libavfilter/vf_pad_opencl.c index 9e6fc94097..4e52556e9e 100644 --- a/libavfilter/vf_pad_opencl.c +++ b/libavfilter/vf_pad_opencl.c @@ -388,8 +388,8 @@ const AVFilter ff_vf_pad_opencl = { .priv_class = &pad_opencl_class, .init = &ff_opencl_filter_init, .uninit = &pad_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, FILTER_INPUTS(pad_opencl_inputs), FILTER_OUTPUTS(pad_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE }; diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c index 4c2fbd36d7..4b262dfa1c 100644 --- a/libavfilter/vf_palettegen.c +++ b/libavfilter/vf_palettegen.c @@ -573,8 +573,8 @@ const AVFilter ff_vf_palettegen = { .description = NULL_IF_CONFIG_SMALL("Find the optimal palette for a given stream."), .priv_size = sizeof(PaletteGenContext), .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(palettegen_inputs), FILTER_OUTPUTS(palettegen_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &palettegen_class, }; diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index f9bc28f7d0..09e67de042 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -1132,11 +1132,11 @@ const AVFilter ff_vf_paletteuse = { .name = "paletteuse", .description = NULL_IF_CONFIG_SMALL("Use a palette to downsample an input video stream."), .priv_size = sizeof(PaletteUseContext), - .query_formats = query_formats, .init = init, .uninit = uninit, .activate = activate, FILTER_INPUTS(paletteuse_inputs), FILTER_OUTPUTS(paletteuse_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &paletteuse_class, }; diff --git a/libavfilter/vf_perspective.c b/libavfilter/vf_perspective.c index 5fa661862f..216674d0d6 100644 --- a/libavfilter/vf_perspective.c +++ b/libavfilter/vf_perspective.c @@ -513,9 +513,9 @@ const AVFilter ff_vf_perspective = { .priv_size = sizeof(PerspectiveContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(perspective_inputs), FILTER_OUTPUTS(perspective_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &perspective_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_phase.c b/libavfilter/vf_phase.c index cab6174d72..6229754663 100644 --- a/libavfilter/vf_phase.c +++ b/libavfilter/vf_phase.c @@ -236,9 +236,9 @@ const AVFilter ff_vf_phase = { .priv_size = sizeof(PhaseContext), .priv_class = &phase_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(phase_inputs), FILTER_OUTPUTS(phase_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_photosensitivity.c b/libavfilter/vf_photosensitivity.c index a5a86133f1..18a210c292 100644 --- a/libavfilter/vf_photosensitivity.c +++ b/libavfilter/vf_photosensitivity.c @@ -332,7 +332,7 @@ const AVFilter ff_vf_photosensitivity = { .priv_size = sizeof(PhotosensitivityContext), .priv_class = &photosensitivity_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_pp.c b/libavfilter/vf_pp.c index c27c2029c0..77a23f1388 100644 --- a/libavfilter/vf_pp.c +++ b/libavfilter/vf_pp.c @@ -192,9 +192,9 @@ const AVFilter ff_vf_pp = { .priv_size = sizeof(PPFilterContext), .init = pp_init, .uninit = pp_uninit, - .query_formats = pp_query_formats, FILTER_INPUTS(pp_inputs), FILTER_OUTPUTS(pp_outputs), + FILTER_QUERY_FUNC(pp_query_formats), .process_command = pp_process_command, .priv_class = &pp_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, diff --git a/libavfilter/vf_pp7.c b/libavfilter/vf_pp7.c index 74f20365e0..d645c40ee9 100644 --- a/libavfilter/vf_pp7.c +++ b/libavfilter/vf_pp7.c @@ -401,9 +401,9 @@ const AVFilter ff_vf_pp7 = { .description = NULL_IF_CONFIG_SMALL("Apply Postprocessing 7 filter."), .priv_size = sizeof(PP7Context), .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(pp7_inputs), FILTER_OUTPUTS(pp7_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &pp7_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/vf_premultiply.c b/libavfilter/vf_premultiply.c index ada249fc55..4b60de7b7b 100644 --- a/libavfilter/vf_premultiply.c +++ b/libavfilter/vf_premultiply.c @@ -824,10 +824,10 @@ const AVFilter ff_vf_premultiply = { .priv_size = sizeof(PreMultiplyContext), .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(premultiply_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &premultiply_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_DYNAMIC_INPUTS | @@ -845,10 +845,10 @@ const AVFilter ff_vf_unpremultiply = { .priv_size = sizeof(PreMultiplyContext), .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(premultiply_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/vf_procamp_vaapi.c b/libavfilter/vf_procamp_vaapi.c index 758546abf9..4a3b9d0766 100644 --- a/libavfilter/vf_procamp_vaapi.c +++ b/libavfilter/vf_procamp_vaapi.c @@ -235,9 +235,9 @@ const AVFilter ff_vf_procamp_vaapi = { .priv_size = sizeof(ProcampVAAPIContext), .init = &procamp_vaapi_init, .uninit = &ff_vaapi_vpp_ctx_uninit, - .query_formats = &ff_vaapi_vpp_query_formats, FILTER_INPUTS(procamp_vaapi_inputs), FILTER_OUTPUTS(procamp_vaapi_outputs), + FILTER_QUERY_FUNC(&ff_vaapi_vpp_query_formats), .priv_class = &procamp_vaapi_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_program_opencl.c b/libavfilter/vf_program_opencl.c index 1ffb18bde1..7615e5c7c7 100644 --- a/libavfilter/vf_program_opencl.c +++ b/libavfilter/vf_program_opencl.c @@ -364,10 +364,10 @@ const AVFilter ff_vf_program_opencl = { .preinit = &program_opencl_framesync_preinit, .init = &program_opencl_init, .uninit = &program_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, .activate = &program_opencl_activate, .inputs = NULL, FILTER_OUTPUTS(program_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; @@ -415,9 +415,9 @@ const AVFilter ff_vsrc_openclsrc = { .priv_class = &openclsrc_class, .init = &program_opencl_init, .uninit = &program_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, .inputs = NULL, FILTER_OUTPUTS(openclsrc_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_pseudocolor.c b/libavfilter/vf_pseudocolor.c index 44cb01ef9a..fd84a0a819 100644 --- a/libavfilter/vf_pseudocolor.c +++ b/libavfilter/vf_pseudocolor.c @@ -922,9 +922,9 @@ const AVFilter ff_vf_pseudocolor = { .priv_size = sizeof(PseudoColorContext), .priv_class = &pseudocolor_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index a4ce9a4c4c..e6ae0afb6c 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -465,11 +465,11 @@ const AVFilter ff_vf_psnr = { .preinit = psnr_framesync_preinit, .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .priv_size = sizeof(PSNRContext), .priv_class = &psnr_class, FILTER_INPUTS(psnr_inputs), FILTER_OUTPUTS(psnr_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_pullup.c b/libavfilter/vf_pullup.c index 57e86e9c89..4b02e8c255 100644 --- a/libavfilter/vf_pullup.c +++ b/libavfilter/vf_pullup.c @@ -765,7 +765,7 @@ const AVFilter ff_vf_pullup = { .priv_size = sizeof(PullupContext), .priv_class = &pullup_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(pullup_inputs), FILTER_OUTPUTS(pullup_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_readeia608.c b/libavfilter/vf_readeia608.c index 5ce2e75213..5412ff5ae7 100644 --- a/libavfilter/vf_readeia608.c +++ b/libavfilter/vf_readeia608.c @@ -555,9 +555,9 @@ const AVFilter ff_vf_readeia608 = { .description = NULL_IF_CONFIG_SMALL("Read EIA-608 Closed Caption codes from input video and write them to frame metadata."), .priv_size = sizeof(ReadEIA608Context), .priv_class = &readeia608_class, - .query_formats = query_formats, FILTER_INPUTS(readeia608_inputs), FILTER_OUTPUTS(readeia608_outputs), + FILTER_QUERY_FUNC(query_formats), .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, diff --git a/libavfilter/vf_readvitc.c b/libavfilter/vf_readvitc.c index d117a81284..eb8d11f7f2 100644 --- a/libavfilter/vf_readvitc.c +++ b/libavfilter/vf_readvitc.c @@ -249,5 +249,5 @@ const AVFilter ff_vf_readvitc = { FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), .init = init, - .query_formats = query_formats, + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_remap.c b/libavfilter/vf_remap.c index ec925e8948..f536580a90 100644 --- a/libavfilter/vf_remap.c +++ b/libavfilter/vf_remap.c @@ -398,10 +398,10 @@ const AVFilter ff_vf_remap = { .description = NULL_IF_CONFIG_SMALL("Remap pixels."), .priv_size = sizeof(RemapContext), .uninit = uninit, - .query_formats = query_formats, .activate = activate, FILTER_INPUTS(remap_inputs), FILTER_OUTPUTS(remap_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &remap_class, .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_removegrain.c b/libavfilter/vf_removegrain.c index 1d1d756057..f87d141ae7 100644 --- a/libavfilter/vf_removegrain.c +++ b/libavfilter/vf_removegrain.c @@ -647,9 +647,9 @@ const AVFilter ff_vf_removegrain = { .name = "removegrain", .description = NULL_IF_CONFIG_SMALL("Remove grain."), .priv_size = sizeof(RemoveGrainContext), - .query_formats = query_formats, FILTER_INPUTS(removegrain_inputs), FILTER_OUTPUTS(removegrain_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &removegrain_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_removelogo.c b/libavfilter/vf_removelogo.c index acf09960ff..0bfec406c0 100644 --- a/libavfilter/vf_removelogo.c +++ b/libavfilter/vf_removelogo.c @@ -574,9 +574,9 @@ const AVFilter ff_vf_removelogo = { .priv_size = sizeof(RemovelogoContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(removelogo_inputs), FILTER_OUTPUTS(removelogo_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &removelogo_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_repeatfields.c b/libavfilter/vf_repeatfields.c index ca4bd97b2f..f2aca5a059 100644 --- a/libavfilter/vf_repeatfields.c +++ b/libavfilter/vf_repeatfields.c @@ -183,5 +183,5 @@ const AVFilter ff_vf_repeatfields = { .uninit = uninit, FILTER_INPUTS(repeatfields_inputs), FILTER_OUTPUTS(repeatfields_outputs), - .query_formats = query_formats, + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_rotate.c b/libavfilter/vf_rotate.c index c74e1adff9..4f3f3959b0 100644 --- a/libavfilter/vf_rotate.c +++ b/libavfilter/vf_rotate.c @@ -601,10 +601,10 @@ const AVFilter ff_vf_rotate = { .priv_size = sizeof(RotContext), .init = init, .uninit = uninit, - .query_formats = query_formats, .process_command = process_command, FILTER_INPUTS(rotate_inputs), FILTER_OUTPUTS(rotate_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &rotate_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_sab.c b/libavfilter/vf_sab.c index bc7e7e30ed..1e696fed5f 100644 --- a/libavfilter/vf_sab.c +++ b/libavfilter/vf_sab.c @@ -324,9 +324,9 @@ const AVFilter ff_vf_sab = { .priv_size = sizeof(SabContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(sab_inputs), FILTER_OUTPUTS(sab_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &sab_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index a1902a13cf..5411289894 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -996,11 +996,11 @@ const AVFilter ff_vf_scale = { .description = NULL_IF_CONFIG_SMALL("Scale the input video size and/or convert the image format."), .init_dict = init_dict, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(ScaleContext), .priv_class = &scale_class, FILTER_INPUTS(avfilter_vf_scale_inputs), FILTER_OUTPUTS(avfilter_vf_scale_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, }; @@ -1037,10 +1037,10 @@ const AVFilter ff_vf_scale2ref = { .description = NULL_IF_CONFIG_SMALL("Scale the input video size and/or convert the image format to the given reference."), .init_dict = init_dict, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(ScaleContext), .priv_class = &scale_class, FILTER_INPUTS(avfilter_vf_scale2ref_inputs), FILTER_OUTPUTS(avfilter_vf_scale2ref_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, }; diff --git a/libavfilter/vf_scale_cuda.c b/libavfilter/vf_scale_cuda.c index fa7b799e0e..93ff839b5a 100644 --- a/libavfilter/vf_scale_cuda.c +++ b/libavfilter/vf_scale_cuda.c @@ -641,7 +641,6 @@ const AVFilter ff_vf_scale_cuda = { .init = cudascale_init, .uninit = cudascale_uninit, - .query_formats = cudascale_query_formats, .priv_size = sizeof(CUDAScaleContext), .priv_class = &cudascale_class, @@ -649,5 +648,7 @@ const AVFilter ff_vf_scale_cuda = { FILTER_INPUTS(cudascale_inputs), FILTER_OUTPUTS(cudascale_outputs), + FILTER_QUERY_FUNC(cudascale_query_formats), + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_scale_npp.c b/libavfilter/vf_scale_npp.c index 3e25c2c95f..11ac5ad245 100644 --- a/libavfilter/vf_scale_npp.c +++ b/libavfilter/vf_scale_npp.c @@ -594,7 +594,6 @@ const AVFilter ff_vf_scale_npp = { .init = nppscale_init, .uninit = nppscale_uninit, - .query_formats = nppscale_query_formats, .priv_size = sizeof(NPPScaleContext), .priv_class = &nppscale_class, @@ -602,5 +601,7 @@ const AVFilter ff_vf_scale_npp = { FILTER_INPUTS(nppscale_inputs), FILTER_OUTPUTS(nppscale_outputs), + FILTER_QUERY_FUNC(nppscale_query_formats), + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_scale_qsv.c b/libavfilter/vf_scale_qsv.c index 5a37cef63d..ab497a9d45 100644 --- a/libavfilter/vf_scale_qsv.c +++ b/libavfilter/vf_scale_qsv.c @@ -671,7 +671,6 @@ const AVFilter ff_vf_scale_qsv = { .init = qsvscale_init, .uninit = qsvscale_uninit, - .query_formats = qsvscale_query_formats, .priv_size = sizeof(QSVScaleContext), .priv_class = &qsvscale_class, @@ -679,5 +678,7 @@ const AVFilter ff_vf_scale_qsv = { FILTER_INPUTS(qsvscale_inputs), FILTER_OUTPUTS(qsvscale_outputs), + FILTER_QUERY_FUNC(qsvscale_query_formats), + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c index 554b7bac4f..a371077ee0 100644 --- a/libavfilter/vf_scale_vaapi.c +++ b/libavfilter/vf_scale_vaapi.c @@ -285,9 +285,9 @@ const AVFilter ff_vf_scale_vaapi = { .priv_size = sizeof(ScaleVAAPIContext), .init = &scale_vaapi_init, .uninit = &ff_vaapi_vpp_ctx_uninit, - .query_formats = &ff_vaapi_vpp_query_formats, FILTER_INPUTS(scale_vaapi_inputs), FILTER_OUTPUTS(scale_vaapi_outputs), + FILTER_QUERY_FUNC(&ff_vaapi_vpp_query_formats), .priv_class = &scale_vaapi_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_scale_vulkan.c b/libavfilter/vf_scale_vulkan.c index 4eb4fe5664..af9677e46a 100644 --- a/libavfilter/vf_scale_vulkan.c +++ b/libavfilter/vf_scale_vulkan.c @@ -528,9 +528,9 @@ const AVFilter ff_vf_scale_vulkan = { .priv_size = sizeof(ScaleVulkanContext), .init = &ff_vk_filter_init, .uninit = &scale_vulkan_uninit, - .query_formats = &ff_vk_filter_query_formats, FILTER_INPUTS(scale_vulkan_inputs), FILTER_OUTPUTS(scale_vulkan_outputs), + FILTER_QUERY_FUNC(&ff_vk_filter_query_formats), .priv_class = &scale_vulkan_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_scdet.c b/libavfilter/vf_scdet.c index b8017a00e5..a14d9c2aeb 100644 --- a/libavfilter/vf_scdet.c +++ b/libavfilter/vf_scdet.c @@ -211,8 +211,8 @@ const AVFilter ff_vf_scdet = { .priv_size = sizeof(SCDetContext), .priv_class = &scdet_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(scdet_inputs), FILTER_OUTPUTS(scdet_outputs), + FILTER_QUERY_FUNC(query_formats), .activate = activate, }; diff --git a/libavfilter/vf_scroll.c b/libavfilter/vf_scroll.c index 5e9cf76095..8b8e8580f7 100644 --- a/libavfilter/vf_scroll.c +++ b/libavfilter/vf_scroll.c @@ -211,9 +211,9 @@ const AVFilter ff_vf_scroll = { .description = NULL_IF_CONFIG_SMALL("Scroll input video."), .priv_size = sizeof(ScrollContext), .priv_class = &scroll_class, - .query_formats = query_formats, FILTER_INPUTS(scroll_inputs), FILTER_OUTPUTS(scroll_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_selectivecolor.c b/libavfilter/vf_selectivecolor.c index 398d4bec0d..247b88117d 100644 --- a/libavfilter/vf_selectivecolor.c +++ b/libavfilter/vf_selectivecolor.c @@ -489,9 +489,9 @@ const AVFilter ff_vf_selectivecolor = { .name = "selectivecolor", .description = NULL_IF_CONFIG_SMALL("Apply CMYK adjustments to specific color ranges."), .priv_size = sizeof(SelectiveColorContext), - .query_formats = query_formats, FILTER_INPUTS(selectivecolor_inputs), FILTER_OUTPUTS(selectivecolor_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &selectivecolor_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_shear.c b/libavfilter/vf_shear.c index e58084d3cd..9c291bc152 100644 --- a/libavfilter/vf_shear.c +++ b/libavfilter/vf_shear.c @@ -317,9 +317,9 @@ const AVFilter ff_vf_shear = { .description = NULL_IF_CONFIG_SMALL("Shear transform the input image."), .priv_size = sizeof(ShearContext), .init = init, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &shear_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, diff --git a/libavfilter/vf_showpalette.c b/libavfilter/vf_showpalette.c index 569f5040d0..0405bdb947 100644 --- a/libavfilter/vf_showpalette.c +++ b/libavfilter/vf_showpalette.c @@ -114,8 +114,8 @@ const AVFilter ff_vf_showpalette = { .name = "showpalette", .description = NULL_IF_CONFIG_SMALL("Display frame palette."), .priv_size = sizeof(ShowPaletteContext), - .query_formats = query_formats, FILTER_INPUTS(showpalette_inputs), FILTER_OUTPUTS(showpalette_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &showpalette_class, }; diff --git a/libavfilter/vf_shufflepixels.c b/libavfilter/vf_shufflepixels.c index aa8c726971..e89e3c027f 100644 --- a/libavfilter/vf_shufflepixels.c +++ b/libavfilter/vf_shufflepixels.c @@ -449,9 +449,9 @@ const AVFilter ff_vf_shufflepixels = { .description = NULL_IF_CONFIG_SMALL("Shuffle video pixels."), .priv_size = sizeof(ShufflePixelsContext), .priv_class = &shufflepixels_class, - .query_formats = query_formats, .uninit = uninit, FILTER_INPUTS(shufflepixels_inputs), FILTER_OUTPUTS(shufflepixels_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_shuffleplanes.c b/libavfilter/vf_shuffleplanes.c index 3ca4aa976d..b2f64ad076 100644 --- a/libavfilter/vf_shuffleplanes.c +++ b/libavfilter/vf_shuffleplanes.c @@ -165,8 +165,8 @@ const AVFilter ff_vf_shuffleplanes = { .description = NULL_IF_CONFIG_SMALL("Shuffle video planes."), .priv_size = sizeof(ShufflePlanesContext), .priv_class = &shuffleplanes_class, - .query_formats = query_formats, FILTER_INPUTS(shuffleplanes_inputs), FILTER_OUTPUTS(shuffleplanes_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_signalstats.c b/libavfilter/vf_signalstats.c index 1bfa7f158d..aa54543bcf 100644 --- a/libavfilter/vf_signalstats.c +++ b/libavfilter/vf_signalstats.c @@ -1012,10 +1012,10 @@ const AVFilter ff_vf_signalstats = { .description = "Generate statistics from video analysis.", .init = init, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(SignalstatsContext), FILTER_INPUTS(signalstats_inputs), FILTER_OUTPUTS(signalstats_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &signalstats_class, .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c index 784869a7ae..03b53f9a4c 100644 --- a/libavfilter/vf_signature.c +++ b/libavfilter/vf_signature.c @@ -760,8 +760,8 @@ const AVFilter ff_vf_signature = { .priv_class = &signature_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_OUTPUTS(signature_outputs), .inputs = NULL, + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, }; diff --git a/libavfilter/vf_smartblur.c b/libavfilter/vf_smartblur.c index 24aa533fd7..6737f60c9f 100644 --- a/libavfilter/vf_smartblur.c +++ b/libavfilter/vf_smartblur.c @@ -292,9 +292,9 @@ const AVFilter ff_vf_smartblur = { .priv_size = sizeof(SmartblurContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(smartblur_inputs), FILTER_OUTPUTS(smartblur_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &smartblur_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index b9b5f7bc78..32a3c59987 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -501,9 +501,9 @@ const AVFilter ff_vf_spp = { .priv_size = sizeof(SPPContext), .preinit = preinit, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(spp_inputs), FILTER_OUTPUTS(spp_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, .priv_class = &spp_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, diff --git a/libavfilter/vf_sr.c b/libavfilter/vf_sr.c index f4fc84d251..f528fdcad4 100644 --- a/libavfilter/vf_sr.c +++ b/libavfilter/vf_sr.c @@ -198,8 +198,8 @@ const AVFilter ff_vf_sr = { .priv_size = sizeof(SRContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(sr_inputs), FILTER_OUTPUTS(sr_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &sr_class, }; diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index 14d7ab3ec6..ba0f18df8a 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -591,11 +591,11 @@ const AVFilter ff_vf_ssim = { .preinit = ssim_framesync_preinit, .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .priv_size = sizeof(SSIMContext), .priv_class = &ssim_class, FILTER_INPUTS(ssim_inputs), FILTER_OUTPUTS(ssim_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_stack.c b/libavfilter/vf_stack.c index 338154e715..f584e8349b 100644 --- a/libavfilter/vf_stack.c +++ b/libavfilter/vf_stack.c @@ -402,8 +402,8 @@ const AVFilter ff_vf_hstack = { .description = NULL_IF_CONFIG_SMALL("Stack video inputs horizontally."), .priv_class = &stack_class, .priv_size = sizeof(StackContext), - .query_formats = query_formats, FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .init = init, .uninit = uninit, .activate = activate, @@ -419,8 +419,8 @@ const AVFilter ff_vf_vstack = { .description = NULL_IF_CONFIG_SMALL("Stack video inputs vertically."), .priv_class = &stack_class, .priv_size = sizeof(StackContext), - .query_formats = query_formats, FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .init = init, .uninit = uninit, .activate = activate, @@ -446,8 +446,8 @@ const AVFilter ff_vf_xstack = { .description = NULL_IF_CONFIG_SMALL("Stack video inputs into custom layout."), .priv_size = sizeof(StackContext), .priv_class = &xstack_class, - .query_formats = query_formats, FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .init = init, .uninit = uninit, .activate = activate, diff --git a/libavfilter/vf_stereo3d.c b/libavfilter/vf_stereo3d.c index 10aade7bd9..0ba18861af 100644 --- a/libavfilter/vf_stereo3d.c +++ b/libavfilter/vf_stereo3d.c @@ -1111,9 +1111,9 @@ const AVFilter ff_vf_stereo3d = { .description = NULL_IF_CONFIG_SMALL("Convert video stereoscopic 3D view."), .priv_size = sizeof(Stereo3DContext), .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(stereo3d_inputs), FILTER_OUTPUTS(stereo3d_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &stereo3d_class, .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index f08a7fba9d..377160c72b 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -251,9 +251,9 @@ const AVFilter ff_vf_ass = { .priv_size = sizeof(AssContext), .init = init_ass, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(ass_inputs), FILTER_OUTPUTS(ass_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &ass_class, }; #endif @@ -484,9 +484,9 @@ const AVFilter ff_vf_subtitles = { .priv_size = sizeof(AssContext), .init = init_subtitles, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(ass_inputs), FILTER_OUTPUTS(ass_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &subtitles_class, }; #endif diff --git a/libavfilter/vf_super2xsai.c b/libavfilter/vf_super2xsai.c index 3e99d53cee..11532925bb 100644 --- a/libavfilter/vf_super2xsai.c +++ b/libavfilter/vf_super2xsai.c @@ -359,8 +359,8 @@ const AVFilter ff_vf_super2xsai = { .name = "super2xsai", .description = NULL_IF_CONFIG_SMALL("Scale the input by 2x using the Super2xSaI pixel art algorithm."), .priv_size = sizeof(Super2xSaIContext), - .query_formats = query_formats, FILTER_INPUTS(super2xsai_inputs), FILTER_OUTPUTS(super2xsai_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_swaprect.c b/libavfilter/vf_swaprect.c index e03603fe5a..b76e3bb99d 100644 --- a/libavfilter/vf_swaprect.c +++ b/libavfilter/vf_swaprect.c @@ -237,10 +237,10 @@ const AVFilter ff_vf_swaprect = { .description = NULL_IF_CONFIG_SMALL("Swap 2 rectangular objects in video."), .priv_size = sizeof(SwapRectContext), .priv_class = &swaprect_class, - .query_formats = query_formats, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_swapuv.c b/libavfilter/vf_swapuv.c index 0c285e547c..27d083f026 100644 --- a/libavfilter/vf_swapuv.c +++ b/libavfilter/vf_swapuv.c @@ -112,10 +112,10 @@ static const AVFilterPad swapuv_outputs[] = { const AVFilter ff_vf_swapuv = { .name = "swapuv", .description = NULL_IF_CONFIG_SMALL("Swap U and V components."), - .query_formats = query_formats, .priv_size = sizeof(SwapUVContext), .priv_class = &swapuv_class, FILTER_INPUTS(swapuv_inputs), FILTER_OUTPUTS(swapuv_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_telecine.c b/libavfilter/vf_telecine.c index eaaddf734d..e8de63bbcf 100644 --- a/libavfilter/vf_telecine.c +++ b/libavfilter/vf_telecine.c @@ -287,7 +287,7 @@ const AVFilter ff_vf_telecine = { .priv_class = &telecine_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(telecine_inputs), FILTER_OUTPUTS(telecine_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_threshold.c b/libavfilter/vf_threshold.c index b6b93fef6f..65da3734b0 100644 --- a/libavfilter/vf_threshold.c +++ b/libavfilter/vf_threshold.c @@ -352,10 +352,10 @@ const AVFilter ff_vf_threshold = { .priv_size = sizeof(ThresholdContext), .priv_class = &threshold_class, .uninit = uninit, - .query_formats = query_formats, .activate = activate, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_thumbnail.c b/libavfilter/vf_thumbnail.c index acfc0ce481..0d3de1afbf 100644 --- a/libavfilter/vf_thumbnail.c +++ b/libavfilter/vf_thumbnail.c @@ -288,9 +288,9 @@ const AVFilter ff_vf_thumbnail = { .priv_size = sizeof(ThumbContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(thumbnail_inputs), FILTER_OUTPUTS(thumbnail_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &thumbnail_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_thumbnail_cuda.c b/libavfilter/vf_thumbnail_cuda.c index df9bba22e0..a7a246c959 100644 --- a/libavfilter/vf_thumbnail_cuda.c +++ b/libavfilter/vf_thumbnail_cuda.c @@ -444,9 +444,9 @@ const AVFilter ff_vf_thumbnail_cuda = { .priv_size = sizeof(ThumbnailCudaContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(thumbnail_cuda_inputs), FILTER_OUTPUTS(thumbnail_cuda_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &thumbnail_cuda_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_tile.c b/libavfilter/vf_tile.c index 13bd53bba6..ca2397fb18 100644 --- a/libavfilter/vf_tile.c +++ b/libavfilter/vf_tile.c @@ -288,9 +288,9 @@ const AVFilter ff_vf_tile = { .description = NULL_IF_CONFIG_SMALL("Tile several successive frames together."), .init = init, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(TileContext), FILTER_INPUTS(tile_inputs), FILTER_OUTPUTS(tile_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &tile_class, }; diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index 7c0f00898b..91626192e0 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -555,9 +555,9 @@ const AVFilter ff_vf_tinterlace = { .description = NULL_IF_CONFIG_SMALL("Perform temporal field interlacing."), .priv_size = sizeof(TInterlaceContext), .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(tinterlace_inputs), FILTER_OUTPUTS(tinterlace_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &tinterlace_class, }; @@ -568,8 +568,8 @@ const AVFilter ff_vf_interlace = { .priv_size = sizeof(TInterlaceContext), .init = init_interlace, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(tinterlace_inputs), FILTER_OUTPUTS(tinterlace_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &interlace_class, }; diff --git a/libavfilter/vf_tmidequalizer.c b/libavfilter/vf_tmidequalizer.c index cf9fcf9047..96b12f11a7 100644 --- a/libavfilter/vf_tmidequalizer.c +++ b/libavfilter/vf_tmidequalizer.c @@ -430,9 +430,9 @@ const AVFilter ff_vf_tmidequalizer = { .description = NULL_IF_CONFIG_SMALL("Apply Temporal Midway Equalization."), .priv_size = sizeof(TMidEqualizerContext), .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(tmidequalizer_inputs), FILTER_OUTPUTS(tmidequalizer_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &tmidequalizer_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/vf_tonemap.c b/libavfilter/vf_tonemap.c index 8ea54ecafb..51f56c7386 100644 --- a/libavfilter/vf_tonemap.c +++ b/libavfilter/vf_tonemap.c @@ -337,10 +337,10 @@ const AVFilter ff_vf_tonemap = { .name = "tonemap", .description = NULL_IF_CONFIG_SMALL("Conversion to/from different dynamic ranges."), .init = init, - .query_formats = query_formats, .priv_size = sizeof(TonemapContext), .priv_class = &tonemap_class, FILTER_INPUTS(tonemap_inputs), FILTER_OUTPUTS(tonemap_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_tonemap_opencl.c b/libavfilter/vf_tonemap_opencl.c index f659669159..0e65f16234 100644 --- a/libavfilter/vf_tonemap_opencl.c +++ b/libavfilter/vf_tonemap_opencl.c @@ -544,8 +544,8 @@ const AVFilter ff_vf_tonemap_opencl = { .priv_class = &tonemap_opencl_class, .init = &ff_opencl_filter_init, .uninit = &tonemap_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, FILTER_INPUTS(tonemap_opencl_inputs), FILTER_OUTPUTS(tonemap_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_tonemap_vaapi.c b/libavfilter/vf_tonemap_vaapi.c index a5cf9b0d8d..5a41f14d00 100644 --- a/libavfilter/vf_tonemap_vaapi.c +++ b/libavfilter/vf_tonemap_vaapi.c @@ -407,9 +407,9 @@ const AVFilter ff_vf_tonemap_vaapi = { .priv_size = sizeof(HDRVAAPIContext), .init = &tonemap_vaapi_init, .uninit = &ff_vaapi_vpp_ctx_uninit, - .query_formats = &ff_vaapi_vpp_query_formats, FILTER_INPUTS(tonemap_vaapi_inputs), FILTER_OUTPUTS(tonemap_vaapi_outputs), + FILTER_QUERY_FUNC(&ff_vaapi_vpp_query_formats), .priv_class = &tonemap_vaapi_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_tpad.c b/libavfilter/vf_tpad.c index 59b4a60d7c..e5acece1e4 100644 --- a/libavfilter/vf_tpad.c +++ b/libavfilter/vf_tpad.c @@ -208,9 +208,9 @@ const AVFilter ff_vf_tpad = { .description = NULL_IF_CONFIG_SMALL("Temporarily pad video frames."), .priv_size = sizeof(TPadContext), .priv_class = &tpad_class, - .query_formats = query_formats, .activate = activate, .uninit = uninit, FILTER_INPUTS(tpad_inputs), FILTER_OUTPUTS(tpad_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index 9ed132fc0f..b0354b938f 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -401,8 +401,8 @@ const AVFilter ff_vf_transpose = { .description = NULL_IF_CONFIG_SMALL("Transpose input video."), .priv_size = sizeof(TransContext), .priv_class = &transpose_class, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_transpose_inputs), FILTER_OUTPUTS(avfilter_vf_transpose_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_transpose_npp.c b/libavfilter/vf_transpose_npp.c index 14b9d62488..b05c07f29d 100644 --- a/libavfilter/vf_transpose_npp.c +++ b/libavfilter/vf_transpose_npp.c @@ -475,10 +475,10 @@ const AVFilter ff_vf_transpose_npp = { .description = NULL_IF_CONFIG_SMALL("NVIDIA Performance Primitives video transpose"), .init = npptranspose_init, .uninit = npptranspose_uninit, - .query_formats = npptranspose_query_formats, .priv_size = sizeof(NPPTransposeContext), .priv_class = &npptranspose_class, FILTER_INPUTS(npptranspose_inputs), FILTER_OUTPUTS(npptranspose_outputs), + FILTER_QUERY_FUNC(npptranspose_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_transpose_opencl.c b/libavfilter/vf_transpose_opencl.c index 05e7aa19e0..c275a7d08e 100644 --- a/libavfilter/vf_transpose_opencl.c +++ b/libavfilter/vf_transpose_opencl.c @@ -277,8 +277,8 @@ const AVFilter ff_vf_transpose_opencl = { .priv_class = &transpose_opencl_class, .init = &ff_opencl_filter_init, .uninit = &transpose_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, FILTER_INPUTS(transpose_opencl_inputs), FILTER_OUTPUTS(transpose_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_transpose_vaapi.c b/libavfilter/vf_transpose_vaapi.c index f0d356da71..5f1829dd05 100644 --- a/libavfilter/vf_transpose_vaapi.c +++ b/libavfilter/vf_transpose_vaapi.c @@ -276,9 +276,9 @@ const AVFilter ff_vf_transpose_vaapi = { .priv_size = sizeof(TransposeVAAPIContext), .init = &transpose_vaapi_init, .uninit = &ff_vaapi_vpp_ctx_uninit, - .query_formats = &ff_vaapi_vpp_query_formats, FILTER_INPUTS(transpose_vaapi_inputs), FILTER_OUTPUTS(transpose_vaapi_outputs), + FILTER_QUERY_FUNC(&ff_vaapi_vpp_query_formats), .priv_class = &transpose_vaapi_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index b413133e41..85182910f6 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -359,8 +359,8 @@ const AVFilter ff_vf_unsharp = { .priv_class = &unsharp_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_unsharp_inputs), FILTER_OUTPUTS(avfilter_vf_unsharp_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_unsharp_opencl.c b/libavfilter/vf_unsharp_opencl.c index 129611c70d..d8c0c8dc3b 100644 --- a/libavfilter/vf_unsharp_opencl.c +++ b/libavfilter/vf_unsharp_opencl.c @@ -403,8 +403,8 @@ const AVFilter ff_vf_unsharp_opencl = { .priv_class = &unsharp_opencl_class, .init = &ff_opencl_filter_init, .uninit = &unsharp_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, FILTER_INPUTS(unsharp_opencl_inputs), FILTER_OUTPUTS(unsharp_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_untile.c b/libavfilter/vf_untile.c index 85e1d56d2b..5d7709d68c 100644 --- a/libavfilter/vf_untile.c +++ b/libavfilter/vf_untile.c @@ -182,10 +182,10 @@ const AVFilter ff_vf_untile = { .description = NULL_IF_CONFIG_SMALL("Untile a frame into a sequence of frames."), .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, .priv_size = sizeof(UntileContext), FILTER_INPUTS(untile_inputs), FILTER_OUTPUTS(untile_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &untile_class, }; diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index ba6ae816a8..d9022b1053 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -494,9 +494,9 @@ const AVFilter ff_vf_uspp = { .description = NULL_IF_CONFIG_SMALL("Apply Ultra Simple / Slow Post-processing filter."), .priv_size = sizeof(USPPContext), .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(uspp_inputs), FILTER_OUTPUTS(uspp_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &uspp_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index 6d65127db5..25456ac9f4 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -4997,9 +4997,9 @@ const AVFilter ff_vf_v360 = { .priv_size = sizeof(V360Context), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &v360_class, .flags = AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, diff --git a/libavfilter/vf_vaguedenoiser.c b/libavfilter/vf_vaguedenoiser.c index ea23067110..cfb532ccb7 100644 --- a/libavfilter/vf_vaguedenoiser.c +++ b/libavfilter/vf_vaguedenoiser.c @@ -612,8 +612,8 @@ const AVFilter ff_vf_vaguedenoiser = { .priv_class = &vaguedenoiser_class, .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(vaguedenoiser_inputs), FILTER_OUTPUTS(vaguedenoiser_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_vectorscope.c b/libavfilter/vf_vectorscope.c index b8b406430c..2aec091572 100644 --- a/libavfilter/vf_vectorscope.c +++ b/libavfilter/vf_vectorscope.c @@ -1590,8 +1590,8 @@ const AVFilter ff_vf_vectorscope = { .description = NULL_IF_CONFIG_SMALL("Video vectorscope."), .priv_size = sizeof(VectorscopeContext), .priv_class = &vectorscope_class, - .query_formats = query_formats, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_vibrance.c b/libavfilter/vf_vibrance.c index 7253ebd594..b1f9ecba52 100644 --- a/libavfilter/vf_vibrance.c +++ b/libavfilter/vf_vibrance.c @@ -375,9 +375,9 @@ const AVFilter ff_vf_vibrance = { .description = NULL_IF_CONFIG_SMALL("Boost or alter saturation."), .priv_size = sizeof(VibranceContext), .priv_class = &vibrance_class, - .query_formats = query_formats, FILTER_INPUTS(vibrance_inputs), FILTER_OUTPUTS(vibrance_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_vidstabdetect.c b/libavfilter/vf_vidstabdetect.c index 5e12d31d0e..278d0f15a6 100644 --- a/libavfilter/vf_vidstabdetect.c +++ b/libavfilter/vf_vidstabdetect.c @@ -210,8 +210,8 @@ const AVFilter ff_vf_vidstabdetect = { .priv_size = sizeof(StabData), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_vidstabdetect_inputs), FILTER_OUTPUTS(avfilter_vf_vidstabdetect_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &vidstabdetect_class, }; diff --git a/libavfilter/vf_vidstabtransform.c b/libavfilter/vf_vidstabtransform.c index 3499b9afe4..70fe552b59 100644 --- a/libavfilter/vf_vidstabtransform.c +++ b/libavfilter/vf_vidstabtransform.c @@ -311,8 +311,8 @@ const AVFilter ff_vf_vidstabtransform = { .priv_size = sizeof(TransformContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_vidstabtransform_inputs), FILTER_OUTPUTS(avfilter_vf_vidstabtransform_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &vidstabtransform_class, }; diff --git a/libavfilter/vf_vif.c b/libavfilter/vf_vif.c index ee7c67337d..01851a01bc 100644 --- a/libavfilter/vf_vif.c +++ b/libavfilter/vf_vif.c @@ -637,11 +637,11 @@ const AVFilter ff_vf_vif = { .name = "vif", .description = NULL_IF_CONFIG_SMALL("Calculate the VIF between two video streams."), .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(VIFContext), .priv_class = &vif_class, .activate = activate, FILTER_INPUTS(vif_inputs), FILTER_OUTPUTS(vif_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_vignette.c b/libavfilter/vf_vignette.c index 8e9f196ab9..27772d469c 100644 --- a/libavfilter/vf_vignette.c +++ b/libavfilter/vf_vignette.c @@ -342,9 +342,9 @@ const AVFilter ff_vf_vignette = { .priv_size = sizeof(VignetteContext), .init = init, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(vignette_inputs), FILTER_OUTPUTS(vignette_outputs), + FILTER_QUERY_FUNC(query_formats), .priv_class = &vignette_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c index 67cc012b18..362839735e 100644 --- a/libavfilter/vf_vmafmotion.c +++ b/libavfilter/vf_vmafmotion.c @@ -361,9 +361,9 @@ const AVFilter ff_vf_vmafmotion = { .description = NULL_IF_CONFIG_SMALL("Calculate the VMAF Motion score."), .init = init, .uninit = uninit, - .query_formats = query_formats, .priv_size = sizeof(VMAFMotionContext), .priv_class = &vmafmotion_class, FILTER_INPUTS(vmafmotion_inputs), FILTER_OUTPUTS(vmafmotion_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 22ffe0d7f3..ab58a5777e 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -614,11 +614,11 @@ const AVFilter ff_vf_vpp_qsv = { .name = "vpp_qsv", .description = NULL_IF_CONFIG_SMALL("Quick Sync Video VPP."), .priv_size = sizeof(VPPContext), - .query_formats = query_formats, .init = vpp_init, .uninit = vpp_uninit, FILTER_INPUTS(vpp_inputs), FILTER_OUTPUTS(vpp_outputs), + FILTER_QUERY_FUNC(query_formats), .activate = activate, .priv_class = &vpp_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, diff --git a/libavfilter/vf_w3fdif.c b/libavfilter/vf_w3fdif.c index 9d073e9c34..46f1435582 100644 --- a/libavfilter/vf_w3fdif.c +++ b/libavfilter/vf_w3fdif.c @@ -615,9 +615,9 @@ const AVFilter ff_vf_w3fdif = { .priv_size = sizeof(W3FDIFContext), .priv_class = &w3fdif_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(w3fdif_inputs), FILTER_OUTPUTS(w3fdif_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c index 431740705b..33a3ac08d3 100644 --- a/libavfilter/vf_waveform.c +++ b/libavfilter/vf_waveform.c @@ -3518,9 +3518,9 @@ const AVFilter ff_vf_waveform = { .description = NULL_IF_CONFIG_SMALL("Video waveform monitor."), .priv_size = sizeof(WaveformContext), .priv_class = &waveform_class, - .query_formats = query_formats, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_weave.c b/libavfilter/vf_weave.c index 52fb4c684d..2bd3994e5e 100644 --- a/libavfilter/vf_weave.c +++ b/libavfilter/vf_weave.c @@ -187,10 +187,10 @@ const AVFilter ff_vf_weave = { .description = NULL_IF_CONFIG_SMALL("Weave input video fields into frames."), .priv_size = sizeof(WeaveContext), .priv_class = &weave_class, - .query_formats = query_formats, .uninit = uninit, FILTER_INPUTS(weave_inputs), FILTER_OUTPUTS(weave_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, }; @@ -209,10 +209,10 @@ const AVFilter ff_vf_doubleweave = { .description = NULL_IF_CONFIG_SMALL("Weave input video fields into double number of frames."), .priv_class = &weave_class, .priv_size = sizeof(WeaveContext), - .query_formats = query_formats, .init = init, .uninit = uninit, FILTER_INPUTS(weave_inputs), FILTER_OUTPUTS(weave_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c index bb7b704abb..c799284566 100644 --- a/libavfilter/vf_xbr.c +++ b/libavfilter/vf_xbr.c @@ -425,7 +425,7 @@ const AVFilter ff_vf_xbr = { .description = NULL_IF_CONFIG_SMALL("Scale the input using xBR algorithm."), FILTER_INPUTS(xbr_inputs), FILTER_OUTPUTS(xbr_outputs), - .query_formats = query_formats, + FILTER_QUERY_FUNC(query_formats), .priv_size = sizeof(XBRContext), .priv_class = &xbr_class, .init = init, diff --git a/libavfilter/vf_xfade.c b/libavfilter/vf_xfade.c index b4edcbf1b4..d5506a44a8 100644 --- a/libavfilter/vf_xfade.c +++ b/libavfilter/vf_xfade.c @@ -2001,10 +2001,10 @@ const AVFilter ff_vf_xfade = { .description = NULL_IF_CONFIG_SMALL("Cross fade one video with another video."), .priv_size = sizeof(XFadeContext), .priv_class = &xfade_class, - .query_formats = query_formats, .activate = xfade_activate, .uninit = uninit, FILTER_INPUTS(xfade_inputs), FILTER_OUTPUTS(xfade_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_xfade_opencl.c b/libavfilter/vf_xfade_opencl.c index c24528eb89..f8d90a483f 100644 --- a/libavfilter/vf_xfade_opencl.c +++ b/libavfilter/vf_xfade_opencl.c @@ -428,9 +428,9 @@ const AVFilter ff_vf_xfade_opencl = { .priv_class = &xfade_opencl_class, .init = &ff_opencl_filter_init, .uninit = &xfade_opencl_uninit, - .query_formats = &ff_opencl_filter_query_formats, .activate = &xfade_opencl_activate, FILTER_INPUTS(xfade_opencl_inputs), FILTER_OUTPUTS(xfade_opencl_outputs), + FILTER_QUERY_FUNC(&ff_opencl_filter_query_formats), .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c index a9e3255a2a..2ae4132b44 100644 --- a/libavfilter/vf_xmedian.c +++ b/libavfilter/vf_xmedian.c @@ -395,8 +395,8 @@ const AVFilter ff_vf_xmedian = { .description = NULL_IF_CONFIG_SMALL("Pick median pixels from several video inputs."), .priv_size = sizeof(XMedianContext), .priv_class = &xmedian_class, - .query_formats = query_formats, FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), .preinit = xmedian_framesync_preinit, .init = xmedian_init, .uninit = uninit, @@ -478,9 +478,9 @@ const AVFilter ff_vf_tmedian = { .description = NULL_IF_CONFIG_SMALL("Pick median pixels from successive frames."), .priv_size = sizeof(XMedianContext), .priv_class = &tmedian_class, - .query_formats = query_formats, FILTER_INPUTS(tmedian_inputs), FILTER_OUTPUTS(tmedian_outputs), + FILTER_QUERY_FUNC(query_formats), .init = init, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 8b71e0584d..26d457360a 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -354,8 +354,8 @@ const AVFilter ff_vf_yadif = { .priv_size = sizeof(YADIFContext), .priv_class = &yadif_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(avfilter_vf_yadif_inputs), FILTER_OUTPUTS(avfilter_vf_yadif_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vf_yadif_cuda.c b/libavfilter/vf_yadif_cuda.c index 5ddb9a9324..da1ab5a8ff 100644 --- a/libavfilter/vf_yadif_cuda.c +++ b/libavfilter/vf_yadif_cuda.c @@ -380,9 +380,9 @@ const AVFilter ff_vf_yadif_cuda = { .priv_size = sizeof(DeintCUDAContext), .priv_class = &yadif_cuda_class, .uninit = deint_cuda_uninit, - .query_formats = deint_cuda_query_formats, FILTER_INPUTS(deint_cuda_inputs), FILTER_OUTPUTS(deint_cuda_outputs), + FILTER_QUERY_FUNC(deint_cuda_query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; diff --git a/libavfilter/vf_yaepblur.c b/libavfilter/vf_yaepblur.c index c4e4a1f82d..ed48e20c2d 100644 --- a/libavfilter/vf_yaepblur.c +++ b/libavfilter/vf_yaepblur.c @@ -342,9 +342,9 @@ const AVFilter ff_vf_yaepblur = { .priv_size = sizeof(YAEPContext), .priv_class = &yaepblur_class, .uninit = uninit, - .query_formats = query_formats, FILTER_INPUTS(yaep_inputs), FILTER_OUTPUTS(yaep_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c index 92769f1fd1..58155bc162 100644 --- a/libavfilter/vf_zoompan.c +++ b/libavfilter/vf_zoompan.c @@ -378,8 +378,8 @@ const AVFilter ff_vf_zoompan = { .priv_class = &zoompan_class, .init = init, .uninit = uninit, - .query_formats = query_formats, .activate = activate, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 495545fa52..3f7dba489a 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -939,11 +939,11 @@ const AVFilter ff_vf_zscale = { .name = "zscale", .description = NULL_IF_CONFIG_SMALL("Apply resizing, colorspace and bit depth conversion."), .init = init, - .query_formats = query_formats, .priv_size = sizeof(ZScaleContext), .priv_class = &zscale_class, .uninit = uninit, FILTER_INPUTS(avfilter_vf_zscale_inputs), FILTER_OUTPUTS(avfilter_vf_zscale_outputs), + FILTER_QUERY_FUNC(query_formats), .process_command = process_command, }; diff --git a/libavfilter/vsrc_cellauto.c b/libavfilter/vsrc_cellauto.c index b22e8be836..8f6e02c82d 100644 --- a/libavfilter/vsrc_cellauto.c +++ b/libavfilter/vsrc_cellauto.c @@ -330,7 +330,7 @@ const AVFilter ff_vsrc_cellauto = { .priv_class = &cellauto_class, .init = init, .uninit = uninit, - .query_formats = query_formats, .inputs = NULL, FILTER_OUTPUTS(cellauto_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vsrc_gradients.c b/libavfilter/vsrc_gradients.c index 863cfe9b5e..5563d832d9 100644 --- a/libavfilter/vsrc_gradients.c +++ b/libavfilter/vsrc_gradients.c @@ -299,9 +299,9 @@ const AVFilter ff_vsrc_gradients = { .description = NULL_IF_CONFIG_SMALL("Draw a gradients."), .priv_size = sizeof(GradientsContext), .priv_class = &gradients_class, - .query_formats = query_formats, .inputs = NULL, FILTER_OUTPUTS(gradients_outputs), + FILTER_QUERY_FUNC(query_formats), .activate = activate, .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vsrc_life.c b/libavfilter/vsrc_life.c index 2165d1a70f..38df2a6a57 100644 --- a/libavfilter/vsrc_life.c +++ b/libavfilter/vsrc_life.c @@ -445,7 +445,7 @@ const AVFilter ff_vsrc_life = { .priv_class = &life_class, .init = init, .uninit = uninit, - .query_formats = query_formats, .inputs = NULL, FILTER_OUTPUTS(life_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vsrc_mandelbrot.c b/libavfilter/vsrc_mandelbrot.c index df8584b37c..cf7da01506 100644 --- a/libavfilter/vsrc_mandelbrot.c +++ b/libavfilter/vsrc_mandelbrot.c @@ -422,7 +422,7 @@ const AVFilter ff_vsrc_mandelbrot = { .priv_class = &mandelbrot_class, .init = init, .uninit = uninit, - .query_formats = query_formats, .inputs = NULL, FILTER_OUTPUTS(mandelbrot_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vsrc_mptestsrc.c b/libavfilter/vsrc_mptestsrc.c index f94a78fb84..329af1fe21 100644 --- a/libavfilter/vsrc_mptestsrc.c +++ b/libavfilter/vsrc_mptestsrc.c @@ -359,7 +359,7 @@ const AVFilter ff_vsrc_mptestsrc = { .priv_size = sizeof(MPTestContext), .priv_class = &mptestsrc_class, .init = init, - .query_formats = query_formats, .inputs = NULL, FILTER_OUTPUTS(mptestsrc_outputs), + FILTER_QUERY_FUNC(query_formats), }; diff --git a/libavfilter/vsrc_sierpinski.c b/libavfilter/vsrc_sierpinski.c index d3d136f7ae..a26542be42 100644 --- a/libavfilter/vsrc_sierpinski.c +++ b/libavfilter/vsrc_sierpinski.c @@ -225,8 +225,8 @@ const AVFilter ff_vsrc_sierpinski = { .description = NULL_IF_CONFIG_SMALL("Render a Sierpinski fractal."), .priv_size = sizeof(SierpinskiContext), .priv_class = &sierpinski_class, - .query_formats = query_formats, .inputs = NULL, FILTER_OUTPUTS(sierpinski_outputs), + FILTER_QUERY_FUNC(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, }; diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 414950c442..72d3fd4456 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -273,9 +273,9 @@ const AVFilter ff_vsrc_color = { .init = color_init, .uninit = uninit, .activate = activate, - .query_formats = color_query_formats, .inputs = NULL, FILTER_OUTPUTS(color_outputs), + FILTER_QUERY_FUNC(color_query_formats), .process_command = color_process_command, }; @@ -402,10 +402,10 @@ const AVFilter ff_vsrc_haldclutsrc = { .priv_size = sizeof(TestSourceContext), .init = haldclutsrc_init, .uninit = uninit, - .query_formats = haldclutsrc_query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(haldclutsrc_outputs), + FILTER_QUERY_FUNC(haldclutsrc_query_formats), }; #endif /* CONFIG_HALDCLUTSRC_FILTER */ @@ -670,10 +670,10 @@ const AVFilter ff_vsrc_testsrc = { .priv_class = &testsrc_class, .init = test_init, .uninit = uninit, - .query_formats = test_query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(avfilter_vsrc_testsrc_outputs), + FILTER_QUERY_FUNC(test_query_formats), }; #endif /* CONFIG_TESTSRC_FILTER */ @@ -942,10 +942,10 @@ const AVFilter ff_vsrc_testsrc2 = { .priv_class = &testsrc2_class, .init = test2_init, .uninit = uninit, - .query_formats = test2_query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(avfilter_vsrc_testsrc2_outputs), + FILTER_QUERY_FUNC(test2_query_formats), }; #endif /* CONFIG_TESTSRC2_FILTER */ @@ -1113,10 +1113,10 @@ const AVFilter ff_vsrc_rgbtestsrc = { .priv_class = &rgbtestsrc_class, .init = rgbtest_init, .uninit = uninit, - .query_formats = rgbtest_query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(avfilter_vsrc_rgbtestsrc_outputs), + FILTER_QUERY_FUNC(rgbtest_query_formats), }; #endif /* CONFIG_RGBTESTSRC_FILTER */ @@ -1282,10 +1282,10 @@ const AVFilter ff_vsrc_yuvtestsrc = { .priv_class = &nullsrc_yuvtestsrc_class, .init = yuvtest_init, .uninit = uninit, - .query_formats = yuvtest_query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(avfilter_vsrc_yuvtestsrc_outputs), + FILTER_QUERY_FUNC(yuvtest_query_formats), }; #endif /* CONFIG_YUVTESTSRC_FILTER */ @@ -1454,10 +1454,10 @@ const AVFilter ff_vsrc_pal75bars = { .priv_size = sizeof(TestSourceContext), .init = pal75bars_init, .uninit = uninit, - .query_formats = smptebars_query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(smptebars_outputs), + FILTER_QUERY_FUNC(smptebars_query_formats), }; #endif /* CONFIG_PAL75BARS_FILTER */ @@ -1498,10 +1498,10 @@ const AVFilter ff_vsrc_pal100bars = { .priv_size = sizeof(TestSourceContext), .init = pal100bars_init, .uninit = uninit, - .query_formats = smptebars_query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(smptebars_outputs), + FILTER_QUERY_FUNC(smptebars_query_formats), }; #endif /* CONFIG_PAL100BARS_FILTER */ @@ -1565,10 +1565,10 @@ const AVFilter ff_vsrc_smptebars = { .priv_class = &smptebars_class, .init = smptebars_init, .uninit = uninit, - .query_formats = smptebars_query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(smptebars_outputs), + FILTER_QUERY_FUNC(smptebars_query_formats), }; #endif /* CONFIG_SMPTEBARS_FILTER */ @@ -1668,10 +1668,10 @@ const AVFilter ff_vsrc_smptehdbars = { .priv_size = sizeof(TestSourceContext), .init = smptehdbars_init, .uninit = uninit, - .query_formats = smptebars_query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(smptebars_outputs), + FILTER_QUERY_FUNC(smptebars_query_formats), }; #endif /* CONFIG_SMPTEHDBARS_FILTER */ @@ -1742,10 +1742,10 @@ const AVFilter ff_vsrc_allyuv = { .priv_class = &allyuv_allrgb_class, .init = allyuv_init, .uninit = uninit, - .query_formats = allyuv_query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(avfilter_vsrc_allyuv_outputs), + FILTER_QUERY_FUNC(allyuv_query_formats), }; #endif /* CONFIG_ALLYUV_FILTER */ @@ -1812,10 +1812,10 @@ const AVFilter ff_vsrc_allrgb = { .priv_class = &allyuv_allrgb_class, .init = allrgb_init, .uninit = uninit, - .query_formats = allrgb_query_formats, .activate = activate, .inputs = NULL, FILTER_OUTPUTS(avfilter_vsrc_allrgb_outputs), + FILTER_QUERY_FUNC(allrgb_query_formats), }; #endif /* CONFIG_ALLRGB_FILTER */ From patchwork Thu Sep 30 13:39:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30702 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp684575iob; Thu, 30 Sep 2021 06:43:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxs8QouAutOAdZbxILfs0CvUx08xmbiSBSEHG+9MIsj2HN9rK1iuUEAIXYwkn/8nUJF2leM X-Received: by 2002:a50:cf08:: with SMTP id c8mr7180068edk.86.1633009424960; Thu, 30 Sep 2021 06:43:44 -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 l26si3277473edv.557.2021.09.30.06.43.44; Thu, 30 Sep 2021 06:43:44 -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=rXsbC9gG; 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 DE45A68A877; Thu, 30 Sep 2021 16:43:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064022.outbound.protection.outlook.com [40.92.64.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BE5368A7DE for ; Thu, 30 Sep 2021 16:43:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OGF1eXEMD2gd4EX3tpov0MCFJKWxZD9ethEpVpT9FgeB3Bx3BrRqDEVdsm7MUgOYsu7FfaT2RaM5dr4Waol9JCuxd8JNcHHvxzVWB52R6Jcl7kybW8Bq0jGfIHp41Wu6BP3mm5hFKwblDl7U8zi9SUAPHo0D9xFv11hqyNfi81xQz3X/QY6Uu/u6e5CPP9Z2TZSHfQszmuSxEIpQqfpaf2UXYblA/zE7kGqFxghCgrF9e5FGTZfYy2fKO+3zn4rV86wOhM/zOHWJGjmUb0DJUoVkGUDg9c6UyyUCypJJ3Dmuaay+I19bQ8IdG7XKSVwUWAsINiglVFtpyGTXTrVVeg== 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=FKXLYGl22Cd2RZbziLxL2+Rab3aZq+q44WpgvKmOuiQ=; b=JeI2pu6NCVoKmv4KlDBiO8ppnjQLOjU03HQe+X8xwTF0DXaJ+v7IEzREp8LD+ZcLKXpBHawUlyv54+Db5eZ3Nff02ytl1TgxRoYXbeWxlhhIkEjCEciMpauKVr0uUR3j3wGlx3bHe2/aLn+rqPb4YyYIeU4wCXcZ73dUjzFRrSLe34rb0YRQychWIFikJDHJGllD/U5wbYkfYCH9qDVU1hFOmm4eNqkLr/gAjpIack/CyEColLZnc5j5CXfrGm4UeJKxrXUGtGqYeFNdnZPP7tbb5A4Pg86CUtq/lgGuQYtKAa4aIKITwwzBPqZT+MD6u/+DOPlVAoM60J7H+UYjIw== 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=FKXLYGl22Cd2RZbziLxL2+Rab3aZq+q44WpgvKmOuiQ=; b=rXsbC9gGwotmJloqKgZSX4AX1AJdPL9UtL3dZo42sqcov+yw4F94dNUgEe8GUY3hdzhfR0tIr0YoAgFARJYgyWIpxHZP2nJPavKfvvmiCkWT2q7zfDq7ZwfVamJx1/tdz8jP+Z5SePruThVzoWkXrhC+SHXWA54FqUVLClqhIA5q7ubGO7Hy5H/goMgio8Zqd9/KK220gnb2sakSvmE9LACQoNtiuoXaTRwKbDwgu6vgH2gf7oNqq0UNHdS43RIjfSUfv3VV9aNgoe9NiGQQFONsQMX5pT2acH2y6+qRLbYm7CforlSxfZCJKbChTTSywzTqfj6xdLh6xEQqEU+IOA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:43:14 +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:43:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:06 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [i3CBlZrfKMFiEZstzgW71tIEciD6qDDP] 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-4-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:43:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f5a629a0-63e2-427d-8eaf-08d98418401b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbNM4ubwW/IaMnGXAYk84TKFD/kjTFFmOAnDjwgPIunMQh30+PWt7LZeTOUcw2tZaNGECf6t7ff7VHhWS1MLMceeSrcZs7qYKFJbmcYrasZfLL3RuQzpTMtj2jOBak58Odj2eU6LSTE4jS9SJHh7UXTf+aAtJykC1m60XG4qKQcvQApZhPwn9SIvggjYVNgEfHrtDh+0ycCwWr191oEWp5RoiuH9nG+SrjMUj++XQO0Pj6tcuLE9DpF9IXlp1RfIkqQ2zRgJ9yfROflFity04+MfhBsJNu/OIpG5DX8dKeJPmi/nxd/hKjZjv5pWR/3IR32QlEzaEaukhwrC2SdZfhCGknBbvHkkTQT5Cr8AaIWopbJ0xS8SGsAASI90o1Jx6nBeGBO/FCFg8pg8a7ikfrApWxmm4Pfdci7Q2oBXd0cpfjUCDZbJhX1u17sS+yIlQbO9QKiSNJzO9Z0sACBZcT37sfvWwD3KcwP3RLEQ3Zvh14cJC4tvYdNvl+/NhPseP0J1YYdAl74QiTw2KjtkACzdGcKyXtK/jdXuCgSGkJgc3hdykDd5KeDHYDdpGrZ7cBmCVEJFzDnNonl40iyQafHhmMw9l4T7U5GO5TcJL/pieKvcXS7RSwFpZ5Wkf66YZhtN1/zrsqfJNWm2XTKZ921wQw2iAj7fHUduQFngfYXrwSQgoW8zHLsWH6bcGWt04dhWEeWLzQq8ozIba/8upOB1O4fg3cGp8D0= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f9IOYr0OPve9qUMUMyRyfAfrInkwAuSibuLhiOXxVCSDyR7c8kxxBSSMshuPoxiC8D8beleBXoZ0HXNVnux4vX+C0ESJ3V39pJ572A7m+WekurKtWLHaY3NTePniWxO0hGljD+duPXe4n+xlYnsVOo/433XvOOBY2uPo0Ai1pKjFNjR1nsEvU3vB1J/+PI6aqEfBUQUYEx7/VyJFSePztU4FZAk68+3gIgZWof1HMTK23Cal2HXbZjP1pbnOCkC9lphzJHmEfqyt9N6EXGU0B2YSYkLkMJlI94RGHp8TUbOmtJUSjDSu11A0SWWw00DWZ7vhdIvHputvKj7dHfZNSpVk0zzgjcTFffBSAgDUphF7YW5EL0RCWTGqT2Hwo+UUrwBZGmjfIKqbF5Y9IqjdZZ0JEG6uYdCFZb8WSao298GGwoAuZ2WlZTIYSeKtEMYl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LmOGk1toTbVv+OYqcDVq0dq4jnW+/CmnAtRtWeFkYzKZSQq5y6IM92eV5VZMTpqwtlOT9et/51xCHBcj0zQXfMubXbcV2JRzhzihhXSk8TJ8KBA/f8i1IFXbuT4eBPiX5BULh5HXxPrSLot/BAZGQg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5a629a0-63e2-427d-8eaf-08d98418401b 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:43:14.1455 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 005/218] avfilter/af_contrast: 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: xqycGo78XRH0 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_acontrast.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/libavfilter/af_acontrast.c b/libavfilter/af_acontrast.c index 91c4ecd19a..db7ff79d25 100644 --- a/libavfilter/af_acontrast.c +++ b/libavfilter/af_acontrast.c @@ -42,26 +42,6 @@ static const AVOption acontrast_options[] = { AVFILTER_DEFINE_CLASS(acontrast); -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; - - ret = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static void filter_flt(void **d, const void **s, int nb_samples, int channels, float contrast) @@ -203,5 +183,6 @@ const AVFilter ff_af_acontrast = { .priv_class = &acontrast_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP), }; From patchwork Thu Sep 30 13:39:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30721 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp684740iob; Thu, 30 Sep 2021 06:43:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUXSTMYi9y5epptkIgsWIqlA5hOxLRj65PY/MCh7fEB9k/K4lI2mTt2qMdqtuDD0tF8oBH X-Received: by 2002:a17:906:1e11:: with SMTP id g17mr7192225ejj.154.1633009437256; Thu, 30 Sep 2021 06:43:57 -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 ec26si3185168edb.116.2021.09.30.06.43.56; Thu, 30 Sep 2021 06:43:57 -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=GyIvit0E; 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 D17DB68A883; Thu, 30 Sep 2021 16:43:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064022.outbound.protection.outlook.com [40.92.64.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E31068A7DE for ; Thu, 30 Sep 2021 16:43:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jj1jP2t9q4yep5fNBnVAS/xJwJsFp05g+xuMGPYX+guoidla9LJ0vEF6RO/gssxvnHiun9xgo5nc+c47l7RAxpba7rOwfwgNR3aYKjMxVNCEvnBAN65dedIjlI2mympo0IHJrHy0Huo2dSC+v8MGy/cgs+LNb+YXu5F77Z+6/NRGQgOYCr4jA6+clxvYg/MatDOj5JLiab4ouSlQBB0vZmMZVftSiVMwka6r3gR3kEm3MuX4eqxtuCp9wLPqF1DNGqz5Qo0oc1PLwEqiMH3Lkbkq6y4WS1/2Ztnlrx/iYqCElgVl/gH5izp4KFSBOagJNG65j1Jgsy2jdcpkXc3PsA== 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=6KUi2QC51lWCNxOp5jcLHVMw3JMs5HcJPOS8eUyLkiI=; b=iv+mXcYZzOz1SALWO8+A5aCCXVaU8iHA1ghQCYadJgSHrzLRfs6lcIEPLQYtBfi9VePzkSrFOsZz6c9WAOMFUdNTfg6FpOms4YlbbKAAxxzGCzX+HSo32UuL6izOYpsJSKHM1EnCIg0w7k6m4f3am1+GKzUvzEDOFsfuiGCF80fnm648n8lTRt1+jCageTvcrM1O9oTzH9oiCXOOaLd+/4DESImidRXxHAxrx5fzW6HI2Gof7DyYL6+aum/XihOkFI372QzYeNE6JqsSvTXvj22GAmOBYT1Bz9FCNY58hIWawgrCUZf6IXg3mRKwYLqhX5dDAKPSojaNrvGnI129AQ== 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=6KUi2QC51lWCNxOp5jcLHVMw3JMs5HcJPOS8eUyLkiI=; b=GyIvit0EkxVKwyosMfWjWbdlqdbdwWEvBzOLbtElWMw7feiJsFhQlWZFvELfRCx73U0iG3pMKgvLMPmtVppF/UHg0HeL7n0GdzwSJorEqcPCewNZROFWvqauU846zeOASjtZln6/eNtH9yC1X/VJoRONHPZMyMX6q2cF/yHcj3A+9Mu8DTJ+l2x1dqpo4oXMASRimORPfYg/HD6MM+UnDR7MKJaBDyXPuxD3smESv/lr4EMOuuObgUlP9w5fEUEHB6gBX1rCW7zh/1covsbQ4KStE6C4TjHWPXeb/GSv4WS6MBIGLFzvRZVmuoac0KHB75loum0hBshVF0xVLtBVaw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:43:19 +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:43:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:07 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [MfYAxbuSX4DkzMIxejoke507aOokIVMu] 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-5-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:43:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9b4f340f-0836-4fa9-6d4d-08d98418431c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbNM4ubwW/IaMiaSCT4QfggIEqSnRGj0AOPQqQCfySNwVUIIdgpdgL5L6BohHjciyEW7RTgXTwZJoQFPOTdgXlYPs9UIj9ZwZ7Q1PKqgHdb0yjGHttb/9Jg/cND/Styuya08LZWuMzFbt95o6s9v0KOwXbj8dosJPZE/HSAWqUd5qT3lpyppdpa8xulrVQeoDEqvMdov4h5TNsYZHAthRN5k892gxqa5duJCia/Ck/bI8R4MAvWB3uCBtkk3FEBdGqGWkV51qn1RnpCcO0WD26euJF/zWSvRJ5gI5VgUfX1ENaWV1+9lLlyHie4QzWlwukDxwGUzYOFZIsMS4Qyr6zuU7YEID75DDWufLPyvBgw+EKUnZIPxOezh72jwvG2hXAcQL/3hF3t2yR84OKcXkmJcmc4iFdqVFU8pqsfmE2WzVT41no3Vfzi6oruP9jG0KpI+eD665/KPB+D8tSyNqe5/3nBWfZkPy8S0OuEcCkzCN0uBHKscWsK2l8boktuaglvh+WkD3hI7HytPWL7zvvUFi42uKX5z6uS/Muq8jpzHWar8GHKzU/ZFx/yvrtWTWga4fboz1japZZ6YGJROuJKRTNCwZfGy5ReUXRBtFnGyjZbEdRl1f5CM3RYpkFd+DVcFEwajo45+d9SLFqs+uPBe+erMcnnnZMzeqagHL2V+z151rPGo2Z4aIw9CBvqtK7cmvAHZ/bgVkeBw54I3m/9zzAYl9aBjSPo= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CqzkbMkuFOptuAdh+/5Z1B42bg9R3T6afgkk7a3xxrJdn3onQVhXhsUFKBSLxij3cggmlODIKLQSt7zSaHmd+QOUf0dDPCZkaG5pELDMr+0/OJo0uBWSthb+DPfvgYt0UnSVtgydfwtTVEcAIHR1+lG9/GB0f/ZYIq+acghF/rPj3uvyaZr9il1PNWnwL9nOvi8THpJ8W8Kk8Uz2xQ+5M6InrA8gx6H1bIFspJDjVl7o/EWsoG1haWcVmukrvD6/x900ovf3FTn4EkvSTJ3VaMkiJZkFxe5Xrmh4GPt4Ap4Mqbddpn2BhYGIQGU6qYYpSsX/q48gO/1l99nb4my0PtZWT5nkVHxIvaGky822m0MWjnMTQ4ZltR/j4ZQ2dj6/ZqRpDITvoJO7u18APhjCePOz6q/AfCCqHNpoTykT9IJr60OWf+uhJGnyGWq0Kq8q X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 82NEyk/24nsPyQ56+gERJglFoEBssQsHrj8gfTH89ABMk5vtVggTJDL4PhlBG07X/dFhDqpb27e1eVy9EiuH3/Ds2Hk/OuhOkMVGaCBE/arUM+DcatMxR8/qM3cz4srs1xnXhVXuf2MK1egBYBaxsQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b4f340f-0836-4fa9-6d4d-08d98418431c 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:43:19.1834 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 006/218] avfilter/af_crossover: 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: RkGK8IsAPaL/ Signed-off-by: Andreas Rheinhardt --- libavfilter/af_acrossover.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/libavfilter/af_acrossover.c b/libavfilter/af_acrossover.c index 1ba847d31b..9c00e1ddc2 100644 --- a/libavfilter/af_acrossover.c +++ b/libavfilter/af_acrossover.c @@ -301,25 +301,6 @@ static void calc_q_factors(int order, double *q) q[i] = 1. / (-2. * cos(M_PI * (2. * (i + 1) + n - 1.) / (2. * n))); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret; - - 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); -} - #define BIQUAD_PROCESS(name, type) \ static void biquad_process_## name(const type *const c, \ type *b, \ @@ -559,9 +540,9 @@ const AVFilter ff_af_acrossover = { .priv_class = &acrossover_class, .init = init, .uninit = uninit, - FILTER_QUERY_FUNC(query_formats), FILTER_INPUTS(inputs), .outputs = NULL, + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS | AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:39:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30706 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp684935iob; Thu, 30 Sep 2021 06:44:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxUgdA859c4sGiTkwFlZXrmh+DJiReIbDTF/MbwHBvem4bR7VCn2/8Rn+4zazIqpswQRmS X-Received: by 2002:a50:c006:: with SMTP id r6mr7229905edb.289.1633009449869; Thu, 30 Sep 2021 06:44:09 -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 m28si3508376ejn.761.2021.09.30.06.44.09; Thu, 30 Sep 2021 06:44:09 -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=IffACEXO; 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 D096268A894; Thu, 30 Sep 2021 16:43:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064022.outbound.protection.outlook.com [40.92.64.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D4D668A7DE for ; Thu, 30 Sep 2021 16:43:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J1Gi0I1NBZVbBVYQqkakVtk6j1d0n373eUMVs/FzgsksmFtRV2sitzzNDLCA37Qb8wtJq/ET6lngyGIVxQne6F703xHHx1+zobe6jXGzpMfGXrpN/KL4+5xpNh9/CqRmt2dI/YCHwdExphy6ldeBRA4//GQUDJoEzn+4Y4BOE6zgX/OlRqLz4cvqFg8bgRETpLhdmxKqEWy97ssAas4ocnuSqqFvSyBo6vBAj2T/eESnqOZJayP8kpG2B4ByJUCXeBhZc1BGqwr0wVTUyF/asCUwahTI8kVZfSsazEPo+snhmkTi0cp+Zz11wgptMmzZBqRYLkuUpK5sxXChjrpFeQ== 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=7jkwFcTuJJOwVCOj5J/i64MU5wVNGsUdlIW873HTxzc=; b=SAKhZ9NFxUqGriP7x5E6BGtyPfrvhHed/Nguk6KVFo/z64gpNASlcLz8tx6hE8+gEHdZV49WXQIAflqh04n8IC0bskguQi8Xdrx6fXSvjiauqGk8LtwA5cF6/0HbbgAx+FBGIDFhhsu/TsJ3FXkfLfkLZ7GyM7FVNKUKIrtvaRYqsZ8YM2YyvjpdP06s+HjBhAtuIUIuixpPRe9VzLdRxlUk3k/XRUm8ICTuTPwbbCq9Ho8zR2ijaVx42uSrtITuiSkhDNSnpb0BuLUT504Z11OSeqwNFDrm2LNlhjnStq2vBxZZxQ3AKQGKSl3QwOMxBgiKWlJfIUfOyK7Tj844rw== 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=7jkwFcTuJJOwVCOj5J/i64MU5wVNGsUdlIW873HTxzc=; b=IffACEXOneW/cRlnFRQINXS8HblrAkjFNt18c87R8aCJDlK5Aun2MgNpZ8UDcCDkD9LyAJJMdeKHUWUF+QhiwE+CMPNyyBe20DMW+aUye8aSv6aAuJOgOSDQna+bod2KmJ0W/IfHo0VW7NaZCb0NBmwo8PcDTRZLUlwdr1sVav4mYDprJcZsNBGwTQ9Nz2QhpzlNfbbcA37kqtBoFyjkzWXFilQg2GTRjotUE971vcecDCecwBSLq+Fk5oAQe4FEU4VECQ8bpD/rgJ4aC2s62Khe3hByN6qz3Lc/DtpQRyCVdeV9e9gb1XzQtPr6d6qjtxljP5Xahpi+hNPqdK1bOA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:43:21 +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:43:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:08 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [BD2ofNroMeHyqwItTBYoyfF7gxYDzvln] 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-6-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:43:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 45eff356-2ae9-44c5-dcd7-08d9841844a2 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIBqLe59qjkRp21wji/xErRRRFI5QUJRfCNVXrNQM3kC7RGGf+dpmjOcN4JZMLv2eztIt1qQ+qQP0E7y3XR7Kc/ICLQ3w9/UJaREMDOoScT7I6Y7oN2ep0HaJVj6eRyqV5OzBFQXhoBomd3eBWOvqBJ/EL7JzdUtXJymOG+HTplmf81M/qwlxOML7I3jbB6UiOcNKOrKLX3sbFdmCaOAFFBFhgmnIupgC/YY45CtAEVSrOyh2wzKpgBDy2F1DKT4xvVHXX3muoBxGwsKHq4edHGVHn4zFURjvfulQGrxHh3gkFx77Ca7XwqTPPaZcgpGDj7I/kWgEablW4lVhy1cKJbFwLlJLiZP6SNEk+/8e+tAWkks5znS3rXrj/PJL/1O/sw+oSIGwuuPiQWd0wvz696YMPkyWTa2erThINEmyZC2v+R6mPa6HNdwmFX6z72XJoMj88GBKqxKUdsXjIuQ7YeXgbU9XZwlqO4k8C3fM2yhcWS/uCfUx23zP91ewRR/4A02G+DpAfaGeA/NLH7DJNmF0YQxDLePRms/XE75I5giDqsd/YeoEy8wkrd7OyGJGDywF1/Cm8QSqIGFoTC4YM8jP1i0jmOObo8sZpwX561VBymC8ACKTJki5ZQAr/n6P9Y0CZxQAtC/+DExN6836IQIY+PvCIOXXKXBogS5qvo4wscZGpo+sSo9ue6p1ALU5wXj+ZAWZkURA== X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KF+nvt6DsjXpmKidI2p+uLy0OtE9MS87hU8Mxv2IiqK0Gpsmvino3BR6CgHlVPXs0MuHaJk7WnlhnwXrVPnSwRdpbQzYzXkIvYroq58w/su12mGeGWK792XOfO0GbambTOXNFY8//eUhDpnmvug7P+LpzxMDMFmGYKSbUfZ8LUDNHJtwVUBL8OQWM+c2EbWxweQDKuxZIs5zK5UB05QVn96NyVYHaGZV7BDKpI4fHyUwlFHDg43PUqOBr+8HPxXBYvHYiy3l7WhPDHuagtnOi3ew1ALQ4SotjWulVFjmG1bFwUuQ4eh1TxwMrX+8NumAry0WZQmNd9twnU0LleUXFqlld9PoNJTyZt13tirQQLg+8JqOL8upMClOzZL7KckbMMnjdeLQGfVjWUsUe1nSDJRuWNbIVF5AJMdbnO/lBbFgsl8nm7FYZO/1f42RJbCe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: y7sEK6qgAKKDtryDV2h5z2nyf5zms1EHWva5vio4ESTzIU3zISI3E8VhrFTsHcDt3SOwPe7nwxPfGoxqJpjGGA9arbSv8mVDGdH1/vJxy6Fa70F+xQFBIc+H+sO5d8w4U5W6tn380A9mIm6AIzkALw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45eff356-2ae9-44c5-dcd7-08d9841844a2 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:43:21.7471 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 007/218] avfilter/af_acrusher: 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: BX0Gy1DCBadx Signed-off-by: Andreas Rheinhardt --- libavfilter/af_acrusher.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/libavfilter/af_acrusher.c b/libavfilter/af_acrusher.c index 88d6c644ad..14d66e88ea 100644 --- a/libavfilter/af_acrusher.c +++ b/libavfilter/af_acrusher.c @@ -263,25 +263,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; - - 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) { ACrusherContext *s = ctx->priv; @@ -357,8 +338,8 @@ const AVFilter ff_af_acrusher = { .priv_size = sizeof(ACrusherContext), .priv_class = &acrusher_class, .uninit = uninit, - FILTER_QUERY_FUNC(query_formats), FILTER_INPUTS(avfilter_af_acrusher_inputs), FILTER_OUTPUTS(avfilter_af_acrusher_outputs), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBL), .process_command = process_command, }; From patchwork Thu Sep 30 13:39:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30700 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp685061iob; Thu, 30 Sep 2021 06:44:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxj3nXxSYi3JUp7AtXUNxwy7WqHw4D3ZZHHfuH7HI+Mh2IfSTLmb4yhQY9OG9giEuosxbv0 X-Received: by 2002:a17:906:e118:: with SMTP id gj24mr3475569ejb.439.1633009460660; Thu, 30 Sep 2021 06:44:20 -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 ia22si3337538ejc.629.2021.09.30.06.44.20; Thu, 30 Sep 2021 06:44:20 -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=GcuB3kXU; 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 E298D68A852; Thu, 30 Sep 2021 16:43:28 +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-oln040092069099.outbound.protection.outlook.com [40.92.69.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95BEE68A894 for ; Thu, 30 Sep 2021 16:43:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kHJwQatpPyTr6Kfn6V3hsmrN9WsL2WFAbJzCTLNAcayCIoFlGp68FsV8D9wj88aeoXs8q/hLBm7adkXbWu1D9v7F/JJF77A4lIy8ElRmruDcbCAIXlydQf9F+w4qZNiDDbZZfpo4lQbZMorzi7QxhVBU36rvbrLKGLDEjNZ4+n4FGiASrkw8etmK83snIhgj0LqjQlPj6riiVnEmexk+QxpzU9jSCJedIl2CTRQs87XA5owG9cwRRKqNESjN/18UCB6oMIdTm1U9FKULfqrb+eXH/bQcSdkZWU/CeuXiWqyTin108OoopMsP3etFOkrbacsbGwITMfEkX8zIx4zwBg== 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=YRGwdGVRomK3nX25LkEGlXRLrYQ5NQslYiwlZVj7Gf8=; b=JJOAZmFCH3nMArzKKC/fdg8SwDO2L17+K03s9W5LsV8LdO5d7qZO2UYP0uPxi4lFFfxeXO4P2CCdB5ecpqp1+IwyI8B2djB36KgYn7oapLc4osKnWvcygFDtgK9uJ7zMmA4Qzvt313R0rs4GV4dturMKyEYqGyfgaOpoZwE/hNqwD4p7kEUjyxYmxzOuXNrwvxAFzgiPdaSszhs1aMAp1Fd0+GEMGztNl3ijvhTydo4fFV0pgVSxvz5YvES9QRP55kBiWIX4XDfsTHhlTNz2j2Kpxe2TxtdDGj8F7C5xPQMkK5bGmYQA0nhadzSsjVOv5yHETV8lX2uGZwcioXX3lg== 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=YRGwdGVRomK3nX25LkEGlXRLrYQ5NQslYiwlZVj7Gf8=; b=GcuB3kXUwDdrKeQx6G2/GeLLGAI0w/l0Z0ii/JXOZZM2AMUrg0OVSD9w0NheQXv1lNgZ2ePcNBEqjg/YrxZZgKp34VD4BrRsVn3HUP1MI/S41NlG9k96nb6xhHcrOkbzoU3rktlfl0UhTc97rFoojNk3YWmm7TlkUzTO+fXhxgm7KFU0jS54HBSIIgx9IPIY3QmX37FoZ+irgm9V+PdIhF8bjw7CWoJu1S8HiRY/aFLC8QpMTgWaW3K1pg6OnBy9J6H7thT3hQQtoJGrlU4I0n8Q3tuE5VOfRM2YwXwTDCSwhiWxBPYkFFcCU2Yz40O9MfATj7v8CxMX9Zt5xhRW4Q== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:43:26 +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:43:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:09 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [WyN5qmx1JiNpVMib4CXDE4aajMWS7p6K] 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-7-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:43:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9face8ea-1063-4e1f-880f-08d984184758 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV2DbeCHtoNfXRt9yL9wC4+hV4TRsMdcKKesgN6/ilw/9aTHOANfIcV0R/5ddNkxXTfo8yhAofGEo4otM3eQAcPmgwQNgSc8BJL8VOayuXJZ9VhRakAUJEZb/SQEbnNt0202qXwoXuqayJj2nneZUeZLCEujm/5bLPm5TuBhSjVep0GCF+sDqmbvL5xzjz41gjYLpeywmjvouk1yEYUH+7JkG+bjRXLd9dgHm/GtQijdW0EcHH9fqPrG4b7xvCtDGBvBqk0ygoDEiT0t0nPfi+YzyLp/H1MSWpF05IoYiAc2Xyj91oYoEX7c+tDVBulKlmTEKkYcHotEq9xK2YReVnm6/1XM5eOTzLtj17oiJ2h/A+cPGQQ0PWUbgM0LkJwSpUnbzngSQyhyd0ykCS1hi5iRPWu3sjWYRajc3rq5GnAxcQKygGnADZyxJAzTQRd4mROulNnmT/wT3kxoTv1L+vRx34DwzDrNxJVRSvveyj9GFWEVP4EZDdtFoojONMpoId01EtoAgnlpbxrDO0wnakYOPCQhXHxwqUk/Q/R+DaPfLkkzTibrz5E5yevKd2sFZFyIKTFpLlcImwVL9zoIPcC7gaPJzRKVPBehb8Gz79RQeqETvzo7e3ux9ODZl8MF8lTFB9w2QGxMll3mI12zzp4bGJJbeDd8suHg0HapuI6N7o2vtMveSHVg= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zWdKm3vRgJNFWL2Ui6BGWMZwoUadzj0ENAxRYZ/UUg2/ycjlAxuPJ2n5JvRO68AJyfMRluQo8XdKqvP+ZtjPyWvKzKSZPj9v/1MyWjgJd9vlvHjWI1dBHSi6MeFyUxgugJnMP757OPBWECjIztf4Q3UQrLxw91S19pXBbK82/LUOCa69aT9jIrU7wJphUM1+ilwsTKRz1NFBHDvJCEFYWWvV4MbvFwEHNnw1CYScQk3yZy602o3GfNHlsmCaLR3uXaWqRJWHSAgTle+l5nYMeHZgoKvbwLrwZNmzB4qg70tnCGPVCQK7wjrRhaBN8Q7DRdVB3aR9ITFQ1o/ZUbSaT/bK10MuJ0tn7QceRkbh3J66Zgx42qOyUm7TSG927dPeb4/hB8BODk1uP88AjTs9Y7Tp7BYlFHLYWD91OnBI6+2XSi6lXH3GVYQQ5nGfIaYL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XbBwsS/H5XheiRg8qIfupO/Fry/L6YQwbQMSriECP6vYNtJLyfGoKp15K7sxhoso0oITJjjC0VZQ7EX7Rd4lsYgAgmLvhK5XmPoLyk+tg59wT6dUftoTgIc89/HKGdbEbZVrpLtgzrb85iZ9jtw/IQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9face8ea-1063-4e1f-880f-08d984184758 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:43:26.2832 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 008/218] avfilter/af_adeclick: 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: 9DIuC6CQpfF3 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_adeclick.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/libavfilter/af_adeclick.c b/libavfilter/af_adeclick.c index f9404b2a4a..77336e50bb 100644 --- a/libavfilter/af_adeclick.c +++ b/libavfilter/af_adeclick.c @@ -113,25 +113,6 @@ static const AVOption adeclick_options[] = { AVFILTER_DEFINE_CLASS(adeclick); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret; - - ret = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -760,7 +741,7 @@ const AVFilter ff_af_adeclick = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; @@ -796,6 +777,6 @@ const AVFilter ff_af_adeclip = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; From patchwork Thu Sep 30 13:39:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30697 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp685215iob; Thu, 30 Sep 2021 06:44:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxH2QVIXVEoXuh32u6rNDwkIFOIuzh0W9otSVcDT2x+6s1V2WfCOdsjGTKWW3M9pTkR0GwC X-Received: by 2002:a17:906:3192:: with SMTP id 18mr6763640ejy.246.1633009471915; Thu, 30 Sep 2021 06:44:31 -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 hc43si6555931ejc.721.2021.09.30.06.44.31; Thu, 30 Sep 2021 06:44:31 -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=RhKzIQ3M; 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 5507568A8C7; Thu, 30 Sep 2021 16:43:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064065.outbound.protection.outlook.com [40.92.64.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C4A968A867 for ; Thu, 30 Sep 2021 16:43:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YDdKHpIom909bKE5aBcjVrcP5GObFrcU+63Rt9mjwyMAM97IVTAKjvE2SQ1Q4JY0IHaLJNzuF71xjNbfxU+5xH5crAxKQ9gHxXvRccke+txlYcLgYHRM+Wt0FEwt7KN/ImUjLhflAKAdJ4g7FQZWkl8gHP0M2XJgqS4SIl2sWkmEEsyOkvfY3lAcT0rRQAycuOTxj91gR0t/Jh37Gdk4/nAwS0nDVsg1F3r5dAmdFPz6mtHccGYuKQk50YfS9cSsYYerGLr5KuBrKXdWQr4goUOxUxLqD1Iw15bRznMaWeVCK0IU6cYr11P2LircCAjO4h3aPCuPcQFQh7FDtxMwQA== 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=4Dui1XeL57Jxih/hZZDQcP/VQI9KAuxJJ/nYahj7PY8=; b=D+jaJmSw65nXGq3mfPkI63aRN9s5dA4m1BtBFb1t0Cbu2n3sRhvWNjiGSLQCj8ADevSDNs7TsE55Vhu+J6waZ6B4STUKPJy4dyubBUy2ZgyVb5tJUZCTahCUyFzrmAnEaq/xiMVrNihmRClikYkUqGz007eh6ze5Lt0Ap6M9khx5ZAVq36j6HCChIrSkUt1YpfREmuzlknknyPdubosqE+uB1ygVV+VhHawY0QfiUFnp3jBAN7z5lnI4HoJhesEGOV08F5TocOGk4AjnWv1b7ckymoFtKOQoV3I5BqE2SKdPwBRlj0wuRRcskQeC+sI5DcY3lO6m6v3MZrYu/8tjBg== 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=4Dui1XeL57Jxih/hZZDQcP/VQI9KAuxJJ/nYahj7PY8=; b=RhKzIQ3MfcpVBbyNfIEAqpw8Rq8RpGG68Za+cg29M6vtI7NO4sTuRNEI4AYdbHxIKeNzGS7P2B0o16DTSX5p3LYo02/p47+LarOQOC3YPzzmMQIQ2oNpMaavvVq6J6y2DhgmzDyOx+rcfnCpQlmgDEf/QNhJ9zPCM+1zpkUMtLgnhKNWnLhShJCxuSp4404gAGRf66NNUMOOKAI4etJXb5PXdUO2Ij+UwfpvtTOoLajHWeQ2ZWav1e7sn7o8b979spnSy/dB6xZmbtH3DEVX5mB5E+extzMMqBw8iWhGVlbFyW1L9L2btssBgFQElInQjRTBKVDmbq2XHGoW8Wljpw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:43:30 +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:43:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:10 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [rSS6pWRqS8kwQmvPHAPptXu4SMgUMjr7] 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-8-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:43:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 87e4f5d2-e1f0-481e-0420-08d984184985 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV7GPXw1na9nH97T3lNsxOfz6PuF4tbwznRBwAyryY5h7r+zElGQMoZNJ7a6ri/UolginTczTgu0tWR74CquTfg19dShBqflWm+A+h1zGVaUfmjYLNSwQ6Q5dh6JmkRNuTMDz7Eu7GRol4L9ubUsMkpM/oRNpLLJTNr7xuV24X1I2D5uBD4ymUO8sQdDteM3gXO13+5i7XhP41eZwxcW5CNXFCB+x0PnwrHsC+/7mbFZ66iGZH7Ntl3MXfYYyO8dieQlBOccAdrN5VmbilIcMgi5uhZQxYH/WsljMrGOe8zm7HCyDClRcpwV55dte3REUHvkxzjeAQY+on4FC3hJwGPoCkM3A/vGH3/J0HvCQBlYWXCQdyjgFZaleqRRcKbyhCwWMIPB5Jl+dg8M8mel0EiFlMlJ1guxChA8jdfPu+xcQeQIGRvG3hXJq+0LGYmof+EZoci2UC23E6IZHIN9LQVmu6O6mJciDoNauMavtXnjZjhy9AUHxQYQaOJ+ZuwR8peR6vpbuf+V8CamwthG9o366ZJ1NGSbT3IVH4itTPLZ9ir2Kg+MoqqVk/cGcu8BerTsvdRxsQfc1muUTawsqg/e2sel8DxaDZXn0FmrtsdmUbmK3WpphxQhi5iUx9eBjA7+xxDnLUNOOS6o0AMVJHe5nL2dpHVlXOP/9+57vt2Dx+b6U75HV9jE= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: byXrC4ua6J8Ue86Geus2Q5E5olSzOYOfoJp/Cgy8Up8pQ/RQPpTd9A8P6Fs4O0/QMjpQBwaY8l2Fjyvt7PNggVhzpvf6hYHItlnM4AKeJOHnv3S8Kumy6pLpbUkFr1Yc9rtulMduy0aMxhB4tBbSgYrq3WBQeEx44/pVyt1YqR+3sVIg5WupUHp5Jqf14+kGkr70GovvVraAJlOoaxRxkzw8qvaUzeH31FP2kf28uDqMsViV+XV00VrK1zdzt0Pag+ywSNEC976AAwsxy6LGJfnqopuH2k2msD6tso17XF3WwhJ4LB7SaFeQK2lOJ6RaC6fxvyfCn6MejjhsdFZXDBdD8Z47nIjinVtLBSMsC9XoMDxHf3VFc5e+tJA/lai1WVWaXEItpX69CtL5v5D3U7Ik5O7JWtVvp09dXQloMgrDAbn2d03+2vXzzf4gFmj8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9S59i3DZmi0wlz49pbtUFHc0E3J+IpaXerZwWL4GjR7baMQT8JOorkQb810NacELlKVn7bqix3kKAG63C6vz6dhLzJQ2SEklbLNHX7CSu39IKJc/qDHkUkMfThN9Nlt2VITrpmljCGevf0Ul+9QJJw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87e4f5d2-e1f0-481e-0420-08d984184985 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:43:29.9222 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 009/218] avfilter/af_adecorrelate: Store format in filter, remove query func 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: o4RZHtQCCr72 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_adecorrelate.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_adecorrelate.c b/libavfilter/af_adecorrelate.c index e0731b0945..bac7937c10 100644 --- a/libavfilter/af_adecorrelate.c +++ b/libavfilter/af_adecorrelate.c @@ -55,23 +55,6 @@ typedef struct ADecorrelateContext { AVFrame *in, AVFrame *out); } ADecorrelateContext; -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_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static int ap_init(APContext *ap, int fs, double delay) { const int delay_samples = lrint(round(delay * fs)); @@ -262,7 +245,7 @@ const AVFilter ff_af_adecorrelate = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:39:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30718 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp685372iob; Thu, 30 Sep 2021 06:44:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQalHvBQKKmxONLMuhjT0JAQY0+VZXeIVEwXK52mq8i+ev/Ry+P3+YNCkxCXblqcRlpkZH X-Received: by 2002:a05:6402:1545:: with SMTP id p5mr7571318edx.110.1633009483482; Thu, 30 Sep 2021 06:44:43 -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 v8si4770750ede.567.2021.09.30.06.44.43; Thu, 30 Sep 2021 06:44:43 -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=LkEQw9Qa; 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 8763968A8DB; Thu, 30 Sep 2021 16:43:35 +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-oln040092069046.outbound.protection.outlook.com [40.92.69.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B23268A8DC for ; Thu, 30 Sep 2021 16:43:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MA6pvtMFwrbRY0kvlGyN3baWCCUtS1EtgwmBZOEDnijjJYUTzW7fNKH6ZpHI/I//x1i4j6gdWB7FGJZfLr2G//UCXNRMz7V/yigNOBKFAOnHjBamPKhH7RcrEIDa/QAIVg+RKP1XsByVEGckM2DKr7Ng2992zTZvlwI8BgQPot3zIbasEXWxCOzDBc544zuo36ptz0Nv9Gsvrw72Zad4JwHZU/FVDtLJR+V0rZo9LUxzkHGIIqwcCkRSODZ3MsUkfNmm/lpIcpQQDnLrFhHiGlVWEpOZTnmWW+G92KVUDrUaCoUovTGkcnw5TuqnyEJAKlU2FxrsCnrk5bCKEVEnGA== 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=oVcIsibt3yuhjy4JsINqclreSdG1dCbd114DoBbzpVg=; b=n191WPMMS9DXuocmSZB7Tsmzm7NdEF+x7Yu+7WgI8pjQ8eAgjknGCaiT3/Nne8E6GRF7LUCUvb5E85WSBi1aawv1QoeK4EnK/0FinvqEBz/AHf4m3w44jMYR2iUsUdpywmU72nEmtLGAqkraLKjJzk0ogpCE65tmu55Gl+zQA/+XBRC3m1RNWnJfweS2wEg/Rep5ysBrOq8leMPhi2NHjvgKnGEfBgnxxVjyL3H+DnAtRQZY9XU64rVDkrJU6eYsZdJtfbmtt4790AfR8AwsOw8dzur1N7o8mjCrL6GHeVCkeEYJDg7GGiSmRmOzEvzgLvIhHzjwYGv5YkaVBvtJOA== 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=oVcIsibt3yuhjy4JsINqclreSdG1dCbd114DoBbzpVg=; b=LkEQw9QaaxjLikyspOHb8+Tzg5OfP91lPWTpcGzZCk3GxSCl1Dv+/tX6cJq7LmAuWzT2OGbKZQUdXGKe+3Xsjr7QybsGobeS88A+RsZ2fQs9fM6frO4b4U2kzkgcXzgYAaOQtz2rvnXJhBKBZDnPrvLbdSn/u1iKeiMHJ4omdeIDeBJTnB/cFSfsGQ596GCMRM42lDZtOFwy/4qzNOu+ch7FGjE2g78n0/l19hSsj29pnnuhCWVnbVyeJZ1I0+DQGkfVnw1HWb//Ag0lNZWKgmv468FdLeSqSMNxcXAZ7j8gdesqxI6clfdJ6Hz03hE54mm6TZEq2jkQLkvrbrqShQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:43:32 +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:43:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:11 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [mZH8JTuHmhQu+HR3RvLxZprKUsUHpdFW] 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-9-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:43:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ffd5d95a-a927-4ca8-3c80-08d984184b0a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9NZAhOZbxyPxD64t6XTzFQN4v8gfED47HDq16yb/NzCv4IpHPEWzdVJ9tzXuvCjS++UtX4s6N5V4ZICkhYQxWs5kqggzyiTuUS2m6+q6zi3vDzgrJHvIMxEGdjp3RiNnPSPQNfHwYOhQGj5krBSXHFvfYSz+IdfDo5DmgYv0W8vgSti8fPnnjRIF9e+BqPzop+0RlRdW6V5uq5fJWZTO8qzRSK/sVpN+MHC60fIHp7jo4+YrsqRFm0EjQ3DEWeZJGxbMjzozderdxtmQvTffdQT3h4j2miEy7suvR2hIPqFlkTO9xn/QHgg/fYKDDnizsASwy/bKWvCLptJ0xyN0NxRZilVvMu/Hge7HQYOti7fhUjzqr46Tn/CJTH+cVEA4mtPoliGe+Y9rYrZEzzvjpHmYsExDqfk0TGXHTge1Ps0hJLq3JipAyJ09QR8fUMvuOX9ShyWf/KryzSCLVXjKpIHj2dzybQL2fqv5Yt8kgynvAzCR3XAyVUUxfCrFPH0clB/mUY+DxPPQgNcbPb6to5uPC9GLozgLELtQQx23Agpa2+Xgx9wncLNCbA4X95z64bvii1h4MiQf2N2ZynTQTUZeooMTabTmn9k3K9XIIl0Arce4A5Hzr4uTest4F26C1HUrNdh4f7/nv9o9LNGeOrMFrkktBzpA1Gu/0mO6gTe6F5K+V3GEdTO5kv5l0l8aXsU= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EVNyNaLXzkhf1YGp6gOg82wxPF98KWmxtRhMdeJbTKI1Gwr9/7NNWByFFl5qFe/1/jMOqLwqejua7kkFnPC2TJJ4ya4mdMUi4+5kuf31cptser7M25W/V48+sNdbe+c/p8GFqtT0ZTq7NC60VjazC405MKSL+GPeqZieZbY/KMcMPlHFqZnWuza13ghMh70NiAVZKL+Ii1za5uX+6Gqqrh2ovkH1/elsEtrjK+FVPoyrRMVHqryIHFy6n+PX7XsB18+UUZ1dG7csN/9m+7bGW/cXP56KJ4kvwe3VrpW0iDmX614falfSEo70OLg8hBpY/nbKsHDNLM4xQ45IHiotEn7CBVeFtlfKJEl251k6+6vOqcvcN67uijjrXrYt6mkmigNmyDQ6b2C9G0tlu4h+Jw1vRaFqk1DfLL+t8zH+P2YBgpXxf/8R38nBlDrt8K/r X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Yx9LR76KTsGUxWDXiKrys++5iECulvzl6RaCtn0B3idouMMoUApV94oYVBrjWYLUPgmtuY7lGKaDxC5ULzHVPG6lR8vuq5WT951+9t+EGPSm66iKBHnC786zvY569FC9zMCLF9WL3ixMldC5qtv6oQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffd5d95a-a927-4ca8-3c80-08d984184b0a 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:43:32.4849 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 010/218] avfilter/af_adelay: 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: oeSRdcOSxo3k Signed-off-by: Andreas Rheinhardt --- libavfilter/af_adelay.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c index e67f081b97..c42fa2d175 100644 --- a/libavfilter/af_adelay.c +++ b/libavfilter/af_adelay.c @@ -61,24 +61,6 @@ static const AVOption adelay_options[] = { AVFILTER_DEFINE_CLASS(adelay); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, - AV_SAMPLE_FMT_FLTP, 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); -} - #define DELAY(name, type, fill) \ static void delay_channel_## name ##p(ChanDelay *d, int nb_samples, \ const uint8_t *ssrc, uint8_t *ddst) \ @@ -344,6 +326,7 @@ const AVFilter ff_af_adelay = { .uninit = uninit, FILTER_INPUTS(adelay_inputs), FILTER_OUTPUTS(adelay_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; From patchwork Thu Sep 30 13:39:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30705 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp685531iob; Thu, 30 Sep 2021 06:44:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFePyJqhKXadVk1RwT+hpPMkRf4+Ls/So2iguvCw9nvX36VX8d0gSqV+Vd+Hf/N7jG/Fu3 X-Received: by 2002:a17:906:ece1:: with SMTP id qt1mr6934623ejb.281.1633009495034; Thu, 30 Sep 2021 06:44:55 -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 w18si3423547ejv.669.2021.09.30.06.44.54; Thu, 30 Sep 2021 06:44:55 -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=EUHpxeFw; 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 A356368A8F8; Thu, 30 Sep 2021 16:43:39 +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-oln040092069082.outbound.protection.outlook.com [40.92.69.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E168468A89C for ; Thu, 30 Sep 2021 16:43:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TlPgSWYtnWAunl2f0LoonPxso/RJmBOolxH3f+zYtZOGyBQV33op2BzMYdB4SYimaMZL9enw85LL5vOvZSSLinZHJS99XBjliOkqRemiVErlYaOpiyWg4+GVnETBgT2YlqwSOOujQbSgSOtkaIXaUtVTgOhvv4McvZlie8tPTU2BZZIMyBFncZCVvlECOa9p/2/Y3dw3rvukCiBgMLeI2jiFghp03sxAGDV7QZmexv8zz6DbWkK41/4k2FuWaw5sSw12TWuLFM5yzBXQUJz8pt7KY/f0M1aw8il0tCRtep/q36OImqW6bZxmtUOB4jjMMTuYbkyPpXdWRf6vwdFQGA== 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=undSOSmxuBB6FCHSJP0OibZy/NppdgLpOVRqgiBOiKI=; b=jOERyNBHa5gXfYQ0UeTNY+PHJpMyBmWT1vjvqt6Dh5zSExtbSsTJHmEP8MzRAiFmKtUTyC5o5p3R660BXZuU5+HCOkupkmKt9tIiK9BzVXKMOw7+N2sed+GM3uk+AeE7WrWQmpn4RWsa9m6KFLbGMC+Pz1YukVgDvWG3qAsh/UmR04i0ET4OT+YYKNJTRkCp8fz1rJAqeYK3a+5Dcgvokd7s3Ko5yYuwEIt56HNcrrnzqGqiSy4C8Jyj2wh/bmfYydaZOeq5vXwA6KRtGsr/Xn/8xbLpLrQt9A15Jk8CQytFnMMvDcgI5NPClvH56oblx60iOeV4T2Q9UB9DGWSiBg== 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=undSOSmxuBB6FCHSJP0OibZy/NppdgLpOVRqgiBOiKI=; b=EUHpxeFw87zip7mv2QkSHnbWfUZRKkfCS4MhjLOB23Pa3Nv3zIVXc/RKDNbQbTRXsnsbSiCIyHDNKLtT4q5YpjvwZzgN5hlEUynpkoYpXjH2LPbH9u2oLl3cZ9UHG2/rY91hRVJo/JlKZ2UDxSlo5v8upSXRnDaBOdiMrrV+6BmwMFzgm2Py0Gzv5hlWcstEphEHpGwFBxPfJLSdoj3Zkn2wyNNisy+vtzOdPr1Nlg9fLImHFNLn8dAQnjtxa/hz5OsNBCu4ku0B+0UUjqnzrawarL3ci+KfwCIOFz9bj6TcJqc9qOdovId0scTYQbgLrQtqJGAqe3M8gepQO6TPcw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:43:36 +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:43:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:12 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [1I52GLnqLlohe3JwLnx9FYv3Xg38E7YY] 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-10-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:43:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 58302df4-f360-4a29-f83f-08d984184d71 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9NZAhOZbxyPxD1LVGd8YKgi0vTl/gzPTMdH5/em92fjqRlOipaJlijzBZfxpCOWhybz8Y7oEe7viB4oOYNALTlPqHq9QGqVFIopBA/9FrC+zLhD3eTmCJTxXNAOhWpc3SpZR/n9E//iab4siI3LGl7+gJaiWxgeoyOzN7mj5CUr0XKLBnNRf9kxh61QL2SfUAsJG+hjOockJTqf+GhVFnfYWw+cKRhgbLi1UwWMvdb1AUFsKgD9RXXrgJbX7HgnOz4olIFycfv+XsYjTiUwd/ASmsJ9QujtzhJRY1af4+nJhnyxDTudDAt7r+asdQIMiIU/iN9PoW3IHpDzF3C3fUmjenLscee3Tdw9AoCsZbCyo2bIRKVYDgyfbhZeYsCknq0pu2l0JJgIKMDnkCHF44nDy64b7qvcv0bYjYNJ8r+/gzbsP1rLRdvFwzTHexpAc8LZvTLXuW4jdEyk5NkaIbNpM9DqDMknH4ZYkA1hzoSBgK6LTednalR+ZD1Wo9dtTfgnpZNEQIHYv3/PXPmTg73QeqwSf7YkiY/1PjjFkRxxJN5aDabp4G4wtpQqSQWBOwEeyaM7VJNLh9JpSO/91pfJOWjgCYg8xO0WjJTFDWqKOAmTzmZbOPlSCdriXL0b13SoDr2+tL7UOz19t/5FixspXxmW6oN639Gf1X1o85IgYzii689h2ON+BM4B3ntcIZ34= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nnRlPkXh7gRW1eTu0zLobM9zWSNAasg+9K4myVs1HxB/v3l4IRdupADtnlV/cbto6ZRxNpWUDex0GtZ6el0nBDriTI7XoYodmPFApyT53QNsNx+UwIu7uYcJo6+pTyVA8i7Tp4hbGK//cL9T5Tzc6rm1j5mk7VoBl9Y7GmayY06Aoz9fIXq83xxXWXBXCMLBxjCyPuHwQcyck8lMyPi0gdTqAFAzfPWrbSwMY+74L3RZPBWMnf2A4vqhM1jjWBG3AL+h0lEtlBoxAmn1AkJzloAQpMdRfqI1XGqwIkb9nb9Sn3igCftTkjrR0+ywZyX6y8EKwNeTSGFb+B15LzhbD+ElvVTZ1dH2cpvqv78YPhacgv12UyQODYzopiPD1KPVIA7hLow/BRz4iy8aYMGA+P9XQ8Y+Gg3uYrqrDH5Z5twotp7yyCh33km/n2ADwRKM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MPkCpjTyW5/fboigLkdP1AW7n013jkPcDgbxMbkTR7UYoqPYXg9c8JZTQJeh3TLR4iDD1yguacEt1Nxv9uR/jnQoxY16w87k3DJ9p4KkXM+ENVzzA1TBybOxH+FuJhebPYzUNOmKKV0W7YCpz4tDOQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58302df4-f360-4a29-f83f-08d984184d71 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:43:36.5531 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 011/218] avfilter/af_adenorm: 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: 5Cx/FfjRpLxL Signed-off-by: Andreas Rheinhardt --- libavfilter/af_adenorm.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_adenorm.c b/libavfilter/af_adenorm.c index 2cac605a2a..3ad1e7f594 100644 --- a/libavfilter/af_adenorm.c +++ b/libavfilter/af_adenorm.c @@ -43,23 +43,6 @@ typedef struct ADenormContext { const void *src, int nb_samples); } ADenormContext; -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static void dc_denorm_fltp(AVFilterContext *ctx, void *dstp, const void *srcp, int nb_samples) { @@ -310,7 +293,7 @@ const AVFilter ff_af_adenorm = { .priv_size = sizeof(ADenormContext), FILTER_INPUTS(adenorm_inputs), FILTER_OUTPUTS(adenorm_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), .priv_class = &adenorm_class, .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | From patchwork Thu Sep 30 13:39:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30716 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp685665iob; Thu, 30 Sep 2021 06:45:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKpB9naU+HCjVci0KiA05Vds7twm4EHEqbCMI/WAB/Z4UOFP2nvj56m8TbgwX/92yvPQHh X-Received: by 2002:a17:906:32d9:: with SMTP id k25mr6884953ejk.290.1633009507358; Thu, 30 Sep 2021 06:45:07 -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 f8si3406642eds.195.2021.09.30.06.45.07; Thu, 30 Sep 2021 06:45:07 -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=gGrbsn9Y; 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 9F73C68A8F3; Thu, 30 Sep 2021 16:43:43 +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-oln040092069017.outbound.protection.outlook.com [40.92.69.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB1E868A8B2 for ; Thu, 30 Sep 2021 16:43:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GJDEOFU9t5C0ME5TsTtBpU5WS85nwYXyU/qexYFolM86tXAPSqy80Xpv4Hg6JvuUGLHJlqiuaKMo5TH0DmiCuAHAAgn6FlXTiCgvE6dV7FGpLK07xn1XLZICXDrirzPTWYTe2ZytGodQq9jcQKnyNs8pjaBmYhOnW2m6bu3JkTp6r5WrSS4/HF+2//zfQtkx3i3YcfKqiMVAwhsmlfWIgbM0mjckcKPnBwMPKMQUNThgurj2TEjfzGl2HZzKtAvGncOl97SJU0nwlU9K2YFt96zh1dTNdTdtZdMS0z+k/e/EEnQ5nDhXdEmWyPKF7U69XITbVdQpXQb3XqEdtnrfbQ== 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=ru8btT/XpJT+R3/8DNR+Ll4LWGl4gnw7Jvb7pTOoetc=; b=CmMd5a8Z7rC7XDvqnxMyvdsSnP7vjPXVE/74vGpqAx7Z2l4pSPiCaV04gISAHAJsu8dYD1yjjd0VCOYtjVUmszHf6W6vFhvQfe0lAYsCvugJJLUPUNj/7GI7ibP9anYRU/90I6NePO6aWRTNlG1fKJRmEfq8gXToSbjzIUTXZFbmnsj5FPUWDenvdV+X6l6NEvssDGE2MibZyydwLQ1C9bcBxTbMp8zVfF8+saouOKq/gji15aqSZJ6Z+Zv/TC5hSkN8KiG9IbyEAwRLorPsnSH5WH6a2TznnDRKWW01oNvKJSNhxsHqT97lRKMQPDL2gngOWA2+9ZxDxL2+Yz5emA== 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=ru8btT/XpJT+R3/8DNR+Ll4LWGl4gnw7Jvb7pTOoetc=; b=gGrbsn9YPnN8TfhRrPtqQFjUUJcgBXtyYppaAkOF6J7Gi0NLg32to0lGwEHow5kmWCgBJaCk2xpAhpE4NK+KsUJ/gL3eoBtw95BiADSaFouZ7WORYFAIkNqEdxcZXRZGhHrRIfT6ZFowU0uKYg7Dj47fJAhiW6iEDVpv2UcLKIRfUeyOHReUWXXXh0L60IfXrkFH/jE+s0JaMqMjyPLvmsWXOS5JZBfYNCrmNIJte9b68OtRtEz20B2anGn+jCf8V5KRF28VWlCqrRyUhzavsQqBxvs/tbrk4tOISbqxj2CoOV0eX4I/1Hs2wHD/nVrwHr8FT8MHsli3Wmrk8SnqbA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:43:40 +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:43:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:13 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [tZfE4wZfbCsvcCuydGkrg5k4OpdiEDGn] 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-11-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:43:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80170590-dc5c-4a66-8508-08d984185006 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9NZAhOZbxyPxDyUuDdmReL1a961HATbpTUYMfbk+YDf65Zh82dzDjLPEDh9Wu8IbneESRV7rdXKZ7BHhXtu3uLM6iJLU/3D6Gw+wxDcF64UlNH0qTvNeKmQOQNPM+pOx2zomKWBQkvMEU1oIv4MFY+MV4Ya4Qj2vFALpVQn1YEPKMFYIa2SIMRe8sJT/5frbcCJOx1oC397JkeYXK6JevmUx5XUPuVVWsssD6+gy/vc7MejdOOol2B2zxyk9RvVhwxYVIfsBcvLvYZQLljNyTuhUdImtIOmVeb6SzAMpCEeaNKtN4vThRO08CiHp/KDoXGGA1aNzS1AE600wdPa43Ti9BrgLLp/p0PQ7i2q1JPNg49Gh/n/sSmP+pFDMwnfTCGgGOrBpJPSoOkGhMAq+cr71oMpeFjj4jGC5RDMXfVPsgH7ti9dGzUcC7r3c+97fKhQ1PNO/3mrg4B8y5di4szHJnyuvQ1Hoe38Bb2FRr1t1TGOnkY0FLpOCx0Joj/Rj+2MmMGDJI/pMYuylxdbRTU/I5OCEkSYQdNLA4Txz7YSuo4KT71tsRWnbxr+YPVd+1rz9XrTM1OxwsCGJh1AKnAcpLMfTnE4K++nUU2kCq6g2BJ/nxQPlu89/f6Q5uMdT1FndV2HNC7k5P9mewoiVKLSvEN0KS6JiRdZPF+MSR4reerafAoFo5bnNJFQqI7xcbHM= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C55YtgVRSNm/NQj2meCCALChkrjV7Ivc0rGEKqTEgI3/CVOGmn4mxVRrwHfrn542DKxVOOdcYLBrXh9RYKsA21ctud21LqyCLZI0I2hXIBMUO5u9J4vZOtkPDkCVZP5cE4wJv833tbCe19Fjy/cPQAv7M7syX41SojmUSd1KbE4z0aAS3tYWLkJ7NgibpFuCo7Da/2KDAmKH82ysp6DiKDeoWJnsms+vo/8AuC+ziJAvBt2eRW0/CidLITbZcajxnrynmCt13X0MwM5JfsXGuHiWck9MK6/5KeQmsi1g9OQ/e4+dsxDuxBtDPsIVrNDSw95aJuvLrgP2elc9on6Ov8PeYcV0Mk4h9ugOU6QiPcC1yZ7ZH1dI1ZYquQe1YSm5sOaWRNvhx0FJVmwjVcUVmLrjKFDxW7IyS+FOAVj1+dv3OMxnSRotUTi2YWwvREJN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qKnJbFY6ScKwXPrKx53bC32s7J8S44piRcyMyjC+GEIvcKhDGSf0RsEsVQmeRmRxe0K9VAZ3C3fzmZk9Ae7uHklAXqMlN6SkkRAiMq68H8Bh23ePk/zhrwz7r6yFY7Op4Bl26JSyU9Se4spTivxnmA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80170590-dc5c-4a66-8508-08d984185006 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:43:40.9010 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 012/218] avfilter/af_aderivative: 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: d0ZSL2wDBsof In this case switching to .formats.samples even allows to avoid the runtime check for which filter is currently used. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_aderivative.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/libavfilter/af_aderivative.c b/libavfilter/af_aderivative.c index e37f978df6..baa272d609 100644 --- a/libavfilter/af_aderivative.c +++ b/libavfilter/af_aderivative.c @@ -27,29 +27,6 @@ typedef struct ADerivativeContext { int nb_samples, int channels); } ADerivativeContext; -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat derivative_sample_fmts[] = { - AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - static const enum AVSampleFormat integral_sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret = ff_set_common_formats_from_list(ctx, strcmp(ctx->filter->name, "aintegral") ? - derivative_sample_fmts : integral_sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - #define DERIVATIVE(name, type) \ static void aderivative_## name ##p(void **d, void **p, const void **s, \ int nb_samples, int channels) \ @@ -179,7 +156,8 @@ const AVFilter ff_af_aderivative = { .uninit = uninit, FILTER_INPUTS(aderivative_inputs), FILTER_OUTPUTS(aderivative_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_DBLP), }; const AVFilter ff_af_aintegral = { @@ -189,5 +167,5 @@ const AVFilter ff_af_aintegral = { .uninit = uninit, FILTER_INPUTS(aderivative_inputs), FILTER_OUTPUTS(aderivative_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), }; From patchwork Thu Sep 30 13:39:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30707 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp685853iob; Thu, 30 Sep 2021 06:45:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxsla7fF1UERMkSh2Apk9A1AN8QLGSh/+6TgkkPVlz8GJ5XfweBO1AoxuXv1ri9HeCzz9e X-Received: by 2002:a50:d989:: with SMTP id w9mr7567490edj.99.1633009519699; Thu, 30 Sep 2021 06:45:19 -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 b6si4202110edu.99.2021.09.30.06.45.19; Thu, 30 Sep 2021 06:45:19 -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="d/TCThgJ"; 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 9B7EE68A929; Thu, 30 Sep 2021 16:43:48 +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-oln040092069105.outbound.protection.outlook.com [40.92.69.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B08E68A8F1 for ; Thu, 30 Sep 2021 16:43:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WiUEhE7L/srCuKnU5/ZLikrzfoJfEV4JQem60/PfoSUEF9+XP2/7IwsMY6U4Og1Sn+h8tpqfxHu/EZ29ivcLcOuQI3xpYF+u+UXjMx041RvnN9Y3uqHvAm6VTkGvgNwCBAFVuLSg00PqMAsFIJndKocyIDT+q/draoY9MvtJFljQdJGrhAjNfRvFML0JzfHOAmsygY0yu9876WDHlrJaS/I9P5+U0WMoVHLEyvch6oyccxH8mnZTzFV4xVzq11PoduJlnwxBDsTFEk9qQTHtFhlNzQJmSyY6f3gV5ehmhYX9y2ggMYG/6ATj/xxEkST+qB8ndhBImIF6weasOh2dmA== 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=J4VA9LveMYLqfeyU+0a5CY0VvbpOo2MPvJnSIXARTFs=; b=RXu/qzXP5uLc4wKkBTfAG6AMCzhCOv6HLAvLnGMzmHbk0wKe/pYKRPribn7U8xuKweoAsWyS4MJaw5XaRWGzvWVctksfU5vYSR2FnBjC0ulc92A2fB/BlVwrvcNxocXjJywRwAVmS5bPvmepaWdSxlcTJ55a2kl9iH2Br90EKLGFaWpAznncYtUleQ/Sr90ljOdsB8BjlNna5AKZr5W5UGI3PUERivHjgR5afJ9QybRv2Kg2oCznh1ThP3Fdph1jYaZ9mdHpAcFtqP0WfQin44BpmKsiW/oWzV9SXymnnvlRiBkhORvIM947se5tjt2NhAyH2+lsu4qWDEYh4Z8d7g== 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=J4VA9LveMYLqfeyU+0a5CY0VvbpOo2MPvJnSIXARTFs=; b=d/TCThgJyi9XEU3gorqarFoCHvsv/RN0skvhwElQEYynxhX2lLJ7omeLsx6ENuQC+S4VSYqUhfwEM8QfXlOsgZ93Xwq7lKOlDXxq/1YeUoHEDXoBIlrJ32uFNmfz5BTmtNhWph5H8EUTOH3DPcB0NdaoAJs5IvJLZjXnNfBapsvVqdGJLJMbqtdGtWU+RGOzzeDACISr8Aow74n4l8IpDO0Mj1l1if6ECsqTXy+A9qz+Jj9DmDFZsWpf0bjPtRGs+YGzjC9M0DjhY5Cl84Hr9S2o9hNWmtuI0YsGfTt+nJ+oKMKyb3UUY6z9dLfs7/L3VEhEhNuqbRBVnX/7APeOGg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:43:45 +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:43:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:14 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [jjJIlN4FL1dXZfR85Qotv0aXDrLO+R6m] 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-12-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:43:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4b5c8d4a-e1bb-40c8-0783-08d98418528c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbNM4ubwW/IaMqweSBX9F9ur7qmFqzxDfKwgqYDMeXHpo84Me0fkiOG0fzFfNJQej9DUwSzdh9VX1PEEY/G5nY/SZ+Ano7DbJRk0YjsDrS9vlARh98nRnhazmwSZ1YWFkHJU3BWbByVQoNru7irssRQobMuqLGTv85Ro8PHFieP0WiFQz76D7SKmNmfVQvC0a1JSwQ0rWi6Ss3Iuzk+syIYx+P2lM7Xwkg0ly12HtS+EzCqQuG7M784ZfH+xbhCv8+HtQozT0bGav31BPB9tR0mng9DU+zQBllc1T6GZqTCI7siLiQNjNetbQ+G23ctIliZxM5rUo0DwCivAT8S4hzlLvbBtc86IUgcspuHCJPvOBMzAyqy0XKitVp5BcsfiTX5NQBvIBOLhll5xszNLDIIby1CjXhyXEmx+edh4fcumOmf4kpJTDTFU023q7AD6kNuY6BKlbIkCEptOjEYBQdMneS8RCrEj18u5MHKPiWwYQSlXY24IA6yy5VBNddc5ImJE7wyV61MqCt2aerIHmD2PAB4kgQIQzv7AmIUEb5pSfjsJ9eHhYZbDVoV5qhfuI7RdOfydK/A1KyT6shY99gd21m+LMas++YMHLJCrM8Ji118eLO4FG0VAVM7Ji9oUA6dLUPkAhIPA5w6SD4Lm76jbEIBQuzeOZJmaWypotQfn96MWGkJWArA79ACj52XyolXCrW/uxZMZNZvcBIbno9lihDVqOV2a/aY= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ar96OdRzTionIZ+1KCrEN4v/zvwigJqlBeYFAr2INRA3NFPI9PPXQmD/acG9ev2HJlps8gsQOn6oFu0k0xCoUw6sy0EoGBkwK7sud5LTaxdQQfwT9N2uCHlX/8IuHNPtxEVLF4XY5Spbfa/KM75vAsYrZA79UbfVsAF+eZjl2yoIpvneTicU+TRQlRsyuy5/8LuQ6V8wkHlV0WiWcyQIInqLaviTFqf0n93MNZLheiWOAVVIYxaWdP4j7AOZhdnLn3TuNlXD9MdYKIwKJsosRMCQJBhGp5NdVVGYDL6n6kO6DdF7ZKsi59Ud+/rWkN/VgnOio5qoG9WBTtmFz72WLEYhMRKNCNPhxeEAlZU2C2nOvNCM6WzbIIHx8ZdHp3VnTG8Xhn0Hg72hc+qk2cTUYEv12AqoWE3YL+O/SQBCAMFmzUlBnbR8l6IIrjUk1Lnn X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5Fke/vy57XdWTKchF6ogIgT8CMd8Qful6wFcOeddnXip7zDUCQiLwpq8r6egb+M0fbxlD0qCnp2jF8BuXlvgKLMlRGVdsnKgpzNGkXI0jH4dzaxY4saYoK6AySh+QkOpSNnVHq5n9O4VIvKO0x37MA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b5c8d4a-e1bb-40c8-0783-08d98418528c 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:43:45.0945 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 013/218] avfilter/af_aecho: 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: eV35OigDsH2K Signed-off-by: Andreas Rheinhardt --- libavfilter/af_aecho.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/libavfilter/af_aecho.c b/libavfilter/af_aecho.c index 508d54b04e..73d9f1ac7f 100644 --- a/libavfilter/af_aecho.c +++ b/libavfilter/af_aecho.c @@ -152,24 +152,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, - AV_SAMPLE_FMT_FLTP, 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); -} - #define MOD(a, b) (((a) >= (b)) ? (a) - (b) : (a)) #define ECHO(name, type, min, max) \ @@ -371,5 +353,6 @@ const AVFilter ff_af_aecho = { .uninit = uninit, FILTER_INPUTS(aecho_inputs), FILTER_OUTPUTS(aecho_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), }; From patchwork Thu Sep 30 13:39:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30714 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp686048iob; Thu, 30 Sep 2021 06:45:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCBcJPlXRNlpBqpt3I99lCiPQmGEcjgL1jpj3JOomIBP7PMWLSAv5LEgbUAiJjf3Z5elX0 X-Received: by 2002:aa7:c686:: with SMTP id n6mr7279998edq.101.1633009532858; Thu, 30 Sep 2021 06:45:32 -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 g23si3496741edr.321.2021.09.30.06.45.32; Thu, 30 Sep 2021 06:45:32 -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=R5lc4Fr6; 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 9C9E668A940; Thu, 30 Sep 2021 16:43:50 +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-oln040092070022.outbound.protection.outlook.com [40.92.70.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1185F68A917 for ; Thu, 30 Sep 2021 16:43:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JGRIfef3HHcU3KwAMT0uTo+iv81FA9bpb4FPC7OeNiliOjcpx2RbjSr1VOEIMVtYGX0BKcQVQL66lYORSdp7KTeGyS8iVb+N9cKnVYs62Glhr0uP9+5g/VzNtUfT8zLIGDz92dby9kVRblyidoiOX5dbiSrwqukZea7W4xipEQ3+h8ZzyOl69oVF5PCBSipah0LYI2uMOCypdCnc5dpNn9/gy5kVE8oTiRQxSvGHG8YqYSZNMJQh84qfcdRxrg63oRAUYOUOZVF01us7oknRVsiv+JCXrK+6HhTEKzbflHs49prMGLY9KRPMJpCOFEX+PXAsv+CbmX9rSbIjWlY08A== 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=vTQyw5f9MBNtcZSQ+xWRxWP5rzErhYTCCyc8oCTN6rc=; b=PmQjoa/7oGpXoJAq+ABT65jbNB1KRBtpIm08O6LfkKIj6LGgdWwIaBEMmUhzfdxYrDo+kecZ+onPICGE3xh0SY6ufCOndn2o1n/t5bmNqvv5y3Q5FCIIWwWHXCpC3vLkGLJOOAbhIB3zvxKJYJmnY8LEuIeC8OlBuIkGMeKsARBEZGR+9zu9AcGr4tFR+Vj3wr0WSoJCP6APRDFO32xrElerio0e13T4mn9BHm9fPFWhNT3whRRmVTvMHQebc4talTxuWbexjjXNzBZCBu+oZfybktADnWpMvF7Huevvqma8Pxfk05bub9vUzbHEb28nL440eLhtZf3mCGgZL1rtvg== 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=vTQyw5f9MBNtcZSQ+xWRxWP5rzErhYTCCyc8oCTN6rc=; b=R5lc4Fr6kXpcwxN4yhDZ9uVup4WUmW9nWmCzayzLIXCQBwRQAPVhAnEALW7Lht8eCVsx+z5rCzmpCcMfcw/xxtKZm2jhZsYvsWxfn+zqjnid2yG1dxBZ0ZGlyvQe9BcYi0UtT9f8wQ0rwe5Gr5KfEvkwQIglWqEXxBfepr5c6y7WlQO04E95B/E3CHeu/1ONS+acvIwB89k12AlkhSFJHafO5JdiSFB4BOScqMvJ5L2pjlMe+NSmSCtTyefnywkdhK0FKwlIAMcr/6c8C11C1WePJn2bnhfH9rR3w3wIRvE7Fv5B560STpEi+Yj73i3HiCLbFm6wRv103sBzWGaosQ== 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:43:47 +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:43:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:15 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [lLZfxEHaxvGQTDjpfNFMrCsA6Z2pGIh8] 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-13-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:43:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a013172-2585-4a05-66a4-08d9841853b6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymKo9o/g3zytw/A0Qrrb1u2tz4xR1Iy2+62OBst6EZWuAy9vH9BbsHrDmCyRq96GSBbPu9HSzHLej/bMOAOBt+XMhM5lNXdb8/5FlUUZLzlkJrHhm9hUEKy5Rj4dbuRDxMJJ4tSrq+3FCjF1amFBtU/N226hUhGPFjTSCDKEC1iPsBSkXuMIQ6Rsz4T43J7lKvjuXw6TR+M+U/0KWy1ityxwl2jT3dudQmOYaftqnzhe2FK1kgK7KwKNWpc0GHcyc4Yp7qrDR9TvaLeqgMxZK80IMcw3R3WY0P9oX9pcuNRxnuMjDidEfqgHgG9xz2cYEwcZkH3z4E+8Pospizg696WW0fGtr1ZYAWf7Kv8ifnMhn6b/eLzuZQxzgYELPtajg7WRCPLBWjs1xKvEGgJknVSMw5keuA5h6+6eOLP8EgLuAXshO6W/CShyF3A57fjEbG1mxL6eX55VQMCSmlr4VuahwJSXiphYktC5xEsdl7ce+eiF5LQnaWsAJLUE+YAkU6bJ0TOPQ+pDIxZuW8BKk3fHuEvLfEtYk4Hblx+ygWRkOJ4f/l0sIs/tZAYZZxYIxqx62FMZ8q0xt6qwWufNNEmLGSx4/fsp55VNI8fXbOn7IwY0FHtrdjjJKJETbf1aBfVPcjKJd99XlhogJJx49q+FQgG7ertY90gAVJxpItYsDuJqFMVpP2pwmwCepso+GabEZSjdv4XajagPjqg5YnBtddGa6QirhHg= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SgaWPADdm+ndcowDA5o3R0K5krHn6WyD11aFnXzB+eGiwsKloz0vUOLSalOLB35+XRnFyQOrrxI1geMtyXlONLZ55xtACakUlNyfZGc2/e021h1bpXVxL19kClFxu0juYBRwmbd+//zBH1ciJglrpq6Yk4/+aHJ911rUD6NXD1IyCQWPHkmTi7nlYIaH2O98xs7cx3dL6oOgu4xfnAvFLzQoawSLokcBkUGDxv3KF1cNYLUAJoshfJuFeuEJVUzSiYSbz7EHT5F5B46Th+yAm6tSSs/b6MJeRYPCasQIpbMN0NEC3AHN7wV591zOmeBtDnkEJQkneIu+b3Z9ZzaptZ95xvyOGYMHjGD+asqAojzs7S4bJZCeyA17qexkcPKWRIhp5AjvPnhf3PzcI7XunTU4pn3zSZBsx6i0Be85C1JHuikmIQEiRKfjgsvnVjjb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YqjQ2AKfitIkNNVvceUGZQDMzCnm4Vq5WqD8j+nKHYBwZft4g7MZfpi18/TRi8aedy+CfqdcFW3+Mw7y4CC6P8lQBgyaDxdBAWvrIOzXqfUpw/xYCppbdGzAsB4lVBss9pWa+YaRITSIvOJ1UH3hBw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a013172-2585-4a05-66a4-08d9841853b6 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:43:47.0400 (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 014/218] avfilter/af_aemphasis: 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: wCgrQeWRqqO+ Signed-off-by: Andreas Rheinhardt --- libavfilter/af_aemphasis.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_aemphasis.c b/libavfilter/af_aemphasis.c index 54a47d2c86..1adfcdb63b 100644 --- a/libavfilter/af_aemphasis.c +++ b/libavfilter/af_aemphasis.c @@ -151,23 +151,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 inline void set_highshelf_rbj(BiquadCoeffs *bq, double freq, double q, double peak, double sr) { double A = sqrt(peak); @@ -393,7 +376,7 @@ const AVFilter ff_af_aemphasis = { .uninit = uninit, FILTER_INPUTS(avfilter_af_aemphasis_inputs), FILTER_OUTPUTS(avfilter_af_aemphasis_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, From patchwork Thu Sep 30 13:39:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30713 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp686239iob; Thu, 30 Sep 2021 06:45:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIZvhexrpAgli9hYRgR4/OyEPMmCGXuQiYnvI3O6LETuj888ZX3PQ7LfYPN+a/1+7Uxt6q X-Received: by 2002:a50:d9c5:: with SMTP id x5mr7180796edj.37.1633009546453; Thu, 30 Sep 2021 06:45:46 -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 l2si4536585ejo.509.2021.09.30.06.45.46; Thu, 30 Sep 2021 06:45:46 -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=RvSEop25; 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 BA16F68A938; Thu, 30 Sep 2021 16:43:52 +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-oln040092070090.outbound.protection.outlook.com [40.92.70.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D338E68A8E7 for ; Thu, 30 Sep 2021 16:43:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E3tVUZHLXlaWyyxbnRmHcxF5elaDhv2DUQSbAaMCVwVN3DbhNUD+MnAoRH0GOmU3KckBomW1/cSjixlo77ZIWj89bKqpObd4SdOgBvq8O8KKljdlwPcJRdUoyJfTDtzfl6nby2yp/Il5gyi2nQw1fgbGLgMxrgZRICpOCnX4aBsis+mCj7VTNHn3ncKrrzSAjhois5RfhgEiwdxdUZrYCG3aMpLEF0SZLn9NIo5x1y3rBRkhYdpqODBGsKynG08Iu13Zk3G+K1u3o2jWQCDSZrovQ3txcVYuNUp7IHtGNQCCrhkUA88+4zz7SL9sKFanXr//wSuycbRvweeJ09OENA== 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=TAJpHjcpGwQaXMt/e57ZUqm2BZovlL/R3Cl1+8HZ0V0=; b=BtISDZKvttTLL4PNTZKJZZ+fuL2qTKHDDKcbHSN1KR/yb+yTfgewD82aY76Bh7rKuBxRY4fTbDxCMGBlASE9K7V9WdcbLjcTqQqD+YIG7K0GF+OP4KRJk7TUJy7kkW0y14Vd7vesj7+XfGXkbgJIgxQ6UQaw0kzwSJFJaQXQfrM8Tl+ii0Q81ygEYmqyia3KMs7WS8acIRAAejUevpG9L0gm1ZWwKGCEFR5KoMuZFGEGM01+pLk66qmjzM+zZN48FG0tDP1uYHk4cdvz9173DS+5aHqWbJuawwJIi6JY/pSuiM39Dx05sGeWCQTIcIZkmmieGRqAiNDtBd3nMGFjUA== 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=TAJpHjcpGwQaXMt/e57ZUqm2BZovlL/R3Cl1+8HZ0V0=; b=RvSEop250Mcyx+ScV5Ka050DVYwEzaddU/WlDc55mRTmgJTs/zQKpnqcl469Ztw8U/IrEw4UDxM5wJhjpr8qQ+XeIe+MGlwXrAPFlQmTtQbvYQ670rJq4DgvzEhyNRQi7i70vfEfo1VzZqvO1oWhhuS+UOIkVPjpxm0kjfiZkLKv2E5ThD8qNF6utqKWR+jMrq5QXGEpmyOVMtXhnBJNG1qyY+mqtnISppoetu7IRYlT15HmuQLqomMCWVRtO9hmVMMaahyjMbVx4MLpDA48f003G+OnW0+Ju6J4dMYiiUuLVVukFNabE0UaNH3dxt0VrLEhFQnvFMvpPF0mW7ZPsw== 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:43:49 +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:43:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:16 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ikeiIYNeFkHQdDs8JvtbQGpO2z4+b7sB] 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-14-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:43:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 040ce303-0fd5-4d72-a55f-08d984185539 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV5C/IQ+NYWVWKJ8pLytsgGEeEBTL1e6SwUsr2kei3/VbDF6eRbb8aga2RvryrUlyxqSs9MmjNKX1Hv8GLh0D5UcqCwgL8ktyLFUZgKJRP0RsAN76KWQHse8gGWmUwpy4RZUSsV0zFXq5CxqpB5tZZDY4CC9Y1l23vthsMW+adZmGOlxxcc/3W2o0jsDWQZJ6/WmUHQe0xVrRMIzMCn210cGxzSPUI+S+Uk4oQSTgEbkMtEqJTD438PgLcxcykWx6CiYBqJtaDndoz+xh4uPLfkI2sUE6rJAEDkP4QNL6jwzZnmwNF8bbrIgQiBVMLlO6M/whr+Zem7lBf73wld1g64genmiF1c4Q+FZRgXT9IVifJHqRm0IgsxLGSpNCUhEKBwdncRVN+DnhJq0rxwpIwsymGBSXftw15q8A55P05GSA/gzogt57GDvpN3dVNKhxhPBl5GtGmSkifXbuqXBxV7oufWpiu096SbPx/M5W/Q0C7RehflS70TiRrz51ePuXgN/mB9vTxylCBvUPXmkV4ukVTTXnXDyb/Nx7GRhoNCQMO1r8/eJRzxaLAEqL9kf9XNBI5+LXApT5960MR3kUXtA6ptXDs9pS+Q5RXDZ2Y8GEzeNT4BrJ74LZAuTbeL6daOEhNtHmaRvNrcL8Led4SZ26cCsTxehTTOpoOri8Ujn6ch+K064jOOY= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PXg1nZ5EgFGmGsy5aBDkNvG4PhbUPOaqWHBAHAH8PA9PY5mJpVwEQyZAxEK/OtbRCfIk88Stp5Z9QoxjMe1m2BCh+Ka3plWSAvPhO2PevBhbvPISnzZn3dR0fnTziOfnfuJQE/w/lrMxMr1cadhkvBbdm6zZwIl4iQPmvd8n4TT+jB+2brhGgfkNZGTR9Qdkd5UYHzRBUfWC46VNMKwskBdku4+gQ0CcvKdxvjYSYrlMVfSFyMNAWdt0DCJvFKMFdA3zblovGxdxNpdIlhr5/t9r/jSkYfUFKBjovR1svgDm/iFhdPolqMfDUiALr358cQ7faYp/pO48zAr4QYzordg0GHDoUdjTDjcgL5tbWvrJhzMeH/RfqZ02dZL62rs+5GGl6+9Xq8kFRdRmJv1aVuRkbDzKg91CWsVhQkMtX0E1XrG+w2ifCozl9jJRs38H X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +cLuEB6WH+ZBN48uP/J1CV/jsC2XmREQOj2TYV85EpOA092xBA/mHdxmZMvdAlyHlTeWPpsHdy+6fLUj5AYzLWAmTc9obqoMHDv8GvH7Hq6/IqmYy/JNxRnBPJPwZcKVfR50kWM9R/OilHh3Jn7/xA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 040ce303-0fd5-4d72-a55f-08d984185539 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:43:49.6515 (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 015/218] avfilter/af_aexciter: 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: usYNTy42p6Kv Signed-off-by: Andreas Rheinhardt --- libavfilter/af_aexciter.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_aexciter.c b/libavfilter/af_aexciter.c index 3300ebbd4f..5d76f290a0 100644 --- a/libavfilter/af_aexciter.c +++ b/libavfilter/af_aexciter.c @@ -218,23 +218,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) { AExciterContext *s = ctx->priv; @@ -296,7 +279,7 @@ const AVFilter ff_af_aexciter = { .uninit = uninit, FILTER_INPUTS(avfilter_af_aexciter_inputs), FILTER_OUTPUTS(avfilter_af_aexciter_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBL), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; From patchwork Thu Sep 30 13:39:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30698 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp686442iob; Thu, 30 Sep 2021 06:46:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVOODWkzVbWPqMGkSn/7jX/tZGSmCOxGT6P8/aYGdQ5W3stk2aLCikRId7ZvP1/i3Rv47Q X-Received: by 2002:a50:e183:: with SMTP id k3mr7680584edl.22.1633009561809; Thu, 30 Sep 2021 06:46:01 -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 v16si3373663ejh.673.2021.09.30.06.46.01; Thu, 30 Sep 2021 06:46:01 -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=n4CPVwnv; 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 D999A68A998; Thu, 30 Sep 2021 16:43:58 +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-oln040092070076.outbound.protection.outlook.com [40.92.70.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7475D68A825 for ; Thu, 30 Sep 2021 16:43:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fawVOHKIsPdLvAuAc8rlpw+pfl8ChBgseU1ZUMROchUCJENjGtnUeRBZJfVIpI6Kp7FzsWxgqOjimOBIukJ2MX6GLXOlXRO81ayGOPQ6ALIxIbusGHcBTrruw6eRiz6TatytCU2z1EfGXXcwoSM9IAuqDVWjI4k4aSs10rCeLKBzk90S+PHqOPX586VDTrNYMyCXV0vhb0ghMiCH/dklPAgs4MmgrQAivzjXHiodnQSQr8ySoGyWfXt5s4+5obY/tnceS1bSo7hH+UqjZGAnquxy/u/X8WOkiSI5OGVuJFuFtH3bXkptWFx7CBnZAnYkg5D6ZjMEdxh9Yc+Ctbb4hA== 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=IPD4g/YDETR5eM9djZMxOSgjUwCT3WM7ip9s25gfz1g=; b=HoPHNTy4hSgKE1Yqrcs65klRz1Wo2UiJ0lvSy/KCIwdoYqEuLRo8MeOr0MfyRi5IBEaBdlFmkmGH9undNeyCABHEPQRPJ3PHjlA8+6kTEBAFyh2hFn7hEE6hfPvNUy3DBhyjfOgYjFOzn4oKfh4EeT85QhpKdxG0iViZ7XbNVdz/9p5kIe9Uq8pXpRaffomdy1laZprcp4BShvcOZOL3EJJSb0I2OdbeF8i1gl3uPVVJVT6fr9a6LovZoHDRkp0c45npEDYVxbbQX5S5/DZJS38JVTCqJ/N237s31ym4//zqxYM93CZAWLbL4uEN/PTQEIQ45a9t6Xvw/G1O3E9QhA== 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=IPD4g/YDETR5eM9djZMxOSgjUwCT3WM7ip9s25gfz1g=; b=n4CPVwnvPvUFEKNXhvO9QVnl6KfTv8g0BpLnB94c5+HPTyULYvM1/+wLbe8MkULt4er1p/cLtUg0SW6UB3sIlb3awBbvXLcIqo7vQpfGJjGgIlTdshy6KlBligRZXoNU7G1Gw4l1rtjh8fpqEYOAgJ5ilrTGK9IGGsEfndghHLJKRHArosLFj6AJR+EtyXTygjwXoTw5fIa64bB2pv0pgruVuSBjWXtPx1EVGxFZ6q+7mKwZdLkuTezuPtWQa3VVJNMkFCt5vrB2NmoQquIfzuz6bCzbBu0t2vM0UIKzZ2+9Y9FO46PakPwQUjAwzA9Wcnkg0NWmV+QkWLyIB05szw== 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:43:51 +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:43:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:17 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [JTLMJGt6rmRzpoI/IVROVZSz6vPAn7rb] 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-15-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:43:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0e205f31-4a15-4cbe-25c6-08d984185623 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9NZAhOZbxyPxDw/J/Z/6q9NsoeM+NNv91Gucds3U9bO4jeCBIghxKt96i7Q2I6ZKsXq94Rodm4SEqrUiYb3LTsSWRED2zHxFlHPBIFJwHC75zHBi64K7aeo1HaE4mT5aZMn7/k/9g+dcB3SZDW4VE+q7y4guovtKC6CmtgylhAP9OFg/F3qFirTqInf0WpsIjO84NtoBQIlWRbeiA0GDm+tKktNFYYx5HwMCQsQGBBzk9LIArphlx7lEWP27zkb44jLia6UtHOSqKEzZXHSXSjg9va1ejwLhnAgiaqRYomvDYhdYNnCmguB29iWQJTy6Ak9Mg4+f7qnZ86jeaoSw9yYsFmE9C/a7r1tKPSdNhaHiMlqyUvDDwQur8sBFf+/gZfTVagdM0Fo2ZpN+osJEZuqd0zfh8/+5607XV2V5sxR6pDUl+RhfRKAiJ+WKcrsjKb4YUgvgNOgZUBAdVIpnVPhoQfHKRcEeeiPIMdICgy72+pCE1KD1ON6ABIG+jGsz1C95tRV09pYCUC/aTS9eMyhtAhTzG4id8as9kWEBW6pojGmE7qTYA8CoxJ6rXNh1th1VbpFNKWz2O037nz5IQTNFlMeSzNQApX5BekYd/fYWMY6UsEckbS40V7dDiLFBazW+qKZdDx0rGN1OCp5dLun/wZCDMkOmOmS01OGGCHvRzqrlA9xIA0MAeKFj4rzHdl0= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: taswRTsBCZdUgeL/ImDrHYDpXLEPUbIvuArIt11PMw8GaR1GfktsL0sUgcNixSImwoGwCQ3/0GPHcEyhuLUY88QFgtWSTBk9jLr/15LUC+nnh9uR7sq/H/NwDMP07/XJapKTocWQorMKLrAIQQ8+7+UcXKIi9LFt7IAKy4PVeu8U+sm8m+HWa4gA2qDlK//g1DcqfwXyyjg9tAScGWC5ifUWUXhxkTGciOZrZSQON9efSkoMWEoJgNhubsj7a/Yk4WMdTypqxcGo5c66BIwQLk5nq+P+kaqZgnmqNQ4udMDrcbtUM28Of12aBWyP9xFt+jC7I3UR0jrgpcnXCiaSMaC9M9rVzqTukjR2J/mFtDRNatUPc8jyOEISwDoUxH8Riv57L9hDNbVLBQHhzYf+9j2OwTSw6O7IhZLFLA5JP23ECAX5YZ0C02jEdzcdw+Ks X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +b0Avt1xc2m6nJqPp0kJSvyYULlFsogzeJr0Sbm0wUAmhNRWMZq2bOyvTUQM6Va1gCOk8rEtApwW0XjS0AR5uc9BnJSzoL6luJFweIp8POGY8DFZEaLB/yV+Mov39OhQR+EM9qC23yYwean9rsO5Zw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e205f31-4a15-4cbe-25c6-08d984185623 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:43:51.2833 (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 016/218] avfilter/af_afade: 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: h9TIQ4+fcxYs Signed-off-by: Andreas Rheinhardt --- libavfilter/af_afade.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index c96a8fb7e3..458712d3b7 100644 --- a/libavfilter/af_afade.c +++ b/libavfilter/af_afade.c @@ -57,8 +57,6 @@ enum CurveType { NONE = -1, TRI, QSIN, ESIN, HSIN, LOG, IPAR, QUA, CUB, SQU, CBR #define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM #define TFLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM -static int query_formats(AVFilterContext *ctx) -{ static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, @@ -66,16 +64,6 @@ static int query_formats(AVFilterContext *ctx) AV_SAMPLE_FMT_DBL, 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 double fade_gain(int curve, int64_t index, int64_t range) { @@ -357,7 +345,7 @@ const AVFilter ff_af_afade = { .init = init, FILTER_INPUTS(avfilter_af_afade_inputs), FILTER_OUTPUTS(avfilter_af_afade_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), .priv_class = &afade_class, .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, @@ -633,7 +621,7 @@ const AVFilter ff_af_acrossfade = { .priv_class = &acrossfade_class, FILTER_INPUTS(avfilter_af_acrossfade_inputs), FILTER_OUTPUTS(avfilter_af_acrossfade_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), }; #endif /* CONFIG_ACROSSFADE_FILTER */ From patchwork Thu Sep 30 13:39:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30703 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp686649iob; Thu, 30 Sep 2021 06:46:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0MnJt8dW0q3WdjSsuZIMbM4QDl6/jUpAy23KxbCuxyoTW9zOxqtUuCCPIsqTqIBFTwjic X-Received: by 2002:a50:e101:: with SMTP id h1mr7236007edl.245.1633009576409; Thu, 30 Sep 2021 06:46:16 -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 g16si4373452edb.603.2021.09.30.06.46.16; Thu, 30 Sep 2021 06:46:16 -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=j2Oa1FUK; 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 0B1CE68A9C2; Thu, 30 Sep 2021 16:44:01 +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-oln040092070064.outbound.protection.outlook.com [40.92.70.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 610F668A985 for ; Thu, 30 Sep 2021 16:43:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PoBOfiWgL4/MEeYfgF2UsKruDB2Ei/gcRAr227l7hTUCz4SnUw/2X4wqUW5HTa7E0dCWpuedGEPIP02WloV8gyCsed/QLzcYsQym+SCINwXjLgfoHR3/nBk11chpIZsbiXWMFQAKlUDpos1rL/Q/4A/WGDTvF28BsX8aJGdUG0xMwuvrMLoXz/voOv3SKP936oii4njKfkC6Qb/AvTTIDEJNwo6eF2bwAhUsw8J5qS/mLhLQEZkn3NgQbmgbStvd33Tzll9FefCWu+5RwbDXuTyNP7VY91E1PGx2IlEjyo3p6y820Wr8L1bTPbxGI8xyXCXYCM/7Ao+0g+9vUQGqGA== 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=4EEIJxaLgk7cKGPhEuZX3en+rrzhoTtQErHfJZ2W1H8=; b=afJcfQxrk9GzJ+H6NGbWfANPBjGRKmbmFNVpK5U2AC2/76BXjfwrCAKotjZjYR0dYTWXzqvFcL1If3E3nJt7wEU7S4iDrLNcdlSGZosSyAh7h2oBV0TgB0EUvehDRsdHBLBDynMvRcqMmRf9QsIVgpXR4AFxwbidPa3ZB/ZktBCJ5I5l8g8krcndb1YLfa6tEkeFlRumS6VZuSq0Xk+a+CivwDr1rXHu8ShT7qC9gjQPkVY3wwPkjBNGpu4wEzorRPJgOy0ranZLsuD4FbX4WuLlf+wo1hXDs1PkP5UlS0eysDVTVlreHKHIEjgeLrzr+D8bL+nwxU57vP9YdZ7Jsg== 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=4EEIJxaLgk7cKGPhEuZX3en+rrzhoTtQErHfJZ2W1H8=; b=j2Oa1FUKNRaQh2k5khYIixtmXqEnYIvWVlpY46+rKJbj9iDLR70Mi1bIbhb93XDWsOkzFbWTaSFcMIWLl3RTRlO8g7/vMwCAEI/X7aXpkSaTC8QLgIM4JE8Z0EatS4PzLHoTOzGrE+Wm/9CEOr4r+oTIGQG8XOmpSLZmZv4Pp0LLe3eqvu6ZEVJPZ1EhkDM3Fy6SAvF62JmkVNZgQv18N/BwxmW+/+4k9bIj6nvsMMpCqziQmAWj9HlH+6NNgmYayL5U6U2mZL6Bxum0ErhrmHr0yGP9yRUxMRF4jJfeehE9d/+n41I7+IHgFk5u49mCW8IB5MxHqHYLVcWX3ivRPw== 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:43:54 +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:43:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:18 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [g6T5qbjvOq2bY+cdiUQxGoQYARSv0+Hh] 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-16-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:43:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dbd55987-c352-4edc-0e3b-08d984185822 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoVzKDlPW6+AUwWIMx03WP+g+/4F3ceJelRp80T+wSor6xarHiIXOX8peTI7BycW84Pe6qgL1tCdV/qL1TtkEXgCIAxe83jnGvptY9f3hfVJE9B+fn5MHGOpi/TJi2q9VCYH+Ro0VYJ/KOcQclCK7Yx3LPUhiqNbqg6vbWBK+/4EHKHucGrlNqv60U315QvDdTQdqXhJXcQ/4mAXP4MNmqAgmSIyqho4vMI9UeDSkUnp02WNEmbdtx5mT5kTX2U7i597iJ4NnO6zKquu7+uWMgc8DApOvWPVbORBp1bTuFelCkL/A9854iOX7QpiUUfVxY4C/htBhUoeI3rg08/8sMpqJIEFnOCXKLX+jiVqiGyuGZxpDn4CTGRl29MQtLU22Xkg3ETUSfLAoElshjGc3LNjwmgWuGI+7CS4fhxTgjMic6Zal0E+550VFTrhBHZzzzEpCe02sTNDfhWdzyXLjphJAMQ0lR4Hn974iqR0YIDxJq8RwxwQujdAmpIAtEofWUUbgiPi3D2lVXJt692zcpH8YX3m0JsC/F18a/QrQ0OSWGVgAA4VhV+aTLVEYyvgz/lFDYgmGOoMl5KEfDPa/H/fP+olJLmlXK9dDX87FfJPgqR0dTYqRKjSDi8+HB5CXn3u8hAcMH1u4jyEDPpWP85fgb1pdteHCBYObu2iKBsWyv5EDSsaCbI6M= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vAlK+LfX4LC/w2xPWioy392cLSAYCe9/zpLFQy+VrE9z/tHu/VEaLMuoeyMQzlJKVP+xUYW7Y+XYXkMGONEDz2jYCfo5uhrelCNNk2Ni532B05s1gEHbse7eQHAmo4TkvYtBH8G+HuO6YqwIh8iZ12evhZLBp1eziyS/dnkmHjSJag/NWcDGykTatAQBBMtbmmI3GVFTcQa9cDEfr7fMiQqOFLi93lRcCj7YreqwgKPwSVS12neHYAcQiScHLx6ORt+SzR7x6Bjuk3yNtFVTmHjtbjdKckgwMksaagkRCYcQr5m8S0Pp5yAaSqWHN8jgStNiM8xdEVF5no8ZNipdDP23nKdjogvwPM4y89lo563UjNfbT0g3KNOExN0jFJuGNCMjkjfMyvEVrnaxi+IzaDimh7wrkbMZfpLX+gacvQqfFfO42jbwRjSr1lnluhLN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PVVn32OduacbmjfA+G6DYFBKdpaoOl1GKzYILIms46T1cHY6ifXPgxI1osuM0KKx+EIM19m4eKNs/Ya+MKYz52hHG/jLrIzZo4rJh75ciH0JnowvRZlss1IMZErFNksFZ+xB6VggWvVbG4IOdfYg5A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dbd55987-c352-4edc-0e3b-08d984185822 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:43:54.4654 (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 017/218] avfilter/af_afftdn: 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: td0d+8RfmAwP Signed-off-by: Andreas Rheinhardt --- libavfilter/af_afftdn.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_afftdn.c b/libavfilter/af_afftdn.c index 27a0780ce8..a7b318d619 100644 --- a/libavfilter/af_afftdn.c +++ b/libavfilter/af_afftdn.c @@ -1346,23 +1346,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_audio_fifo_free(s->fifo); } -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_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, char *res, int res_len, int flags) { @@ -1417,7 +1400,7 @@ const AVFilter ff_af_afftdn = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, From patchwork Thu Sep 30 13:39:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30694 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp686869iob; Thu, 30 Sep 2021 06:46:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyD+heWK+QyV6WabEVjBaPHKrhHof57rBoK+E3F4ParV4N7nI/CyFYV1RYKIaMShqcVIn4s X-Received: by 2002:a17:906:3fc8:: with SMTP id k8mr6830916ejj.217.1633009590172; Thu, 30 Sep 2021 06:46:30 -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 ds3si4652904ejc.302.2021.09.30.06.46.29; Thu, 30 Sep 2021 06:46:30 -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=podKRouP; 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 22DA568A9CA; Thu, 30 Sep 2021 16:44:04 +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-oln040092070063.outbound.protection.outlook.com [40.92.70.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3F3068A9A8 for ; Thu, 30 Sep 2021 16:43:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aVs+w64DrHL8YkL3rvtiVAzopj817KiIGKbMyZal8A67HtVpiSKiXDeYDwMzN4TJ29gXNevGU6eDXXgSNAlfxtzZ6whZWwZImhRtLv5q27bgS2EAAaTtTfyw63EnFdM5SxjSFgab5IzyN6EIbzd32LRoouk1oFk1jefrCCmrVaou9w9kz5EsM3IBXjrfXEklk+l+IPzH8FaQbL6XNi1TZ76qD+4wf8s/92+5huagUAo9rRtlo4cjI0rqDmSYf7RQgXjsmM1YAfT3Q7IhxnkfkN9ZSsIKekLK9n3bI+ESPfSbteZBtUVCxvKjYgunyRerSNNTqtY1Sl0wwXE+MMCBQQ== 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=2d49Wel5UqJOZwqGPYNRr2wpWDOuQNbfGvR5AvUzVYQ=; b=PG4TE+xHPmkb6/iDbhhlWLDEhUeUzFrZrrSwNxwp7mmnF+FM5Y4XvDtSozGelX2UXP/9DsTonxkCgfNxxpqZ398BqtRyUzBFYJvkpFF+wJ+bEOn//jDXIdYGtx3+xcPOPOpUBbidVOiyENPgDKblGKIGGqtn2yEDE8DaE3xTabWauOoYE7RA0RKB4SwfP91UNwCJt+DIICCUFQZraVvBFKTDbqrX5Jhc4fWZ3mZSXFLUDpBad+hLwLqSXM6JSXTpNloy0mRCLah0BwRdLJbltbcJg615kZAghCniWqaKXfusrjMObt305hNp6CCfUCZvggYgLT67toehDlWbanVVeA== 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=2d49Wel5UqJOZwqGPYNRr2wpWDOuQNbfGvR5AvUzVYQ=; b=podKRouPakg5omk9K8Mo1S76PToxvMHc09zFqNiyDInSb3UmjmUke3oNa79Knd8eZER+eiTRs01T95pqobnloJ0+yWMelAq3hOAXoUjKUqZvc3a8ImHzyR2rQZG1mivwre/9dLE+pwyRgFe/gXbws7UQcGnzvNOjBNcZl770f54nMoU5Om1Zhmzrf0PHtxk/uUJiThj3ay3ibp4d774dAcHyg9ecMoskLy9fnCS4xrljlhe5do000NxuOYa7cx3jBWUSMeHLwc/M/Ik3voLz27ZD4o93eD+hQYmIdR8P1rTk8biiyoD+a603AXC5I1jSphbRwlFbC5AWDa/Hq+T0hA== 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:43:58 +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:43:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:19 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [h2RAJ+6QI08nTabH3EMVWmnTGcc2AFdc] 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-17-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:43:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4dc47ee0-fae7-4d4a-acd9-08d984185a8c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbNM4ubwW/IaMm+/51d+iCb3FwwXjUM+NpQFMmbBOg/8D+MDj/rM+2ZQnvGtKrFMibEJF/f9a8Voxyf6CcUVzHu/Z95vepOpX6tjoi3VNu4N+j0mauwECbHZ1QYqEkMmxkjibDp1vVY3JF9oI5FyrS+aJN0nwTKj0MAFh0SdtGwhiMknK66bmf7Gr45ZwznSpJhNii7KhtEW+0qhCmL+KmPYLbTQx2FoDBz+dyWfGEFB5+uPSZj7ssRHXZZviDxrLi+mVZkaKqom2Jcj8530blkgvRmxQevu4oHBhCwTWqdGGUCToj4li57ZjsCIhHw3ARzzBwTORHDVi+GXvJEuT6oUWZFPPsgIlZtMgbyns3qI5Z66xURvHpNPoBjSh5Rw5olOwL4pTekazf0+gZ7uJEzOT4odBraYw6N2PcYRyUPKQgW6WwYLUZcHp2rvYQsbaRhVstdEq8MJ0kX6mB/Ke0ywEaA2laEbsMMTySzsvPisxVls/SyrYy4AU1kDK8Oc08H4ZuM9JXPCyLcGkIqJnPzuO3vzyNHqwgQmqT2yrDM//hvDp0KjpUBpepEV9otcVIXkVhNmQo/cJkWIRJVM06LFPEghGlcMRNIM78Fa5qPL4z97wXC4bznQ0d7x/JXPCZ+H4DU2NTdcmZcazO00tqafR5YIq+sGlvPGwSsVMnSrhDl3DicBAwmpb2nRklBRiTPa+5mqRHcUIrLT/fRr93h8n6tM1ZRyRbk= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kAFcpRuAwMKn09KCqD/8q9lEtUvPqFZWHaxk9LsDtkhQsoNhCfEY/wze7bZXOI3NYImpgD+rlDjQ9LYkmuKuWtXHNtDJTqphcQDCXUNDPGzGHYxgzptT9quyD2nX4LgCDkCDMEbirpZKOvDRhMmZX7zTlOX/B+JnVy8LDCYDeT0LyiOTgDxUqDHi9ojlSD9CdxxKcZ9mWpqalcwgOxKTSNqVbA+JzPbQW7+l0AOPyEXnospuOplMvoTCKnu0QDMoXLRIs3ZKsgiozkvlOQx9dh0Ql0C/3EQf3lrFiPXgQzOu8UbhRXmOJadz3pc4C1+qSpZoiPISbQ5FPdI7QHZKBVv5mnB4oqQs0uI3XYZvYdCp8k3tNgZGuMm0bEPz53Gm0bsWEXBKNwkXfa56kyuxyyndfifYrEjtCwuzKos97tNGA3pJxyuRD9agDDi/69ET X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3VN8s7hOcKEM2PtRf35tP+CHIxb/ttExoEcmH6tDOBquuwZHspRgaJiGpac8uPoiwujROlF9Ts4cqdDYWOQnnla7zgXyObjnhYkn+WDH/YXKGLM+PdrPR0YD69Si98P+sj9PjGLFz05i3LGg7F5gFA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4dc47ee0-fae7-4d4a-acd9-08d984185a8c 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:43:58.5146 (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 018/218] avfilter/af_afreqshift: 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: 3Xkuw9XPFn3d Signed-off-by: Andreas Rheinhardt --- libavfilter/af_afreqshift.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/libavfilter/af_afreqshift.c b/libavfilter/af_afreqshift.c index 95fd4e31fc..731e97afef 100644 --- a/libavfilter/af_afreqshift.c +++ b/libavfilter/af_afreqshift.c @@ -49,23 +49,9 @@ typedef struct AFreqShift { AVFrame *in, AVFrame *out); } AFreqShift; -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} +static const enum AVSampleFormat sample_fmts[] = { + AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE +}; #define PFILTER(name, type, sin, cos, cc) \ static void pfilter_channel_## name(AVFilterContext *ctx, \ @@ -393,7 +379,7 @@ const AVFilter ff_af_afreqshift = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), .process_command = ff_filter_process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, @@ -416,7 +402,7 @@ const AVFilter ff_af_aphaseshift = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), .process_command = ff_filter_process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, From patchwork Thu Sep 30 13:39:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30708 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp687058iob; Thu, 30 Sep 2021 06:46:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVPenRDXhcLJ+myjOdbw4UDRhmNkCfMTGVDf86EhcONQhRKi7mMc2rBi0pITzexbkTN5Tg X-Received: by 2002:a17:907:3e21:: with SMTP id hp33mr6952523ejc.205.1633009603436; Thu, 30 Sep 2021 06:46:43 -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 q6si2774453edd.367.2021.09.30.06.46.43; Thu, 30 Sep 2021 06:46:43 -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=ANGyU0qZ; 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 5372268A9DB; Thu, 30 Sep 2021 16:44:08 +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-oln040092070027.outbound.protection.outlook.com [40.92.70.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0ADC968A865 for ; Thu, 30 Sep 2021 16:44:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nZfyJ6MyzvQiLlQnEZV5MdeyhIyagrEt6ZB8GXxoyEcVRxrEKND1x+uYL5TL6jthoR3XbTp6SD/GayV/o96eMErl1zw+9OWIO38v8LbWEC54Qm4w6SudolXWzCZOVqB42qUwltG0T69vys94RvJRReU9K23cOX35TqMMYwlFQA0fYyJ9zDKu/KXnsQEzUPUHAn8AmzuSic2oDPnFR/doTluf49MuLSKNd/CgN6XxtRj9X88Nn8BiMt1b2WI0YXc5WXttbhVzxmiPTEOpbkDvS2D08D9ysac3ZL3P4wE/94X4k5xP7yuI9UUbSK+KiyM2xbOwp3LFWXoI1Es3KjT2Bw== 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=ip7XFuKDjacoGf6+p2BCSsLaBDR4cQ51htdZc09JlTs=; b=N0uecXAePbXy0DPwAw1Uz02AEjpVtqBW5yUz6nMxAZwTDGB7R2laIZs7TlHB4MZlE29BDMOiQ8vEoGyetIn3/VY+d/MjiRSXxJJMjh/uRb153amKmN+ibqut2GUlNatAquo3LCdVV2qIcJzagULfmRFIQ88KgMHK+FWwJV1IWvqmAKeZEg22EfF2o11YCSyiwC+TIddvMBbt15CUyP9OmRK9RbenZwBbOktK4KQbWE/Bf9V1GFpeMmPZS+QbVQbdVtlXFnByEBdRWh1ShKPPYuxtLArB8sRI+aMlYA7G2sCDswwkNxDIkTAvkZTyEgiLDvKjjkrZfRYaWgSb1lgKrA== 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=ip7XFuKDjacoGf6+p2BCSsLaBDR4cQ51htdZc09JlTs=; b=ANGyU0qZVs9unUKSE0iu53fgqNbjJ3Hp+2tFLJfjpeUBaHuRHvDyy4JXJ+UkYlBLKVa65GkizZDLi+t8GNAW5ZGy8xohkReJaoa/6CxRZTWk4z/TrcFv0pRrom95USsAvydGjL9o/GVi9jAglY6QATURX8Qj/vvrdL+3aYP+wLMBgcsKpr6Xn+qO1zK+fOCMAEc4jSyJ8Aurb4KN1EHt+tRDS4p0p16qLnxKCb9koOTkKA0huukiToD5bljnUHi2uLmxh3zyGASV+sKTOoiHqxC+4bfDCHFLKHRLXLpspxI/NiHQQcPCeYal8bw1zb833SR5pxbIKNnG9fsl53fcww== 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:44:00 +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:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:20 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [3gmV1WzoyLzigZ8TCTopuVcXI8+06kwg] 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-18-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:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07e5a0b8-c8f6-4bef-23ee-08d984185bda X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymKo9o/g3zytwzHnd1I5O9VFILKgUEFyhDt7pGMw/T3BwheWXMMaGNCUpmQP9tn5qTw4wkXFoPQ+lyiwoe66whMJhLgwOswHnM2kdPO8yi/wuTm2ETDi89ez/uSuD2uMdSdv2mvX9HfEh/CxTfXy5q7JgnYwxLobed2jy1IhI5IlKlQv39C2wTkBccCJLDkX+tuTXb5RaOM4fnZ7oGbUyt6FJFWEdrZFJdOkPwNAcspa0WETENKb/ZdH/smyuAMGFPYNoTRAZNWyVvXThmnVmeTOCb+A+a/+mIxXEonT3f6gWa0jajR/BQRbW9MXvTY0KDPitPR0r7l4P5gDMO/0/+vLOJY2lgPzAcILywyr1P4nJAYYSoAOVadXA8oWaUWs+dy07Y8pqSqDt8iwAkP7xkb26OMQ8E2VJVcn0oAFJlYQYuUaXcO84uSE8EFHkE93ZiDfOIfqpkMwWnkWGz9qxs0NKATLoNx/cTqhxyxam6tjFZemxCZULD1NgwUKDvKlVAwrMZGctvRjRCQZFttytWwgG+N4/VyCSpPH+cbrNJf3YJr8njTEuuaFYwVYUKYL8XJvdHZmQEA3KYILVD/G2DsIlSbxJvdQORpoejys068ThFyotSYLZCjdxicZ6pR58hogR5vayd5Y+Sj5k/RMt+MPeV3y1N4C49mCGlu0k+d5MRSUfPFfvQ0Urhc0jSJTaUbw7csU5dFjNzwwzCQnrpzp+cSudOyU/L8= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6Nphy9uuAxgitRfyGoE9MFg9jJX0FoS8XAkHeXXluSvsb41C6Xe6Unz2T4Mijdrw97tBkjPw30W0NfNEA5IP6Tvpum1CkF2X0v6Gg91emdyED10kCjthTKHEZ6IBlhiHvolngiZ8ykyFb+j8sjqUZWODMmK5f9kJsHYz7uqbHHcEHBeU7MFOz3v5/BfuaMIprAlhyCwGsCsrw2QNu7NB/aP0bGQuvqlexbU0k4vejqHiZ4g1AIezzbdgeOzNFKMRK6cvKyyq0QJ0G63sk0HH1cCMqO70VVoPSFR/5LaPUm081SEeTIA2iYG3RMaSbFhiQNInkS6uM9cgTBDC0GnMxGDBuzI0PfPjcaOPs4am8o1jCwemcKB6wMln3RWuzFQ0AI6sT2tsL1In3vys9uqY2bCiyGRLf+03ccgBP6Wvu62VzixwTcal1MqkLF77RCSb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: daK99ZuKXGriPV8haH5aGELYfPXQCwCs7gUoDN1+xCOfnM7wytUy1phApovigqhG89reKmf25LGWzWTD9GAAzJJGaauGY/oiqozf15+4X8w+yF2OLJF8fDLRzQ/s1MFfZvrhaRz1wNXj1OssBEPvpA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07e5a0b8-c8f6-4bef-23ee-08d984185bda 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:00.7557 (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 019/218] avfilter/af_afwtdn: 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: dazI0OLa6xsi Signed-off-by: Andreas Rheinhardt --- libavfilter/af_afwtdn.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_afwtdn.c b/libavfilter/af_afwtdn.c index 9235e6e28d..3aa9c7b429 100644 --- a/libavfilter/af_afwtdn.c +++ b/libavfilter/af_afwtdn.c @@ -461,23 +461,6 @@ static const AVOption afwtdn_options[] = { AVFILTER_DEFINE_CLASS(afwtdn); -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_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - #define pow2(x) (1U << (x)) #define mod_pow2(x, power_of_two) ((x) & ((power_of_two) - 1)) @@ -1330,7 +1313,7 @@ const AVFilter ff_af_afwtdn = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), .process_command = process_command, .flags = AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:39:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30712 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp687225iob; Thu, 30 Sep 2021 06:46:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3d1BSqt2yn0yZFBRptXfMjdeGlyefeslPzZRVIiF1mjitoMfA5cg5nrZly/JYEl/94F80 X-Received: by 2002:a17:906:d9ca:: with SMTP id qk10mr6913323ejb.220.1633009614727; Thu, 30 Sep 2021 06:46: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 j11si3614505ejj.109.2021.09.30.06.46.54; Thu, 30 Sep 2021 06:46: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=F9fkXK1w; 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 74FC468AA07; Thu, 30 Sep 2021 16:44:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075027.outbound.protection.outlook.com [40.92.75.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 234AF68A9ED for ; Thu, 30 Sep 2021 16:44:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NjJRfvmNuTcwkPN9aF0aeW1i3z1C9XxlaJMhdxfNDDH56jacYJXisvyrLyoUsipm+oNR3TMg/mztq91loTvSoTqcC/Eo8rX/eGJmZkV4ph/3m3TKF0Bqv5QYRaizKP+V9UqWK/f5peKUIYo8IIRfiWlP7P82NOr7/noJSp4w+8W1eTcmcXdBIA75kDgMM20U0+sEW+U+UXFYPw94K8NazRDA/GPkd80zP28Q/qBva0sJQ0OHAmKY/O5K5i5uqU2drjsXzc9GYzvb6UURs/dNijPPbuHZEg43ZHfxVyuAlSE59XziFo9uX/OhMsMwF9B12C+OiFCZGwd6UGy9c9usKA== 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=Mo+/4PSg1gqEhwdftfOZDS5iRG0zb9f+aqQWqGnjM0Q=; b=R0Wm5Fn1e7+BcUpqfb486vIkZKpqv61AvJUzQOiuJcCHLaFfGykC35qzZhMf7LNVu9oiGoTIr9otJ+000BxcUXSkzV512olcd0H9jobKWhTdnU0Msyca3k0kjX8OpafCB15BQ5b3Hvhc0oi9F12XaqyoKaTkiJDHxCe1b4Yunjm5wMumOzV6RJp6Vf6k0bgv3K0ELyro26ODCYZb7INIIcrz6EYYraeUXRLDLh0f58T3UR4ZPwsdPbnMgeWjeWN9gCJ8bnXnTXXVAYzshuB7/DkmhO0FX7oMeHv7MpiR01j3cQd3v6SX3SijFiua4ecDodI6OlXckh0BAW/E3m7n7A== 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=Mo+/4PSg1gqEhwdftfOZDS5iRG0zb9f+aqQWqGnjM0Q=; b=F9fkXK1weU13Q7rhsALAZCPF6s0MfDganUw7mrsUKzLvYsK12QLb64hA8QBUAwkCQI0Z3g7MSL4Adj+jAkNdFYF4MuYK4o5wKsYtFQeY7DI+XN86TMvg0RQqfLEe7OgMUb8RqAJIyWfHkwvZXyjJxriWuCir83WsQ76I7tWsDu0NCMSIGTi9yuJdIbCAd5jKA+mnmciGpdFShlWrWwDjwK7OnJs4rKKH9gCcla1RUkUJdG1/uvlFRq6I5J6tFSrcRBoaNLM0tiZ82+3YM5uZx//CvCHDvyKg2jr0J82irtrqcmjCZbyhE1jYjmFY9QQIWf6lqllx5bkSFaBnlgQSOA== 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:03 +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:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:21 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [yLnIGXNEf2pOuzERT/jq2ll3vfp4LSya] 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-19-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:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c4d01d4-1e68-4328-04a1-08d984185db7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV5C/IQ+NYWVWKJ8pLytsgGEeEBTL1e6SwUsr2kei3/VbDF6eRbb8agaJphmeP1FggUHcArNlo1xx0JbpyO4AypBhu36qU2SxZE/KQP/Y4MvYnhqXhbceKRqlPynAg1b6sl5KRlH+sch6+V8pFazjkaP4GP5TUH73PMs43oqJRIoniUg1MR4vUPZguqRbUIhvxirNB2Hj02tYgoFTTXyT7xuy9z6RzASIUp//LXCmzbZabhchqFKsGw782ARKOJtaxNBwJ5XM2iYZHu5cTBb7RElJdgDg7C+r2i/aHmy6BfEbahNWs74EBIjJ/0LeErphybqkUslJU2HrpWN1l5wvrV9DlLl4Aq6HbomrobRDhNmJisI0fBWX32WTumL+ROXjRtZMg+7uArxWtbZLJQoe44o78dRZyMFjtoUmFmoBSjvWk2QNTt9/soQ3ef1HeWEtty/pAeBTSRncYRtBPghDbwQuGFNhI3waZ3kCJjp00+V66ik/MRKo56MWNiaKQBSq2XZpPt0gD9+E0Iy2YAy5R48l6HjylPbzTjJ0alMWnaRpDK9YKAfWXuLXlFJ+4itSQNshxLBQM42Z/5uf3E/8qf4Pn4o1MQ6Pa6CNCWiHg4rAc0+WIjXN/YVgCIlsAXl8N4I4rt9BulbMHnsuqdO1/n93c/YNGueWvSu6L40wLGOcUZo/eXigSHg= X-MS-TrafficTypeDiagnostic: PA4PR03MB6733: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NNL1gDTvRHeoZAo7SSkHxe6DCX+N95Ic/YN35Em0GkVgKFw0fY2ZtXPMYtMJevL9ikVQpeLlvbQ8mZM2paI1SLUndJEuOr+mhLAzXvgp1GF2REJ/X99H0gNA+5SokrWLgMmY2hk5t/CwgPzo02BYWOy0uvgBD2Kx2Sg9kbNZvFhWEpXIW7YGmPiNli/gsrUrYD8/TY72pYN/t8XRBFz11uEeUEdfZR/ZxQ2wwg7zzsQmPufsMwbtNXyfQ778IDV/IirgVEUQrEOLF2Gh/oaq1MQjmZ2an2k8AaxRWoRhwGcwTv8jO2J4cGTrvIRgjZj8/d1s5jlZg51zOvh222xL97MS3TiXR1m+ZEfDZIGkk65g6hPGDjgYSP4m9NbEMPSJmg9bfGVcy5OG73AqJ+csL/npjBF2ElAPG3l5br7GXEVk070ZQjY8nlSva8b5/abS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VhXOLoxpv6GgItTxx2rJNkxP0RKl5rVUdOckDH+HCcqgNvnPRpP7gb5Y9EGqnlcO8mHZnBlc2rtwJAb+Vi365+Sa9UlpJDub8AhmcQUbo8yNjiryx2d9B4Vag+3nvmMBJDIb4EamsoO/daB0lCaKMA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c4d01d4-1e68-4328-04a1-08d984185db7 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:03.9318 (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 020/218] avfilter/af_alimiter: 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: rNKAZx2h6mG5 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_alimiter.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_alimiter.c b/libavfilter/af_alimiter.c index 937f28383f..eb77181607 100644 --- a/libavfilter/af_alimiter.c +++ b/libavfilter/af_alimiter.c @@ -276,23 +276,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 int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -355,5 +338,5 @@ const AVFilter ff_af_alimiter = { .uninit = uninit, FILTER_INPUTS(alimiter_inputs), FILTER_OUTPUTS(alimiter_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBL), }; 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, }; From patchwork Thu Sep 30 13:39:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30693 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp687388iob; Thu, 30 Sep 2021 06:47:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEU+1dltQTbH0conneDbIjmmU3r7mQquzQp78q6ZVnM8yfYcIj0f+4VZ5TSg/muLeqhEa7 X-Received: by 2002:a17:906:2346:: with SMTP id m6mr6821208eja.512.1633009626457; Thu, 30 Sep 2021 06:47:06 -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 c11si4286614edm.59.2021.09.30.06.47.05; Thu, 30 Sep 2021 06:47:06 -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=KHI2CxBb; 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 D0C5868A33F; Thu, 30 Sep 2021 16:44:13 +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 D282668AA09 for ; Thu, 30 Sep 2021 16:44:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KhjcwrEcs32RSaEK62ZM356qV4CK/j1klQO3fz5ljz/Nd6x7gPIuGetjC17FN2wiQz5s53O4VyLyYc0bDSONwReUZ2L2rKJC0aSuQCqGdqAg73fBehJOHAO1pNushPYRIFhkzPHZWXNkP0s8Jchf6ewx8Iyfyneb7GRRVvXuhI08oDpYdII+Tcpr8YZxA7NnCdj1olsOCYna38MX9pfpl26dhCg47MH2i7E3CJ7pFrAID3nlLkXusruknFfibtLwsP2D6ztrE4rXB+sby1eEi1rAM41cJpbX43ArLxvqoMWjl0vjywreaWuQL+npdNj37WoCyHRrZgMXXuxUrQ/lPw== 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=epGa5YQpUSUD3EplQCyo455fVUANWEIpmFNI2T1HTXw=; b=XExAQ17I0+e5qzQ3/uanBaskAM6SAIKRgcEPHks1v+Mk6qWJ0kHf3jXSQh6/+L+QYMsM0jvE/gwZxVJz7Ttf5FUyfn7k7Yy53/yGvL7j/MjbNkcwg+W0SF+a+D9T5kMi6UZsNl6SQJ+KVKgt3wdMyLxcJ1hzKC0uD+8UneFcQq2p7jGuheM2fwriJuQMJ9un7FtONc1rh86NE+qEW2yoI1sIa0td4lco51A65HFUsughq+nd4QTEo6ZjWcbOl3PRmRmUnL5LkXXPPZ41OHj1c5fmHWL5peBPEix8IDJdRbKhWEJFyDz1SrwGqHmrQTRDANrR5ibnpSA/+KbYV/0AEg== 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=epGa5YQpUSUD3EplQCyo455fVUANWEIpmFNI2T1HTXw=; b=KHI2CxBbb3YVhu0U+P/aFRMkB9RX6f53JVqk2RHOXPW0iF9S7A6V+Rrxz1M3E16ikna4n+P5XnO03GA3Ie9OkCzDCFsWg/GqgmBYHeD10cg3qb/naX0RB/VdD5+z2m2qagk6GJXVpHy6yXk+vy4p2d14SdZU1w7mKQXCS0Ool5nl1I1DrI+7/YHRVBQD/hjTGj+WvtTYl+i3tekf2fKmwjfkZTquUcFG06cG+2h3YfcMCKqiXSdruEVvl3pQwYkyilecpt4aYkjYPYfeRLSGZMcCJEpOIttKOVzEraANy7PToBuTWbdrNP3OpSSrfVkQ6dFAuF8M8iZY3yYoOmjxJg== 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:08 +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:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:23 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [VydTv27yGZ4+09bixWIlrLzn+nL5m9mo] 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-21-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:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9bbeed01-a962-4dca-81f3-08d984186062 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FIIGC7DhbsGlWDlBOTo2PprYx9V/8/v2Ifvp7P3tWKRfrsriGA8tYTPq01/Uznv5FYOPJIbjKYd26Nd4ebWVxpVUwkIEO/19/Ov5/k3HJXBZFrUK/hRaSz5d0mlC2GiMZ/yieC7MVxnzKPN7kLgusRp7EqRpVGNLadKSiPuFEh1DxRAG8392sHdVgFtIcytLo8/7bySN9A3oo7MPrG0ARg2omStCEtLqM8znpPwQC5ocT086arbWcTAo7WtMKtxNATskxSu7WkaLD1p9HpLezmhw9tormxLFPEZNFnn/nZv7PxcldCtikSN1ygy4+xa2QXJT1tI8nywBpiGPYcYZuYAj0NbON0+ykGdWIzgJt48jFE2xi66hs+nJTMN1LGCmvwkUM/5+dtKMGcb+/49yjii4B3QwuXo04KWK5TfGQa272sSqWDii5IuNzS9gO/+6q/SmR+wfr05WdtmxCsQrkAE6mM2dq2fkZ/KTz/W2v1xsN2+CUBXVSMzuPF1jsMGNAb3MGzaC+EUP6xQhzg6OS7SdV5nRj/DN5jAEkITZosTNndaDbZswlwg7p1Q3ae2bN8QY2uYp+Ndc4zc+lfdQaW0EFR2aLLVZHw9odgB3B+As7xHOgzcqiP7Oi+4FhAzVNymvwkM7115Kzv36THxtSbL9QkSB0nbeo3P9STwx+w5c2zyEjG4Zqq4= X-MS-TrafficTypeDiagnostic: PA4PR03MB6733: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pFLhTcOcvw8ksVF1cciWXLUqfYPVbITXa3YW6NlXGYkR0EfWns8myLGKUssdjD9jHUx6B60Zoo6oa/QZd5Jl7zKkW3R7pPx0SdN0I0nQFoxE5jGyn3RNUe5x3lYh/e+Gq77W7t1sms86lzrHeHI2inldrA8r0IRZ4L+ABYVX3Ps8cfvDepJrgMWixbQohsZO7dHFD9W/X+M0I4fav0cGajpBQp2ElAdlx63XabKbDyl+UCUwVKRb86w2Csf4vx1gH6zpgDC7hmFaC0oOhsi/1qmOKqxMGRh7jc2WHd3Qk8FCkFr/W4dEpD3jfeLc/ulBFyTSJ0kqFB0UxxGonTmAcq49GlIAkCrYQl9FNY6AzCToLxS3Xfbv7ytAmiYR5m1nwAR3rz74HfNdyvvtsM5z7c3YONHNyS3C4d40rIRTf+ZGZFs+HzoRV8haId4UXAm7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: deMW1rahq5qDo2IUgcK+haVvh4eEvHLMoriB+gDz5fzyFEuEOdc27074dmUtBEgIrz5RgxZ7taT4taMoykFugG3Ioh3Dhw0EuZUm5e6v9oYyOkC9m1i/3U1/c2dBCZHeI+Sn4fDkCnOaP21WeTcsAA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9bbeed01-a962-4dca-81f3-08d984186062 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:08.3065 (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 022/218] avfilter/af_amultiply: 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: UtAoDN04z+nE Signed-off-by: Andreas Rheinhardt --- libavfilter/af_amultiply.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/libavfilter/af_amultiply.c b/libavfilter/af_amultiply.c index f9413c9fc9..5de711bade 100644 --- a/libavfilter/af_amultiply.c +++ b/libavfilter/af_amultiply.c @@ -40,24 +40,6 @@ typedef struct AudioMultiplyContext { AVFloatDSPContext *fdsp; } AudioMultiplyContext; -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 = 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 activate(AVFilterContext *ctx) { AudioMultiplyContext *s = ctx->priv; @@ -198,5 +180,6 @@ const AVFilter ff_af_amultiply = { .activate = activate, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP), }; From patchwork Thu Sep 30 13:39:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30710 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp687694iob; Thu, 30 Sep 2021 06:47:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdDcY7sfDCDbwRdrWxSzaf3xCqEJAvcW+y/7ED1f3u2dk1xhF38kpbF+0I/e5d5KqyKoZV X-Received: by 2002:a17:907:7f8e:: with SMTP id qk14mr6723670ejc.91.1633009649000; Thu, 30 Sep 2021 06:47: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 z14si1277793edd.244.2021.09.30.06.47.28; Thu, 30 Sep 2021 06:47:28 -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=MibkOhUJ; 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 0C94768AA3E; Thu, 30 Sep 2021 16:44:20 +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-oln040092069102.outbound.protection.outlook.com [40.92.69.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26F2768A7DE for ; Thu, 30 Sep 2021 16:44:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qk5iag/jahjgzzNWUWBKDtZZYMKCvuoMSPJerhGRS2/f73IdK/YhcpRboJJRpeEPJsccxj7IDCCMh8kDyi5cIRA+9VpBAciFc8j+hJz7eRutWCoxiXqaKyOaU95MGeBaVvWodGL+a1L+I5PwW5LkJR3NLbFjzOGbqr4fuPRhHiYBT31D8h1BSNyryEiawdZEwiAegSX2cZLkW8o7rfqfuEHY2MFV4PckaN+FhKsE/50NGDXaPjy7J49HTpar15UG6DLv86lKvyTpiK13eZ+c/xw8jlzRlfkSNec7FR0wUdMtVrm76moowwD15+7Cjl8W4nevbv8+b9tjfvgWfAAZOg== 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=qSgr2lnJaVYse1sl49MmsRj7uiDLrSmCUNOL4e1rhWg=; b=ZWyAnTjxyGYYPsEGyayRmsoWmV9Nt703k1a4ToEKReQ++45SBsrloqxVc1p2F0t62vyqsNul2+VEWlI0zLviAHedme/M70qCR5zsM8wn6AwP/l1l/0viR+PpxwvEEyDu+JKLoM0ACGIwxcRnPTKGfwrP6anCNn2Sp1zf453cFCKnDv4iwYYd/62XvC4MXkKEwqqP/OcQDECHtj1NHTo1xh44NRdA4LOUNqZI9xQGsRfxFBM21+i7vcKVG0+rsbr17ikVyAXPhlqQub0xBYVah5wkRErFB//0Ahpzz6k5j3ZR4VfEdeauxmYUaoZbCzuqAFBZ+AJIpFUZzXbgUuZl+w== 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=qSgr2lnJaVYse1sl49MmsRj7uiDLrSmCUNOL4e1rhWg=; b=MibkOhUJCxE3dCBFrKVjzqtQavZHCUxDdewa1PWHsjVjtyvCcYoHIrOg37s2fgLlwljLjo2UA+vw040Ff60WaOuZyTVGgZD6R4IGXx1XlJIuFlHPgUgepntipFwR8AjdtGfsqgAeFJCN7lOo+TlGWJLwz36MRV1qipl0Hkrkr+JB3i0H95YCIEtyt33QCWVy45sdQlUulYjXGUjlx60IoVtBuyxBKtLHL6UE6JvYjdiIMahdKYBwj1zGT8gCvkEERa6gBh8G06ZY+Xk27EykkQmAECdpDVrZTT0OhsU8QLY8nwF/qE5e7b17iav500E/vHqXsufZJfqsPO5RXw7g7w== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:44:17 +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:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [fheyGWJQyYXIrNv9pYGdLQAz4t9j6+RO] 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-22-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:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7be5a0fd-a549-41c6-d54d-08d984186585 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymKo9o/g3zytww1eoVsSUpC2uGeSo6NN5tNw9H1/66iy1S5nQj03pkOH2rietK8J/rp9zHnOB0hu3R9CTlPMGukANUtlHrxIcpAP0PSK8+RhgaVRemgE8wXdbDtC17yOqu+YiFXLB9AvpgqN2EUsVZsK5mCruMRVB3pv6eWsmVkz5zNFU+Yf2nltBDIYDeTeZsz5pGopPTxGfnfZhN5UItY4zrOmoo/r3z3r3d8nyURA4an96APtSKR4aH8QT/4z0+P/DEtEXrogqrsvCzCbDuY6ZHpjTZrpT75fBr9fqGCaiEZQQ7zRoVi4p5Gi/yUT5eINoaQX8JIkgTn8ejQ0LwVoZ/jiKfZjJdQrm5wh4NMB/SbTBOlF5ASPSFJuLZFwYCyo748R1yOMY/zBvXTNmI616zmvKzLq1T3cZEddI//f1je+N3UYf2RZBP0ySJZ6SIOif/17OWsyCwBjlgCH6Iy8/iHSrMN8i5WOEmJNj8HUc3CJm95xw8lYx8FdeTu1pyJ6sTmRo73PffSBxb9mzk4eX7uxLQZNr8c5vVkhLTVnJTqRySkWglMzzVz8h0KNQHOzYFtlGHH//sQogVjoGJAd4RSZSiY/31Q19Z7KnlhSNK72eZj8NiN81yfGZWfoxddknjAqSeMO/rvkbuGSXtTjkDTDCXG1P/E7Fsl28qFjdnlqQ/ARGE01GwDzOHigiCb+y1bEU9xYvWrYr9mz/vC9nD1ZLBFNlt8= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5EH7UXb101z+regv/Cn1I0/7dZ3/+HbVq2Kp2d5KDdHBE/UO/qpezF8a7avl/l9y7x2jQq7+dDW1ahHPYFeaTdVVi7YYNhuEhPEZrdn531k4psvVOj0VzN3tExzLJteJlqAruHGUdkqRv50IusryxOvAJ4sFMMe0o3onkxYKD+xYNRFQw/Z/w9fXanyC4YxNaiicinkXyqFOe57zYyBda3iGDzMiYceoWyVo4F7D3h9z6RBlBZpuKD0wRoRsUEi3rhdMS2ulMzz1D3obEMMTktF4Dd4qJPu4b0Q4oMo/J285a1S1pAqL4eTFnQkBJSi4dg8XXS+2DBgzWBCtmauMjfVRtiwJncEaKL5yJCpK521fG+lqyRZCZve8xrJbgZJ9o4kfaHKNX5Ly4HZc0Y3wDFrrPvqpcp6mfhhM2HrAjfdVBeKzg0quhoQUQ+jywLDB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ji8MoK0wGCTsjcH0+JeUJk0Z5MFILHD2i7WaNC2yQ4xjnbUFGfbmHU0EOKmWEJ0g0GEIhnRQOwE3ldr2p1/RnIJWCuj6N/N9AMsZ7j14y5fy2fIbsgVstqWtDMVUKRljaWLsacF5w0PcAOOxuj7ITw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7be5a0fd-a549-41c6-d54d-08d984186585 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:16.9934 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 023/218] avfilter/af_anlmdn: 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: eyh9BALJM3BK Signed-off-by: Andreas Rheinhardt --- libavfilter/af_anlmdn.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_anlmdn.c b/libavfilter/af_anlmdn.c index af6a6a69e9..141e5f398e 100644 --- a/libavfilter/af_anlmdn.c +++ b/libavfilter/af_anlmdn.c @@ -93,23 +93,6 @@ static const AVOption anlmdn_options[] = { AVFILTER_DEFINE_CLASS(anlmdn); -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_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static float compute_distance_ssd_c(const float *f1, const float *f2, ptrdiff_t K) { float distance = 0.; @@ -407,7 +390,7 @@ const AVFilter ff_af_anlmdn = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, From patchwork Thu Sep 30 13:39:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30711 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp687869iob; Thu, 30 Sep 2021 06:47:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwi7oeEb0RboJ3Xpc3+QlXlWR4tftQp0KeAMkYLCmR5vxK+ghrxzI5QyNl5Lged57ysGBy/ X-Received: by 2002:a17:906:d14e:: with SMTP id br14mr7115424ejb.61.1633009661341; Thu, 30 Sep 2021 06:47:41 -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 j30si1219692ejj.467.2021.09.30.06.47.40; Thu, 30 Sep 2021 06:47:41 -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=tzue9UZK; 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 0C70468A853; Thu, 30 Sep 2021 16:44:30 +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-oln040092069033.outbound.protection.outlook.com [40.92.69.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9F8D68A853 for ; Thu, 30 Sep 2021 16:44:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=arad5PH8RUtv2poSoWgUfLpeNt7359LhilVx3sQ7Ez77Vb4zAWcYTpfu3LwhkI4ekAAwgN6uIotq0hOliqVhvfK1YLnU/0HkFuNfxHnbd+pqBWDqEVELLlBCsF2yLEOoRoQ/fz7P3iMa54GUL1/PfjyeOdOtfuMuZpd9jz55/5fll2mUmtZE5/7RSQFTQDbbB/wylnSzS5jIoEGPWUyk4SspQTNqV5INLWJwKhNd/fOiTyT4FLkXi6ERu0fh/XJbvI9cr3CL2yFXY9GKb2LQ/SmDtC6912RDBW5Gor7stxVhzjxV2tHjE/kDfP20D+D0e60Wpa5sLyAg2m7fm+xcCA== 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=jX8V4oiFvdQu3YIely0ZN/s0XzI+ftAMP4dXSRYYupM=; b=hBNa6gizWQT2bOqX2IP9LIDWef5yUD6tKw67uAVIjW64I2xIfADNM8KwGHAmIK6VHtmNGxFnGwbvdQc+Ef0rmDKIdnzwtiLFhdS9DgdKpEAeiKX4Z6fCP5UCj5GJ6YGq2987zjEsRxyvd/c+EjmP0XJ1uxr+/vkTf6rOVh7gghAG8chuMVxWfit3UxD3pEupb5jbrT3+TTvmSWLMyoX2rfZo/MhhH6grL+aj3lOcJGPhKB2KmxHQBKLr3P9E7XmnjY+PDDZmWiaeq5fzctSTc8UONMHZ1cwTaKdcZ+veUWJAOa87xI9dGWeN0aGGvNLwUZqPADNL8ugkOYvYAcrgMg== 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=jX8V4oiFvdQu3YIely0ZN/s0XzI+ftAMP4dXSRYYupM=; b=tzue9UZKPyJWhiC/rzBGrMu8ZxfLT97PGgCoJGZS6KMp1KrE2AOI/kU30jBxWRnnaF5SI/D1E6CZZH+AxJBy+T5LcsFbkVYe0B0j9CRBefRgzn2q5b9565JLRmhb3l/BQ5O1PIliy7K1+OKfH1xc7yYaCMi+hJTt1QGA65ZRuU3a3SQPwxqxm6wsvOe5QoJo363XrXWIWbhQxXQ8WmZHSEndB4JJIfebLVlF+hg7cciFLkIRQ3vNe+J3Qv0x178pU5xD3v1eHLHhv8begaj8jZUy4Hk0Bc+f29YpsNOyKIAA8jchCQm57/8ThaEeSs/fZ14cznsuFRIeBDtmXaAaqQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:44:22 +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:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:25 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [639J8+aL165uDZWLbvlLpuqHHIEsTLTG] 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-23-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:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6cb05c8-962c-4703-fd8e-08d9841868d0 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FDSiv8ZiPQOl4JDgtLaBdJmkdTYCwUH9b6YsVU/L/IRHZOoeAY/h6kEcAv2sjs8YgvOgmEwk0L3RFg//EtBMBd1slvLxcQ8qA6s53kgGhK608D+hr8ogTvpzGZFMqbNec58fYTxXiKZgu/EUSG7HsJIMmcLgyPd/U7JD38D8O40Qcyl3Kx3Kq0LNrZv8Q+tqZ77y04JZoV156eLGxS8RV/xiOAhUm0Lpc/TKhhz4QLp2tnvuzG8eACh8vT0CsM6OIzod5H+0FIumA0XMoYSRyP5iL9gXRGM4uaiZPF0upDgw25TP7H6qxlZ3bmnsPGPAOcHauVQOkMyDIP4G1wnRBdyqf2zT/k9CQGmiJiyI2eAR17A98LxAx6I8jNuiNaESZ/wN7gACCpcQxnOh885HQkDgASH4KPD1LZXHrlVlm8awS4TclGkLKdXUPQ96bVsCKMkHGQv4VApCvcULzagHAnYiYMA+iRbLf379E+ahQOyK4w0GqCasR1tpO0IuT2rsmzVC7giN5Dl3oFtW27VybtUkmrLtb+m5ydWXAmDTIH2eqgSNDKsuIrSEkgu+gym9FgKrruzo/Jz2bLE2kbilRLEwqYRbvfS+qbAGAHOJ9R9cXyrk8Rt9xdjY7Bg7l48hzQiAu5zhdtQCiMoq86nrExk+oZwMwQQiLdy011HxKaF8sge9zJzEJg0= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W/auEA4kccm9PPN3NmWUTfJlbDa6RZN4QVFM8WOwhX9qi/lwdsd+SWCTOAYdglJ0A/Jwl3wc9QPCFYrkOsQN+dlZvQ9zgD51z5Yl7Oke1P6AfZCzCOP2qcm/7tiP1DDnB0yStPLLGseL4BXRFE2h405S5aWoSojc2Y/31QYfQCCAe5uYsa6kPFJDIoZwF/FqFJkGpJ108UoRo/AnsLnCyRKh8T0uEuJ3PXP32JuVHiFNVbjzSLggqsu+6Bzg2GIVI3HaFdcHehrXc6BhdAvcdWoChwTQOVyvOkqWh/Yw/70yKcuB1zFFcXO5sp/BUoFp3jRuz+1QLg1CUoKONjg/asix3D0vJaZ8DNc+5Plons6AB6UIMH3dDVj9ETsofvmhqLjCyh6gQm+BE0EYb7z0mhqj/CHEVStA3Q4Aqsvj0Qoso+Yg9NX4YlutZnpiVl2+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xGsyM89N/2gfnbZxRMKqX5+icLaTsR+GKijF5a2ounEad/8pmJCXWW0gppAeDWEYXD3NmLKJEl53lHROUUOa8dHZ5M3C6SZTEG9bMaj89lt3bQTjyDrZgebjP/h0BVQweqvdF4fR6/UBVQXZAcCjyQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6cb05c8-962c-4703-fd8e-08d9841868d0 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:22.4374 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 024/218] avfilter/af_aphaser: 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: 2ZJL9UR1zaOf Signed-off-by: Andreas Rheinhardt --- libavfilter/af_aphaser.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/libavfilter/af_aphaser.c b/libavfilter/af_aphaser.c index 962bfe6b16..2d95802677 100644 --- a/libavfilter/af_aphaser.c +++ b/libavfilter/af_aphaser.c @@ -83,26 +83,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, - AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, - 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); -} - #define MOD(a, b) (((a) >= (b)) ? (a) - (b) : (a)) #define PHASER_PLANAR(name, type) \ @@ -283,6 +263,9 @@ const AVFilter ff_af_aphaser = { .uninit = uninit, FILTER_INPUTS(aphaser_inputs), FILTER_OUTPUTS(aphaser_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, + AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P), .priv_class = &aphaser_class, }; From patchwork Thu Sep 30 13:39:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30699 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp688031iob; Thu, 30 Sep 2021 06:47:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypg4oaJmJKBJ0Foq0/mG02lBkk9xcW15Fd1ayIX7rA1j0vKJ7vup54wp7FAuicZIz+UxdW X-Received: by 2002:a17:906:718:: with SMTP id y24mr6650486ejb.53.1633009674068; Thu, 30 Sep 2021 06:47: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 du1si4138376ejc.324.2021.09.30.06.47.53; Thu, 30 Sep 2021 06:47: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="Ud/HNHqS"; 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 50A8D68AA5C; Thu, 30 Sep 2021 16:44:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064056.outbound.protection.outlook.com [40.92.64.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E59868A7DE for ; Thu, 30 Sep 2021 16:44:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GZNvZIR0eGi+KCeBmX5IJxktMXGjuM1Vhewd4+eIjCC9/Ph4nzVNmaTA4sNEcR1J38h6nrl5yyWUaN6cd+bxjELi9Kp5IMskvOAMG4A71G1MSYYdw2RazSdyfGMdvM3zZPZbTgAqoJl0IMqtz36g/B7udIGRPAmv/7T5m4lvnCwS9NM2FLc3gSB/dgMLn2RReT/8sFPlN82Two9DHKWfXY/syQRRdILf/MMZTaUT1YLZ1Vc+HUWdMBDcj3haIf7EndSMoiwjJKZ6zHW4IdaT8bNdFlEWyzf0yWsZLY0fYHWWU30PkQ4pUt1XP1gMDKr9I0R+xWdWvfxbYT97eioxMA== 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=ENs67BM+ry6F5HfzEzSVniLTwmcWlIe48eVAi2DcfwY=; b=iz6CJuyBxjP30cqsAoCjlbXqY8YrldPJWXnzcjS9u0O6F8Va1pWHLMsZ2gLL8jyRDz3ogFk0rn2DXBv89p1W0l+Q6lTmbKgOzbN/FWcyGhsOB3jLUW5oXNYf+VmUEzeXuWiNG5/ms9yrGmYGdvZjSj4hS+zvSrV8YKsnQAqREUdPmdDvjGO+9G459zMuTQSz+RFmqA+Rcot24vEAApYklenDGEzaAr0JoNcPVLvlQ/onV++sPEUHdCMWoyA50MFP69/02I7eZkYaAOEerKIrc1MAMZgNKlQ92soYYCMoOcUxq/9kn/CPFwHv2R0HhR+dQP5XPQwaZdGG7y0x1JjrLA== 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=ENs67BM+ry6F5HfzEzSVniLTwmcWlIe48eVAi2DcfwY=; b=Ud/HNHqSU2oCrub5/aR/tnW44vfUp5bf5JV96uNXRjrk1fHuL1viJ5nk6NiQw66nOYYJqwpzUplnNbPCWH2f8MzfDyyTQk/3RLXAg2w7odPcR1HX5bMa4oHcZCmITsWWTC413E2C08ydzZvWFi2fn6MAPdgy4XL/397dvzkgKkpE9SOA0fbK1lbZJVAE6q54fAUuHmeXd/RipPL0hPHK+AucmtctNMCn9imd7VU9mno4g6+c4igx6tdUnToK3gp9uP8jAz2+zeLNKc0KWPUdN+w6N3+SVL/oRHTIUKAcL9WMaK6VEYAT9mpANLks2FlHDl9cu7f+vFRHxNd4/eAkIQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:44:36 +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:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:26 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [O28ymNQ7dWxd1DW/I+0zZUAUEJlAdUG7] 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-24-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:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e9efeb68-3e07-45fe-f77c-08d9841870e7 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIBqLe59qjkRp21wji/xErRRRFI5QUJRfCRmADtQqez2j8tD3V+iy8syGirXP6+l6z1KsysLwz6M0eLCMUd6zEi9hVuBwNsvXQLMS2JHEHEr4is11oKItkENv/U4oJPgITgUOGvSKC82ZNhyq2i2DP2unsTNNYKVNbLE3ghgA2UQSyNOvuGg/VaiBw7rgoba9yGr7uDWR6hRUmR3WUNwqEA1i2rRM8uQ09LyFvYZqYbcFiVJxWqrk5FdnpWkLeqBQWzVvNA18pgG0NDjb5hmjdsxTZsKKzHdNPcFVioW/j2jap/V3IoB7oCpY4LWfx9i4wUqsrEYhrCobY1OfNPZILKUfNJQ6yuKEOZ+V9krf/z7MiSbblhly4uJWoWruwdKDWkI8Tq345j2NRAPUgxPsBuFmlg0MRF8MbqgVSnOCZCXG5OLmC9Hi7yW65oZX3MXNaHuAkyRDtNsMzLkXrmrtnPbLG+FNuGUe7Bxj4vmGMxPq4bnL+6aVW+MwQRwbP6WRcQtgm4GLigP/a8TwpQPQavWnAIu2MdRZ8rZE6uDGPaiJvANgArUq24Z9A0MDYnVkKcsqOM1gSc+Bir8xHCXA7eIfu05sjhDmMvBfV+/n8CPHJqncXFfWm89QsEhrJmGTw3xRPGJBewxosHbCxHQc84J5xaeX1eCOSAG65ZKaI1q84K6zBKG5Pc47b8b/UoICpAWh+k3wJsAw== X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: re9/HQjiw4an9F3p8lPVoLHEOH0T3kkotpzbn2vg4Xtcx1TXKfqdyrHNFJ5ViDZIIArgUs7I1bs6dk7VuPpJqPjjN1kQRYBkCcJn1A2m9vSaYkQF+sqMgApSVvGjuv5K5P3VlxOyliWtCr3Pii3dPR/pMV7F4gYitkBR6XZi7V/TAYrFzdDfs9h/fOBzZBUGhh4YFQSMylC9x3P1obS29PVG5QjzgXt2Z7BKgF3i9mO1xAcDb/5euOZdA3EGLmBL8pEDEzEjJxzOUZ7VbbbltchRnE7x5RZElKkOzd3HImWI8ydSmBYEnlDR38dmFgpDOuVRuyDd6JcPwj+FVlxve8Ngxr19k9SfgNTp5knbiODHiV6y8M/DUruNae+DnyaaZQF7If6Y0EM2rqI6uxFzEY/N+aDnihYkrKBlnDFOKWRFK8GI9bSyo0PwmxHkSON9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oIZw4CDZNP4MOnTW1ZOMdPHGNkGTOaACkIqn7TX7F9qxG7pZuSpHMDhOU+E3e1ptjjcXepOPhYM155RywGX411lVehLhU5qQujDxBK9JKWhIgw9OtsQ761kKX4wPYgqm5wUDKcgWOW0M/PzT2HCtBg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9efeb68-3e07-45fe-f77c-08d9841870e7 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:35.9988 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 025/218] avfilter/af_apsyclip: 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: zNNz2iCahBjJ Signed-off-by: Andreas Rheinhardt --- libavfilter/af_apsyclip.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/libavfilter/af_apsyclip.c b/libavfilter/af_apsyclip.c index e9f1feb906..dc3a8e97e4 100644 --- a/libavfilter/af_apsyclip.c +++ b/libavfilter/af_apsyclip.c @@ -80,25 +80,6 @@ static const AVOption apsyclip_options[] = { AVFILTER_DEFINE_CLASS(apsyclip); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_NONE - }; - int ret; - - 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 void generate_hann_window(float *window, float *inv_window, int size) { for (int i = 0; i < size; i++) { @@ -671,7 +652,7 @@ const AVFilter ff_af_apsyclip = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .activate = activate, From patchwork Thu Sep 30 13:39:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30709 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp688240iob; Thu, 30 Sep 2021 06:48:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx05wJMF5s5x0axyaVfTLJ6jA6lFpDxn0V9sFtBQNWSPxtA0LXLjJi/B1265A2oy/XC+rMo X-Received: by 2002:a50:e141:: with SMTP id i1mr7265835edl.157.1633009687702; Thu, 30 Sep 2021 06:48:07 -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 j4si3564415ejo.225.2021.09.30.06.48.07; Thu, 30 Sep 2021 06:48:07 -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=csRVynvl; 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 9829468A881; Thu, 30 Sep 2021 16:44:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064099.outbound.protection.outlook.com [40.92.64.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77F8D68AA16 for ; Thu, 30 Sep 2021 16:44:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NwRq4gqFptQrUKYeIydaljgFMs5K1fUsBVntu81TPNR0XXY6CbLNO9TeyzEJ3Mrgfh0RuYrSaBrOQ+sqDO+M2/Nck7wLYqA8LDQQLceT3Mjkg9zAwnmhhemzNDEQlnSAfm992t5X0pBB6vPrxSGWYoFL59u8DPQdLYV3Ag8uEdnPzUKVBGqZhLvpItU9EphTePdKVDrgdelEISpi1j+weDJv2E6795DL3Ck9eSYo3jaUjH20YgUxhnjAGwIvXIFGIQfTWLRhfwBjiMAz61RehYxhOwDY0z4M5i2lZWzeJq77ooYpteAG8YMJeCSPAVAgrCL/tyXgmU9EXgIONOb9NQ== 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=M+OMq8VcYRNikNKG9b4NYChOjlrTSzNbKE2VkCkcUD4=; b=CH8P32MfiXh398GZU26nXGkd/sbGkyuCJ7Z1EolnB7ZXdesXki5BYXYyYjTwL0TX+lSaQP5VB2xXyCUGSnv8qTiOrjjWMNYdt5iB8/bIcFbhmXVBeTkPpmMmcaaO8qMSh1tiQxicmO+umUbxlNWZ8vazzQehmROjw96Zavmn61pTba6q8kNqi+YercNArn3I96yw3MP9kua5nStP3cQE6/V3gkWhYvUzHgc8kmHzyZP9K/Y2EPdEEAKUu1X6EJ7AeMfmZqdC9qHwHBWmByIzYPuEsi1AaQLDK5FDWmQQa5fcjyKiJYgftlfo3qHtTk0ChlKub4bqQWgL5wkswICh2w== 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=M+OMq8VcYRNikNKG9b4NYChOjlrTSzNbKE2VkCkcUD4=; b=csRVynvlQeppfxQfQj0p0A/RJnYF/SHOicYyayXYIrl3f8w4SurSW1iutCBjySkiUT3A2N/KiSMQUdjPprP5/kmAYd1uvAWgxQ5Vax3mHnM2fdd25LkYfeL6zPRK+zutLn2pEcroJ1maGQDsFpin81wmtAVrUkGaP5Sb4b47TFtft11OgUlCxKefbYI8Uvym/MOtQy4kOauFeLngCH3A5Det87tULRDneUs8dmjS9tzHTh2nVn4wXxa/7i7qUpTvswzqkgVrIhy/l+xAlKrUAi/epjO3zXUQxoPAv1nEkiudGm8tEKY9cGJ2MSbWwUxlY4XUysCby6M33C4Qli6CJg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:44:39 +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:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Mr8+zLMOkAuIrv283tBvtZe17eMi4Exo] 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-25-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:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2d4eee6e-6633-4d63-3621-08d9841872c6 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FBJZxyHKSN5j/BVIQLQ5poOYTNeSpN/RbUCM09S0prl0GOQ+4ucNEYj5PUQIfIB3wRkfYzoqduGICdDsjNQYUBUriVJeDrXx76j7CXtNSlYCyTUY42MJ+2YVPZREHaVdtuKijkFmcm+66bh61Eoz2pUeLFB/0w4NbUMbILuRWex9xWQoGg6jjmiRqXwjmIXtUWcucu7hf8onMCsHAqr4Qx5pnFHop7S3aOhTA4ZiNk7j5Fod8tV97hOjrhnFInE9KxCE6Q/RQkgTuFLCbjBQcm92JGI+P/lhRit49Pk8c+h2iY+/lGpbrR3DrBAOEQwYr0LIy0veHpEhITwR06xiRfoCg10lGDsFr3bEu1VNBIwzzp6q6lkGSr3TgDGi3QxG3xTYh2fDXoKtFirM2lGJJ6dHKwexLgBdWuYKMCnwBplIsapbCxVDHo+R0H9ZvYW18BN4HHvxKUfev/7Ux1SLsbNPX2BGwnTonD3TE5DkR7vKOpVH7WeRSeO/DzOObfqDxwZ9KP+a1Ol8RoU4B9kgOMuPax6LLO8SVrygImrSuT9uGZNOL1PUH1O03ZqScbDMSZV+EgAKov0JjIp3Wp1PSt/mCs4xtR+MTr3vqQHU5l6VBIIFV/K7bAzpR8/29rjXMZbg6eCAkLeYhgmE6x6FODNmF+gjP21eH1cUR9A24IGJqUzfMl1dP+0= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KGOzqb07MDuFVpnh0N0cgLRX9XrhMqojXnv4SKD+2PcWaRGA1sgbY3J/RtNfgUUFR639BB5j5hCXAtO8Dpd+UmtL+6iCRqxYVAZt7O4Iutn4KmEI8xibCoQszV/WjWeSAjtrmQY+lmog3cvApAmUWh9QG4IrAeLGYD13tilho+dbgodxQO6kG+apKTYq2GeDXXZt0l/VrQgcetMl916xPo6Gv0xY1Mk77ayKiub997SNZ+GP7j4L+BOLRkdXVTYdD7zHqHJFVj7f+E7H3ozf0nzruQ6UVogXb15M9V/6DuabjDq4Yoopr07Fr01Yckalomyw9rN7mSll7M0J2KcQPKbwnrWxfgl2rIYOd4Xhc0ibCBXe3oyNGvQQW7SvhIrCXjfGBfZj9Tlro7DH1yXmD5x3qZiNWxul0EF+4QhfCqryc5YlfaRGwZuh7vDzueef X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EP6o3dJfF3NmFZ8+S8nGHo3POGAgA8BNL0nsbi2wEzZRelHaRQBnoTkCMt6PZDPci5TLc9GIqy/qYm2ETLSRs8bqKnrLrhpMaSwzAczANe0m0TeW27KVyWYNO074t6utm2EyKLFYcjZsTJytEVNiuw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d4eee6e-6633-4d63-3621-08d9841872c6 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:39.1460 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 026/218] avfilter/af_asoftclip: 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: 1Quay3gnSK/R Signed-off-by: Andreas Rheinhardt --- libavfilter/af_asoftclip.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_asoftclip.c b/libavfilter/af_asoftclip.c index 50646738a4..6ffde4431a 100644 --- a/libavfilter/af_asoftclip.c +++ b/libavfilter/af_asoftclip.c @@ -88,23 +88,6 @@ static const AVOption asoftclip_options[] = { AVFILTER_DEFINE_CLASS(asoftclip); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static void get_lowpass(Lowpass *s, double frequency, double sample_rate) @@ -504,7 +487,7 @@ const AVFilter ff_af_asoftclip = { .priv_class = &asoftclip_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), .uninit = uninit, .process_command = ff_filter_process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | From patchwork Thu Sep 30 13:39:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30695 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp688424iob; Thu, 30 Sep 2021 06:48:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEaBtS9Dbm0I/g3UDrdpwdOte8BlQhg4Yv07kEReYHANvQuKjF7Xe0FvflEN9TdPrLiwOr X-Received: by 2002:a17:906:a082:: with SMTP id q2mr6767253ejy.535.1633009699471; Thu, 30 Sep 2021 06:48:19 -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 hk18si3605088ejb.238.2021.09.30.06.48.18; Thu, 30 Sep 2021 06:48:19 -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="mMCw/pH0"; 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 7D31D68AA6A; Thu, 30 Sep 2021 16:44:47 +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-db8eur05olkn2024.outbound.protection.outlook.com [40.92.89.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 281C568AA63 for ; Thu, 30 Sep 2021 16:44:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GU0ck2oHMy8NvbRl2mG1cM1GqHwnMy7lGij6fU6DMxvUeMloaXI7exU5gkjKS8ZkiA/ArEhsRiiOsGf1aQKwzyoj1PuCxllJARwdbfJfHxQ2mOfO0aensRtgIWFnaZztX7TSpqGllulht3K3TtD+135jvPdBI5B7Shw4a76reziiqTBstDwko7jb45x4MMVDVxIEyuyZyaxOM1KyxNuxQRGRBysBfhctYO1Jfqso3bMiyVBrMiAIVbV/wY1ZYSJBkpVH7HaexvOhGxZj6KCEnfwHwod8uDNuMYHeiZ2UbEpF8AV/rs3Bty1Kzc0eXpT+eNE+GG+vuif4pYiIc4VZFQ== 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=O6HWAyxKzisI/FuexFxYJxiyC6JoEpt8oKRdta2OSvE=; b=FCvHg++dvOekM41wY6vfLrNw8Qq4Q2sAHhtc74uatzQMIX3hjNkWGeI7fvH9qKIC5QWC5NzaEbpJDLU5uBBaFMk0Y0SSTpBEH/wcvP9QqODuZ2l+T9h0gsMJJ07eAlRGoQEi6HK1dp7XbpQ6VyE239/w8V1O0Dh+SFKOSyPWIZi0u2Xu1sSV+Q4gofD95oIGdEQGMTb4N8C1DKVOZ2ucfgArxCK2lwofuYZ+IBFFnIXe7Bxup722AKt3qcL6wJcG0KnykM1pMq64RzRz9UpKXsAFaNIyvYd4lRGi9PmY2nwGNWQWzBeWgLIjPfeIzQb0GrfZOvxA9nwWK2hSctfcwA== 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=O6HWAyxKzisI/FuexFxYJxiyC6JoEpt8oKRdta2OSvE=; b=mMCw/pH0IuLmtapLtK5H++8yya7x4S0X5WaYBfHu9yXghN58vjQ/QovYS3Rz36yWNfXOTLbt1CzOpX65/urNg5CbpARRK0Ci/g4Okh8+McHyNkE1MMBlMT2u3sve+ThOgnCBgIYRiRq3ii8LtrpW+vCT8KtapKz0nh5dsDORsV7P3YDNEEM4CprfyOsriSTPGXNCmPebZCpcim1mLcGOV1GF8S86G7PBGlbbKdcegoJD6fvJb2rzf+iHM6D6yWrMqQX/aFMnVllZFI6myk64hKknlZl/sTcSOzfUxNwGgAhV9HnhlgbEChOIoft7MdMPUudHqIh5Ny8Xb9kdEHFZDQ== 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: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:44:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:28 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [YQmfy4+GCCrpA9xRBhDfO4IIJBel/R0g] 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-26-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:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0c3f8962-bc2c-4ea8-dbc7-08d9841874eb X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOddO3cs4VPgpR2ICz6aZgr/M9srTI/9wY2AFVTormRgW/LLHA8FAinB4qhasENimgcOh51FZVHuB5Q1Q1YROzWFA5esCBMDzSYa3AcD9ptWRcA569q1X9LkU5Pxwp3wllFNZA+rSbIuYKM++Qdv+JwIKMY39PhHbKoIVBDJujYZQYwoACyQ/sps8SIs24C4j+PCSr++Ku2JilGFmORwLspn7W6IrRRIQ3dfz8vC/wd60BKB5U782FQZwcIWIWEW0pTywSqtsJDHXNVpSh+sfL6AQXuJctnFhfIH3FSyRINQkiG0dJOSVTMzTrjGDdNgDWwOqA6f3AqtnN4Ud3FlLquRktQ/0nTjnQhanEYmNxG4Ji8Xw/27VC+bbMlwXEuoEEVCS9diRn4w6UZiYheHFkCt1Sngo73eMWZssWJwmraLVhI8zGkN998DLtESIDSi0sB75ywO3bROmFLpR2kowiO9oOJWStjPu+56Tw0yHVHefsEAEH4IrSAuLMW1pQFGNl716lzPTlEfuSi0UmQQ+k62moKmO5bcX8SxCHeS20+2o+8vwthlWmRvQ5Upn7wl9hTb1bHfj9wPR9OaxAH7rvSK2RgqIaaGH0fY8RPYKf9YvKO4HDsi+NRDC3kZMIv1qMW7bgGqpZUMCbooL4eU02Jn42DSHKnl4kkZt15H1DNumbPSob9US4awmA/Uv3uZgc1QsrK016gpRql3cN+RV0t06bbWHuYvJA= X-MS-TrafficTypeDiagnostic: PA4PR03MB6733: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7epvcEvlr9lV4eXWwQgFBn+1EXpdvSXdTxeEo33KWrxrZatN3rD2cYXncOK4Kz5sh8YLVIOdfZdTGcAr0eCtK0DunfHAfGBpHo793C3P3ZGCtCCFZLRQoPphioynjP1vrBmTO5SB3zPB+IMtNMbSu7+iZxhUddvWxViMOmvKtbxmH0APLFLJU5hC6DWVNSpkKRnRAcvnad6vF0sUJ4JD7IaLQR/9xpvZqakxH39fBoc2+YUvt4Ib/50VVwkDZC6MmpzerJmf1Zc1S+K3AaS5hQx1MZLHtIjO7F90EBig4MkWlm3lfkKahdG7ykWv56yWTd3skkbwwMOgQt5APSjtkWtzUQKUgYQzVslUbhqHjoU97PRlIJ/Tx2sVyCIvaib7a0wOeWNGRFjEjWh7rW+++Ttd3bJrqc/SO+QID5fx6Om8KW/9On/cq2p+9YIpgKkB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RN5/m/gK0yzuelG9vdZQ3jrZFwXvw+IOuGwMGgf+ukH6ht4jx+8KTF4XQZmbeRTo9CXbmqb1l0uUSCdiDoBd7GHqQRbTUWvK74nIy6XJmxA960lZLU3m/kRYdQSYkhGjHoOZk5X7d4oB+hiMJd61Ow== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c3f8962-bc2c-4ea8-dbc7-08d9841874eb 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:42.7492 (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 027/218] avfilter/af_astats: 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: OQWppE+ZK16/ Signed-off-by: Andreas Rheinhardt --- libavfilter/af_astats.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c index d43dd086f1..0621d18b35 100644 --- a/libavfilter/af_astats.c +++ b/libavfilter/af_astats.c @@ -149,27 +149,6 @@ static const AVOption astats_options[] = { AVFILTER_DEFINE_CLASS(astats); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, - AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, - AV_SAMPLE_FMT_S64, AV_SAMPLE_FMT_S64P, - AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_DBL, 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 void reset_stats(AudioStatsContext *s) { int c; @@ -868,6 +847,10 @@ const AVFilter ff_af_astats = { .uninit = uninit, FILTER_INPUTS(astats_inputs), FILTER_OUTPUTS(astats_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_S64, AV_SAMPLE_FMT_S64P, + AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:39:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30719 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp688581iob; Thu, 30 Sep 2021 06:48:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxZ7Au/ogQIZI0/CiU4E+6yy7RCXHJpuWsMxVgqQeu/eZe1qiM5OD3HsSzhSk8vTLqpwZR X-Received: by 2002:a17:906:ce24:: with SMTP id sd4mr4312262ejb.315.1633009710877; Thu, 30 Sep 2021 06:48:30 -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 nc14si189639ejc.747.2021.09.30.06.48.30; Thu, 30 Sep 2021 06:48:30 -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=Q7eSe80l; 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 B3BBB68AA84; Thu, 30 Sep 2021 16:44:49 +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-db8eur05olkn2104.outbound.protection.outlook.com [40.92.89.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60A8268AA78 for ; Thu, 30 Sep 2021 16:44:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lT59okUXU+iK8ovQwfubvhJEhbIkPS9Pzy9ZXlFrhqGYZ1pqljFBtXIXvtDzQ6VlwArM4svcvCFdVAU1y3xfb1DZX5Q5sR7JdFB5jXi6rjLvVCHCMeMPsTK+Bo0jS00fN7wyqVDBq378ktK3pRN49Qp4ZtS9kGc4w/CQtwbfKkbTqNqrgzS+lbn56uS7va7fguwt67M8Dtu4PJE43XGMckD3i1oh1xYOqu9cwSAbEZa3WSJd1QgW0OwNy5GPzZANIrpFfd4bih1eCFNAU4i4sWZsryN+VvaZUwr5HaXAeR39pGqi1uqSF2eUmqp8Smc2uW0WTG1qCGqGc8YXP0WAOw== 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=dhz9WbD1BWHJsPMQOYNY4qo446onHHq4xyAQJu8L+OA=; b=IvHvapJcpicd2p1NQRudxntepA64DWCxo1a416C3DcYtx8p1S21NhGVnHJ0NbMR2A/CiMeuyucU80dpuhFYhLzcgZxUHWX9GNbr7hn8AYLcUPoJrCRTTxB9+99EVhnq05PTinEoCqlAeITXEQ88V4BlY8vzjTa3rKgInc6zXy11gT5gSuweHWNrgm6l+cbq9S9GlM6MaKYTZnNLg/+UhT5tKfP4Hagn76s0HWgEnpMg0ziV7wXqloYWxijsUCK5UHTvvAYWNazrPfwKDV5lTvoI2YgWboQrrphOyHM95OJzqTXK0ocazzehqnylBSfoWIYBQ7H/nocDiQMfMKg5/dw== 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=dhz9WbD1BWHJsPMQOYNY4qo446onHHq4xyAQJu8L+OA=; b=Q7eSe80lQfHbInAxtFeyF6F+KlopLiuyBQnHcq5cSuhASQtBhPPF8f/ZWtNY475S7/POrRI6ORpNytxA8FG1xkVC8fysOfdEbCx+usA6j5xFsv3b1CrOZUJSIj88QS9nVz3D8mFW8RMp85hjzHvF+0APW92v7Ugoi25dg4lDUfuVHZU9PandJ5lxBNd6hACas4u+d9e41KZUEoWUfUGg0W3YhpuU3F8Q0JGJA//wlTjHHLUnQXXrOKsphqUwvQBX8ITAUvtgKxhvVtZoh6qqmICuyGh+tq8V0KS+ocXe8nSq9lgnfjLV1fVbMmP+l7Fjegrg4hcMAicKWSN/8MtF6w== 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:46 +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:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:29 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [rnEZFse5cghe+h178SwCeEuGdQBZZYHJ] 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-27-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:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2d094825-e518-4286-fea4-08d9841876f0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymKo9o/g3zytw/pwqBuHdQmQBwmf5PReHyPt0DefdQ7aAKQWGhjLy1AsBvdx9np0cxW5Hwk6NR8FFc27LyOuzAQLsodPDbl6rudVJvVXHPZJp/FZ+dj6w3QZbs8I7KSHXb3nCCOP5fZHfeuD90Wwi1DFOQLm7a+02Z9q8LRvpzxqicL3Pb8EHFF9wcuwuuadMKgnkKZ0Hw05FhO+WTCarfXLYHJ2No7wNQOqynLihf17d5ZurXjTUFgR5baR3whz0w7OAusJmyNTnHWrNscuF2njrXysq9oYSll1IGfiisFLE2iEX20i1Plfn9Ll/aeNMVQnhZmP3L7MW6pLOwkQ2EJ5M3Fld3+ZYN22IKSJ5Up3yNK5BR0AETbt03QqJMOPe40R5r3AuUhnjs9ShvRfo9XvlBdxrME0+WFm5NvK+ArDGkwuVXxDf250wm19FWqROqSbx3vOEorowP3TViLnpJMS2zyEw2KGZv5oRw14dPtHhqNW3tS2SxPDcXgqpaIU7UujIrSAr8evHLSUipDcTKpd4lNS9W/IUWoj7K0jM4eKkCTYOPsWPO60ggIdXdJZwxnBVCJKUBu9PaCh3I+EhwK24wkDlTZkmAEiEU9uEpekWnGZb3j/lnq+MwZ6PPnwUrsHN9Q5n0ij/AiwZvcvjQJt8G7Uvi2rrVjbtiTUINQHIKRYpOlHyyxsqRNRei1TPkOOvPOO8LJxAusnuatzZCkxyzfRybyR8gc= X-MS-TrafficTypeDiagnostic: PA4PR03MB6733: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lW2IW7k0545Ad043NTfG07O7WRqwpdZvHs4tALPsiQShdSFXS3tkoEuodi+uYY7wgOwCb/QAoa0DpSt4RmHpuvT2DGwiRF92tSwG8DGK0kCMegearZsU4DotSKlx6KEU89x28sOrvr4B8HxVO3FaD7XRo3T86TNevXkNroJyoZYu64c7u0RNMZm1xDCYGUr9y4LjerO2WQmgMYtPfAYRcxKI/Wd+RsvzfB6IGs/LAhda1mSkmKg0xoUIX/bqJdHvT2hvxT3Yx0I6TEoSN8ZZ+1Qs5ztuqmxfDCOAarpitlcsYf3O0bYvK1GHBRDmKz7Z8IFnPjc6TmuRMq9LX5jplntqGm3XyeGKEHM+vKmaWWdi8AYkwSG5syjOx6iwnDgI13LJkjysXN8tr0KHBij6CiXuvTf0X2kUGYYjmwLut5J0zT6KHZmXVUpNdDzuAYyD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: u4jAqtbPz35T9ojToFWvMcsV3YcX7i+Tj7wa0NJV7wb0GDE90tFBtY0sO8CanJrjdXwqQwxlCGAahznD54gtcIraSQNYtjvJUX6kR+HgIE2z1zMeDLpEMw66RKsc6EvoRnP53iAToMPOdTgFeGgLqw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d094825-e518-4286-fea4-08d9841876f0 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:46.1721 (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 028/218] avfilter/af_asubboost: 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: QgDu2Fkp2m3g Signed-off-by: Andreas Rheinhardt --- libavfilter/af_asubboost.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_asubboost.c b/libavfilter/af_asubboost.c index 9e97cbf375..da3e68e841 100644 --- a/libavfilter/af_asubboost.c +++ b/libavfilter/af_asubboost.c @@ -44,23 +44,6 @@ typedef struct ASubBoostContext { AVFrame *buffer; } ASubBoostContext; -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_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static int get_coeffs(AVFilterContext *ctx) { ASubBoostContext *s = ctx->priv; @@ -238,7 +221,7 @@ const AVFilter ff_af_asubboost = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, From patchwork Thu Sep 30 13:39:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30720 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp688767iob; Thu, 30 Sep 2021 06:48:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxh0hWb1KlxKqrg64YJfOAvhVVJfkTiaWYjn01L31ZhMGRUcE5lVm3cQZICpyz05G6gnCL1 X-Received: by 2002:a50:8285:: with SMTP id 5mr7278700edg.318.1633009721466; Thu, 30 Sep 2021 06:48:41 -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 r21si3276395edq.460.2021.09.30.06.48.41; Thu, 30 Sep 2021 06:48:41 -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=bERu3p3F; 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 240A368AA90; Thu, 30 Sep 2021 16:44:52 +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-oln040092068056.outbound.protection.outlook.com [40.92.68.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0697D68AA64 for ; Thu, 30 Sep 2021 16:44:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eSj19H/LF+L9dRK8gYN2rMKSA+iY3JsirLiqGizliVgIk8tzPbrYwLWXuJKDe430BKKVFGru/6uIQx1orYRYeIhYzGBPkmaWSUukhTNFF8GdpUzhfmcEzhePITDTEJ0mHbfT6U2+z+w38OFxQW13kXCW6Y+/N22L8kyimsCAxGyaQEm6ENqpuwWE3vZM5+GPRM3lDXhSpTSmCxO2EXIJj8TvAE2ogIWCETx0AuG4iKrvSzb75yxPc1dL4Xh1YSO85jVr16cTibGYtn6RJ9x8LarnL3v3Ok7pEVIk2vc1kS3Iozlhvj62z/kCdIu98U0RS6OXgYJ2R6z9c4xQ1Vm+CA== 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=d4GOnr3U8DchNXQuA7Ma2SICf5wXD9Hh7zgHpjkDgQ0=; b=jOrdatEYTEvVt7SlIzwaoxt0emdgegJlsYnRvw6z85siw+Ce0HNUjGvzRFYBvqXRGqx4hY7knHxAfcZW8Mqa0AgEeB4bnHTXAUt9fC8jL2yQGE8YKF0WXriHiBYsO5YBD38P3KlgveE+8d3l8LqErNtSXfytzqQNqSU4aohi3NtL1RI3rhMB4WYNmiuYlfPH/e/C6/ZGDEE+4Vx0E7NP3BbILYN8Y04XYUm7N26NsaE2JD/OmdlqlxV4i1xU6NcQuwL64t1RXKOEf9Aq1q9w+4hA8bemc+kB9j0qMlQKajS+VrgOWBzxtn7KvcvlbbwvqhvoHDEfeh+/vLi9ghetSw== 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=d4GOnr3U8DchNXQuA7Ma2SICf5wXD9Hh7zgHpjkDgQ0=; b=bERu3p3FJaVN3OVLthkG+Enmx18SgUFC/0JYJPBCeHbFXqEn2sIyqiP5iPeEneH6mTJx/NNzSeOkrsolIpxQ/xyCXoP4drDFT/62VlFPUrQU6T/pOYzqig0la9vyWrcl4I2fN4qHjLoxOF7wkW2RHsKZy+qU/L6FHrbZlNp630zetDF88oXXyArRDVqja7AWUaLLNrvnwKjNESQ6ONS5jyAWQO9m41j/pu1quxC7AVxMVlvozukvHdnPGu6O14dW8/M7+ys31XghRoPWt/RmkACFPmKu7ME2/OdXI8lhl4Wrd+mP1OAiXgJeGuFPien7m2+nc0GFdueh8MEDK6dleg== 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:49 +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:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:30 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [4oMozu9E//UhcvJVRMUkpTUlT5h5wFoM] 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-28-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:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1f5a07d8-42bb-4898-3c6f-08d984187912 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOddO3cs4VPgvljjATDTe4RqLGkLcJLcg2/clChYziDjwOPx/VrtvpPnKEqbdtMGNz36Rzm+2BLnoVoRgREbBGXjCnBpfAXdzmwklSBcNDwY9pRIE4AwPuprOpWO2dcwCgJYpJexrqf/H96dNSVUdwe4Cc5JU/F2G2FaWLYptj+xU3JQRTEjGcADw7XtfiM0JAC+yDUE/NS9KaVkss33cgBbYvbwzVu8aWkEYS3BBtI1xq053U8DbljLHlPe3/Rq9E4hMqlgDg+ljILyBoWCKGLVVT6ADla2gKd3XhjOnOgqIf2PVle5WRjy4aeB+28JbqGv9owMSmLZh6zl+Aq/jVRaVDSuHlX0ViqN2X7lucwJonBOtn7qiT5+EHNH56SbHTRmoh7ndi2CnSwrha6U1HfYi2ZVTZy1+DQZed+X03SvwKU2Tz7Gk0Vu0ggHzwKYBWZ0jiC1XzB/8rklB/t5GeokoMV17pXKfG+A5WN7UlOtamL1Hu6AD9+OeVC8TjpR7wunjjd/J9neWPjMJ1ttwjKQ0jiXKfHQTFa//eo44Hjp7VdAAvlP1dYnSQT56+HURvYr6qaswGY/nq5NXqsx25UpRaFeR/yyRIg2SZqAWobd57ZHJZSyrFV/9JFxK0UvSO0n3W9g9L8Db/E8fLOEepTreebJ4JX24t04ixnZ+B0EvMBu0teDdSdPnERa1Yx4d3nrT6bKj/HfNnwQgB02AmbbC2OA9c3Ds4= X-MS-TrafficTypeDiagnostic: PA4PR03MB6733: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ada1Lk1yYioONTbq3wd3Jfh4aG2U2eUT6waeg7xVpKM2RzyinqPr41sjfFRHvmSeq/Vj/RlpKhSEEkO3Mk7BOG2gJRz1pWeXZXq8GF9ptHlgSrU7RsL9R05BTaz7ULqAuIhCBdjnFpGb0te05LlsOYae/C/ve+AeNlajoBTVsgzGdpIEqbwbQ7ID6jrnDe8Yh91FHtRYjRW3yd+0AOy6WIt4uYCruxgA2QJ3iQrnkcAe6E0gf8XPPgoZNJXHwBj9OQfSQpMZ6J731USMCNPDVEq3Yi2lyeeHiSN1iqkP7dD0uIY1Kw1qfSeph5QxfPeyoY2g6f40bu8mb2IGfL7lMKZfWdoXr80icGkPZOzJNyXpJgvvm+oH7PTnYxp3D11qcrCLDTfKC08Ei4JHQjwlCLE+vulxkXo2C0t166LeUwVWhTtBM7N3nixWNpesAeQ1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3IkZFcmVYpkzmtoZGduVLS+zg/xjDGDitFdqcq4JTpflUFaEzJqlV06zRLFrEstRaNZG+KUi+kYPtlKc1y6UbIf6IsTWWEBABSBhrN7hzIDyyCyOYN9uC1QMF8k+PQb+0ruzujJW+gLBwpXwr7wljA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f5a07d8-42bb-4898-3c6f-08d984187912 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:49.7096 (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 029/218] avfilter/af_asupercut: 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: ZqZEWV909DVX Signed-off-by: Andreas Rheinhardt --- libavfilter/af_asupercut.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/libavfilter/af_asupercut.c b/libavfilter/af_asupercut.c index 0efcbf8d37..a4c2d15154 100644 --- a/libavfilter/af_asupercut.c +++ b/libavfilter/af_asupercut.c @@ -49,23 +49,9 @@ typedef struct ASuperCutContext { int (*filter_channels)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); } ASuperCutContext; -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} +static const enum AVSampleFormat sample_fmts[] = { + AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE +}; static void calc_q_factors(int n, double *q) { @@ -362,7 +348,7 @@ const AVFilter ff_af_asupercut = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, @@ -385,7 +371,7 @@ const AVFilter ff_af_asubcut = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, @@ -410,7 +396,7 @@ const AVFilter ff_af_asuperpass = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, @@ -424,7 +410,7 @@ const AVFilter ff_af_asuperstop = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS_ARRAY(sample_fmts), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, 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), }; From patchwork Thu Sep 30 13:39:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30832 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp411389yba; Thu, 30 Sep 2021 06:49:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkJGVDBA5ac6oyHCJmhOffShml5mx+kyuwFZepxDEoLPrlEDEwDO3sfCQv5ea1e3+38t1R X-Received: by 2002:a05:6402:358f:: with SMTP id y15mr7099789edc.67.1633009745939; Thu, 30 Sep 2021 06:49:05 -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 rn5si3454298ejb.311.2021.09.30.06.49.05; Thu, 30 Sep 2021 06:49:05 -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=Ji7tX3Uw; 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 811B368AAC5; Thu, 30 Sep 2021 16:44:57 +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-db8eur05olkn2076.outbound.protection.outlook.com [40.92.89.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C077568AAB1 for ; Thu, 30 Sep 2021 16:44:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PIFbgmDgn01p0W9Qc/KTsa8iTNPeTMajcr85WD1wrGIOeufHZhIvYM6NF/VZoIOSsNLNFb0rtdJCY8B5JRmSXDZe5fNi98Pf+DQAG2/9bmZbl9qNe8sJZyakipuUdtS2EnL/H3me1xVjNrnxWI17ah9kP3s+UDpQe0oFEGiWWGMp9/csBCu8cpqesypuO9wmOXb748J1ZjxLpQG8d7x2bWQow/bT0+DufX/g36CxItmesntLmm4Ee4TMPez4A9k7CEzjsNJr5PmyItZUGpvHDMJbx2gcZY/OEVURy75eeWi+JiiLA7DYZzSVW45pX4T1X0w1/HUo03/JV1U4el+ysQ== 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=VPIrxDgwV0xc2vF50/w81kryfGel50E5Yt08OJAbMd0=; b=b2wPluT/milO/Q2KAIrizQuMYQlDXSCVjafA6K/wU0scfYC1Vn+fBifxGIagT3QKFvEBJ9tk8BbGDpSNwLpZOK5hEMFc2tFhy7RvJtoQoZXRr9w7oypd0lqwQuxdeSjtVgrfOXcsSOxIlzdSb2wgVmxEfF/OlpaePC8hfgfEnzn9OjA0Zdt/SD1NDb2HZYWA14Hrp+vW6y0l45fd+BetXX/XdNrejpAQKVSxS4FM5q38hJrhq11txrBPhHufEnx48hL8XlOUJxH1cWhlcXz82o/dn67mnLOZTNZaWfYeyBQoqO0fjRoJXEieHmvhz6LOqaPGvuAtCyBG3+f4rF9DMg== 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=VPIrxDgwV0xc2vF50/w81kryfGel50E5Yt08OJAbMd0=; b=Ji7tX3UwS3exQbhRlJjEbFrJo2Z7NrSk4HSjCexI1AnSb/es/lNhBBw65UZ2ZSCcOt5Tgv+CceCOwDXIFNHaICtADGLJEqVllilCFonxVUF6gT7OSJYpPJ9PeguD64KrXKfltWsjn80RkbOpGGqVDelEtFUIjOs4SRmVbqEV1WpMuSf88EtR40BGgceUz50Wt65DrSH4vrtBpxoTRl+CkOhIPYbWEwqxvtMc1khxwHi36yTDTJmDBhgjQR1WEW0JJ+RcObWQeEudJLF5t6QjI84eeb+sU7zNzp554WzwMrZKU3b1UUI46RA0sKAFCHOkvQWHiGp9ys231ne+4z0P5Q== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6428.eurprd03.prod.outlook.com (2603:10a6:102:77::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:44:54 +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:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:32 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [K5bvbJs2LGWMYxfxVH1TvcRUvMaTOreV] 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-30-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:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8547013c-55ff-4169-b842-08d984187bf4 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FCtBlzoh/JHc9/twbbubt47NGTiOJcOYhgW27eb+iflkfs/x0hD861Lp3M8es7XAlaL93iq3be6zxMyIxkc2r8nn6NWe3eq53n41TTBCYHk48vgk4KNzXLWlPs3yLdzAZaPO96pa7rfgAN3p6+tQt+YOggYJ4cQhKFMOiL/fFFDq+8dmEpB6oiO0TxLMtSsJiEVY7GzwqgEqgLr/cD5rS+5i8gEts4Mi31dM6uZxK9lRcQJ0+NwEBHQ9DR1OTbB+Hsm/GpTbc2duTbyabEYEoU60G1DO6yefNUVPQPcdkAQFEKUcUm85l4ZOczFAWyUJzCLos6rA/CXwHGSUjtzPHcS9M4kQ18ZfLjhsf9gaR0OP+SqJ3jEmOXNqpJ9LWvkD2IE2ktQQ7aiSiBU50x7xq7ygQAlX9nNzug54ZlocoYdd7fzRfzf6gXr1fgIP9TTTUatX2+KtGZ0anOK/d0CL3oq8jIG10a5S1AUng4huYi5uN/g0GbxY1YcUiUyXy82ky3W/Y0RApdOVUUvWdAiOO23d1HdK34w/h/lPKIhmWI0Yj4LyTDGGnNxvAFliagkfifrenB5g+upkJ0MZx92jWqttVEP8l3h9HhfOAqaUGWXAYGZ4QikEvURZ9/njKcxfl7Kl/WPwnQkupT+R5K+NcVlxNjUuclH8USLCftocuzFelxe0SPCqOdo= X-MS-TrafficTypeDiagnostic: PR3PR03MB6428: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EIMppB1WvD8QAhBXNOz3A5UtN1iY/fzwmRC4tSOjVY88we6ZWCjjAISFZNKLRIOhBhNblPFR2SwWfk7ZAgHwbnGla8WbjfuNmq0Tg263p/a9CDTAkrOUzF7bEO3+u+j3NODa0uJJnFS4HTTT4j4wuAvLVzz+t4nVnT1I088jLHbrR24/kSObf+Fyzge7qbHh1Tn3bMY1r6VxQWv2gDZq+Q0H7o8s9ystxJ8sd1Tetkp2+nDaezmz6b3o0sp0JaUrJjIBrgcjkKNBpYUP0JlZl1fsN+J5NKBo4+/tok/scsxfkS3QgKaRM8bv6gUOaDSCTHHx8sp60blHESB4Q3KidIEu3/jcO6d5zzh1HpM+lwmE4d9WSO7uQG2Ab7A74321QwP/Z6SAi8bVWf061SI6iSWv3ccaPESS3JsIqpHsHjV45AyWZ8FgoCXo0kXKINvF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UmphfE4mRWsL+CHGGZDIwwyzKNB22tAqtWXujCnN9jekjry1aVGMKQuCQAOZgD4g7hnmO/qifaPKBOHCFS9n44ni7JGIwI41HPlJmJVRKC9BCqE0ll1Qp87hr0Mkgt8p8ghtMu9b2MU3xVz9anaooA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8547013c-55ff-4169-b842-08d984187bf4 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:54.5573 (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: PR3PR03MB6428 Subject: [FFmpeg-devel] [PATCH 031/218] avfilter/af_atilt: 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: BNdOFjzc5l0R Content-Length: 1708 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_atilt.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/libavfilter/af_atilt.c b/libavfilter/af_atilt.c index e242ad2bd5..c8d55590c3 100644 --- a/libavfilter/af_atilt.c +++ b/libavfilter/af_atilt.c @@ -47,25 +47,6 @@ typedef struct ATiltContext { int (*filter_channels)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); } ATiltContext; -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_NONE - }; - int ret; - - ret = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static double prewarp(double w, double T, double wp) { return wp * tan(w * T * 0.5) / tan(wp * T * 0.5); @@ -280,7 +261,7 @@ AVFilter ff_af_atilt = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, From patchwork Thu Sep 30 13:39:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30830 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp411512yba; Thu, 30 Sep 2021 06:49:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwE6hvIycYrum8kyEH9Bix4rq2ixw3eneRhdYbBjnmbGHoepkz6N/BZEVIyJ7Ipdiv36fU4 X-Received: by 2002:a17:906:ca12:: with SMTP id jt18mr6641592ejb.451.1633009754451; Thu, 30 Sep 2021 06:49:14 -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 bu1si3641484ejb.482.2021.09.30.06.49.14; Thu, 30 Sep 2021 06:49:14 -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=X+KiOvdc; 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 97C6D68AAD5; Thu, 30 Sep 2021 16:45:00 +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-db8eur05olkn2099.outbound.protection.outlook.com [40.92.89.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1EE968AA64 for ; Thu, 30 Sep 2021 16:44:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mYjSU0bUdz4Cj3qA7Y6n/WP5B/c3yvfmJU3+wIB2uaUktYf3uut34fkpRu3BVCx82n5E+8q3MwjSs+2a2emA2Cg74G3Ky3QyeI4cPahtkgvouHjY4EiJMscW6sOmx/WMz3MxZSo29GrfbDKKBVuvEjlhnJCgDA9rsC3Rc8BLOTC+E7MG4aYMUoSWkMJFlkrE5SwFR2asDnNL4m/ndE30AF6epMeduOASnblxI6WFCX1cgsVqj3Hi2a1UdTuseWu+rNjFKbULZLCnSgutzi7YYOQI3Sb1SDtFhMbIAuoKNcYn7qmRUDN33t7mRiK+MFUtg9W2JW2t3Tk4kiyFKqwS1A== 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=26YTd0YtudADBoe4QjXzg6IggWXOEXj5MEaQ9apSkuo=; b=C3aAeYht4Pveis9UfcymKD8PL3tHIaKjYpPLea5XhmZgHa09dXgxlsUrbRmQWMAOMGWLVdpXNVzsq5JC5SGSPozJMx7Dz2jEXNnHInpMLPGZqaioz00y8dgj31+3NGWa7OI7wMnJjC7BZcQNewdn6ZHM0M8HU+0iKt6GNT0wnKWjbJZTKPhybh0SCw7MhIf6F+FZY5rOF+p7J7IFVctgUvW+yCUz4zBvK21xR8uJOx357hytpsrYS1jj6EjwZhkz0X0wfhTFQkoLmGGsd00qcpkF3BTFTUpN5fBmBe2xzZzntp+Uh4GGDTtQHqgHj9+RvxgKYn6xsGE+IN6MoUplAg== 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=26YTd0YtudADBoe4QjXzg6IggWXOEXj5MEaQ9apSkuo=; b=X+KiOvdcj9Qnvqk7tdoMmO8Rd85I+jua+oYFDUIcDhSGcStFZ2taDVBdhCAt4dGpVX4R/5RkDLhjbkr24FaGLQc12Dga7HTXqMca8DWPrvBPyfHhqVOpKo18wYdD3pl1SggMHOFTVH2EMuZ5iQfjwW4br2sv0M3S9c/qgCCD0AsnUetCMkml2oiFWJkB6ZcLuMEspY2Gpf9YtWHZS9RVNFnW/nfo7lJYYzb+eFWI/CPSc0ZEKjXO0kU/4px6b6M2yjIXwOScGPV5A3gMrOOFWax3ma17AqWhoIf8zvY7s4Won/vJ3hyWYlyTmMQfBgd00ebUoz3ufJtXam8lJncZWQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6428.eurprd03.prod.outlook.com (2603:10a6:102:77::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:44:57 +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:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:33 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [E7Zsr3mIecC1ack7V53Swwmbo4MDJJF7] 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-31-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:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ad39538-7dfd-433f-c24b-08d984187dbe X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV7GPXw1na9nH97T3lNsxOfz6PuF4tbwznRBwAyryY5h7r+zElGQMoZProYyjC1DYii61Tu7AgT63qefQWSBtGMFsWXvisFvwl14ZypeXKJOUKURIzh0UyfLx4nDmnp912QbsT5Cu0ep3ff4ws0idGwYJAJuT7SZfQWhCSuGTthJElc997+CtWPC5ryfHUNxMpKFKm/q78JBSuyBYpb9VoRe54DOI+pvG1Fms/0KttgTRnd7uXo8kHkzJ0jQuwt4q0nmA5iUDkVzjEu2lCip3w6onI9wvgdq/RsOrpQ+s0LYeLptlNDBUSWPHdsC5lez7OzP+msF8f24XyyFBrMcsVn7LkdHIlnlVw/c7yA9WvY+pjqKdO1WNcFl8vgICd9nlOWK5eoHkRrhQ7RFOpiAeoXtzs2fD1kz4NFEYEQNAh9kICPeTzT2nv85qfEJibAOHfEyjcjMCoo7lqywmw7AZgfGyX9XmIdVXmRS0A0N9JMj+Xu/w+5JUAM8B4nW92I+CM3K+ayBIrXTjNAtS2pjdWFjQiFbbVbzOvjIURHqN6o567HwycyOeRIVduRHlxLJSYVlco05AlW4AHPB2NtVaNTSs3WSBMzhjmLhgLpt3FaX1yllpeAkBpYv4lToMprpqreUCiRbFDHwIDMU3bYn66NXzcQ9SHqjPc0w6Xyg5xBg+XVtDzMDKSOM= X-MS-TrafficTypeDiagnostic: PR3PR03MB6428: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PRSgSnyFgJAlj32BSfTdtS2VvdqaGlFOC+vza6n1r8w41pb7aHmR8wzW3FY0hb1Pv8+Iq/49sGPsvf3u6LfvRc6m0lzc5Hda8JFZ7sxBgRIoJeKIMn0c+4pSrFNSpiZ4Tfn76klh0c0qVhvHU6iIn2xrln9aqN4AN63DhnvxG0lVfG02KlafaZhVhrKjyg1/FzwwKgF03pU094l31BPxtRv7fOYMIFmvhX99B+8ipv+J/x/hbdfpPxj3bashSBlGxP3XXqYU4CPxKmi+wCcc7qq9UEeWXn7IiIQocJ81beiDPPpl17aTEk0u91FCK2fdkK5Rz2tMR5B2QkpDmEKy0OBQT11iNuOWNcV7hm0DgSEcbyLLPO8FqCLHwyopk02RkCaJrRREO2QFXXz4xYd+PxttGbZX2O/ETHjPBmU80gOD05HVZ0jdy+iWjvi9dYaq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PG/9fN4enXCp77XGwXLvtVumM/HDVlMhEOJJLNLY9bGBc2vzIXXubwp2jLquh3V4MNqIAfn4yavvvAgWIAp15XAgI23hE35AcQ4gvSSZNd3EeMxzqQNwDawgilaC4hRoO9Ms1AVRJzIOyJDV81HOdg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ad39538-7dfd-433f-c24b-08d984187dbe 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:57.5700 (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: PR3PR03MB6428 Subject: [FFmpeg-devel] [PATCH 032/218] avfilter/af_axcorrelate: Store format in filter, remove query func 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: 1Otw+nlE5Pho Content-Length: 1508 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_axcorrelate.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_axcorrelate.c b/libavfilter/af_axcorrelate.c index 1d9c805b29..8c5c429127 100644 --- a/libavfilter/af_axcorrelate.c +++ b/libavfilter/af_axcorrelate.c @@ -46,23 +46,6 @@ typedef struct AudioXCorrelateContext { int (*xcorrelate)(AVFilterContext *ctx, AVFrame *out); } AudioXCorrelateContext; -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 float mean_sum(const float *in, int size) { float mean_sum = 0.f; @@ -358,5 +341,5 @@ const AVFilter ff_af_axcorrelate = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), }; From patchwork Thu Sep 30 13:39:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30829 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp411652yba; Thu, 30 Sep 2021 06:49:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaMd1J1MwecKBmw8tfslhQD46iKrvfnBXRumG+i1tB/jIgQSgs/CVb+vs8oMwmUcmjw9Rk X-Received: by 2002:a05:6402:19ba:: with SMTP id o26mr7350148edz.1.1633009767522; Thu, 30 Sep 2021 06:49:27 -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 a9si3360272ejj.255.2021.09.30.06.49.27; Thu, 30 Sep 2021 06:49:27 -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=JvYuRPYd; 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 7F88F68AA9C; Thu, 30 Sep 2021 16:45:02 +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-db8eur05olkn2043.outbound.protection.outlook.com [40.92.89.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 691B768AA64 for ; Thu, 30 Sep 2021 16:45:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=grJDJ7TpByPWNEEPB3whwBiMm5KSe/4ZBS3vWJ0AYVepG2JgoFn+kOchecPJiKq2BuEnhLLw+DWpBO9q/DJUcTHrptZqihj/vKMi++ZbMH2u4h0bu2TLggAcLvA1d3yqGi6u8iR1QdRyw0idm+itdXHJ9L6fRtPremHKMTjOeqnS7MWFL19q1/k/v68kdDcIs3iaayZXu8CGJL3V++iwSY0BgFDyJysi6HlZgfS1qwGXdJfteXC5zoH4C4D91FgAMiB82OfWbhMh+vuvCXTZd9N6TU1q3EE0L7MUNYGb+I6k9/7XmUvQ6scuWmJEUiynhhGK8GBgMvaBF0YsUEudgg== 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=L/32PEPCI7iVN+z3B7P5BWcLnzOO4oFvAyuCk5d9Zjc=; b=m+Rx+p2bAxJelrMOHr/xqeGaLoCqcIQ440D6HEfd2a4MZ/y3RX6JXsE4DTFr9Yks6o/m0lAelU08KE0OPnTqlyWjV138UwKJlkWAVLRLMAH1JUG9T8qNACwec9MPa20XdGJ8xVCkW0YrguWGowFXQsMm17JYp7qqunWEUyG+Dg3aMPm+SPBQBaTvX6yX5oQ5/df4N608afVB4x8SMcofoVO4YCyb2+RoyADTO39tNT8pFFGDRmzXJYPKjumCLUMbjCq0O1x5ThwW5HmHmIaqRh1r5F7gGuhgYh98AhGrpOenC1T/Fx+RYgASSRWh+4+ifZJc83mlkVpzuNc9pAnMxA== 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=L/32PEPCI7iVN+z3B7P5BWcLnzOO4oFvAyuCk5d9Zjc=; b=JvYuRPYd7GjVoczbOdZwUci6QW8WkLC+WrDNW8v1zVucfJPUffZd+I0lljWtw8LM73tZVf2FxXDrvT01JHEd7/Xy5wqDrAUbsPyxFKmPJWZktIFojsMfV0UBHEsGcvk2PuRyYotH5uxlRyWwqHRNdv1ifp58oxaJc6TgMOZbe9MuSscWYEfu9iapIISZ0+werQap8oD5oqyURrJHyx420GZ2Iw1dpgXGZAUVbaB2GjzfZEGwhHmuokfHkNoK87TWEm7lF6E3Eo4s8+W/fzZCcHg+0YeY74Z0J/zcMk8rN9YMmmmXRh2MS1i/rUFdXjGTRLV+GRgLwxPkgDXr+Riv9A== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6428.eurprd03.prod.outlook.com (2603:10a6:102:77::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:45:00 +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:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:34 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [uVbVsgXpOKgyMI0kxV/ZzQEfnxWz+3WQ] 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-32-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:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c39fa533-6e16-4b84-2e92-08d984187f4c X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIBqLe59qjkRp21wji/xErRRRFI5QUJRfCRmADtQqez2jmaaTMWLCFELo0CQE4k7Hs0pvEo1OGTd30KUKJK5PSc2oo512KXrWjk7Wt5LhOsHeHO59b3ShFX30UapIHQdKlmQEWTlbwaag4zwPi/WbIKxVrOnZT5hIhemqApFpZUkSbJZA+pGr15+KwRAqbbJNPh/gJMKJwy0rK1EL4bHbIA1A8pWw3n452jYwSm1TjV899o/e0djTcZzQETExq3WPqyocH9EykIBxglygQlErEDFMUmhrSqbUPnqvhnHNetkq4fK6thnPCNIrfgQTF9HrjDl0+dpxkD0N4Kz30rU9UEnLLapksDpMZFGA7Kn00GrSfTla6ZkwjCqPOxLlWoSpdUMRUYayycPvK1YtpDDYIVw6gWtacCEpCVD4W4w2J8beU62Uou2Un1SPtbajHVzM8FVZYU18laMS7I8byaXHmgyQ8FvttpVudQ2CuUzEVExuSRMsbupBcSOran8LFJZ5g7enh10Hx95aSsrX0/rZ6XxRqUGKDzOt/qMdJeeRP5UQdVclwBFNk1KKBPXY+TjyW7nL9JCpJEdPdKKStgach3zNAeoZJMwIWYWsE63XXFQgVQzNNhd+Wv/j3A+moyuwLmGfk7skESq7tCTQuB23ZLHtcuoLXRjVxS2IvAMhtXlNLGQOdy8WGtxEwcFqy29QF9j3Y+MeggPA== X-MS-TrafficTypeDiagnostic: PR3PR03MB6428: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3YSV7LnRcZ3n8ai8Xyn+xlqATWhAsSbZUU6yfdbPugmvOtdnR5Qg0XQ2zw44fiNNmEXrUnqZQyMoBdw9wRwiOjsPakP9ukO1dkFBi8T5Gr6h58CVOM7inv3t8IRmShcypVVP0oxS7vk9QxJAsVdw8jCaNA8jaWMbyURonsIgadys4XLvnEgXph1FkHxTwUOaclx/wsECn2Rvs244q79L2zDSz319I+0+FVrWeaP9eo0cY0PmFqhFxKMihWmgWBYtxAWXEKRaWo2fl7M07rlz65guOXfLey2aeZp8t098KzLXKZ1jHUIR7FMRSfy3UWDNnCxPDSMroMkUEt6lHb1ATaoCxp5JDxq8G4QzNOZBrK+rqdMnBKmSbhrdpWK0qVD1fXe1QfasLcmUbFZMRn0trDJbsNZ68DrI6x8fYTYBRsktlo4g3ZYdLNUgQ2FfO11J X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0QqmMRkxHiHf4Z5oyeCvbToqCF3mVHAIWVgXgDaC2DWAXF41H1EUYm/DHWRUzlRlO8QGhnJOS76RrlZIvM3s3lmSdgop0En1W1S7VQQeADidhnVKRWVZVttJKvr1MvaGPxIhKcpKAneh1AUxw7Y/Kw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c39fa533-6e16-4b84-2e92-08d984187f4c 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:00.2114 (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: PR3PR03MB6428 Subject: [FFmpeg-devel] [PATCH 033/218] avfilter/af_chorus: 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: vRpqCODsqGvO Content-Length: 1434 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_chorus.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/libavfilter/af_chorus.c b/libavfilter/af_chorus.c index cb6de9a85f..68de692c4b 100644 --- a/libavfilter/af_chorus.c +++ b/libavfilter/af_chorus.c @@ -154,22 +154,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -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 config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -363,5 +347,5 @@ const AVFilter ff_af_chorus = { .uninit = uninit, FILTER_INPUTS(chorus_inputs), FILTER_OUTPUTS(chorus_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), }; From patchwork Thu Sep 30 13:39:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30828 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp411847yba; Thu, 30 Sep 2021 06:49:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxClXKftsymSsJ+Y6AFZ3S877OKFzPBMSGr2UoXZquOu0cAtZcJqOz30ewlgK2Fu1RuESrX X-Received: by 2002:a05:6402:484:: with SMTP id k4mr7310900edv.303.1633009780931; Thu, 30 Sep 2021 06:49:40 -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 d12si3385007edx.556.2021.09.30.06.49.40; Thu, 30 Sep 2021 06:49:40 -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=rtCKB3mm; 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 EA9BC68AB00; Thu, 30 Sep 2021 16:45:10 +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-oln040092069102.outbound.protection.outlook.com [40.92.69.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D96C68A852 for ; Thu, 30 Sep 2021 16:45:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Aoze30gz+b+UU79rKLqACVnQI9B85luw8VA1vO7tk1agXbbeCsf6lmNERFw2OVH0D3FwNJU3Q60tfcjVycc/Mz08RW/yj8VFX43ODda1k3gWTuapA7wDnCzJYuwLvlLpT4IPrNvxQtji5d4L9pig/mznkpDlpbVrXYor8fFieFi/Yh9Iw9B3G69zrKQ8Nx+pMkzlCa4sCgyCCE1C5oYdzdIneaPBIM2OL3TGPls6JWTDh6waHSuGbG2yJ1JKeAsPOE/mtPlNpDEpzhHIS7Mz7ypKpw8fk9K7qDIkqI4SNWsh+FTmXPeAyLNMmcjHGdp+aMzT+6BLxEnt2792gMO56g== 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=FP2ngn0/e9p+Rtab/w0LROBFog/ppvM0EyQcEGtlPuQ=; b=MdJNMjZNG4+RkX4vK9jlfvtODlj5033VFN98m0xmsG7nWiEjeHY5QdlKLPieYPtWFAaivTJKABFqDol498JQTEAtAw60x//HSAMgSvuCnlwYTCqCA4lT6BgGovPcjZb4PQ4sSeGFO1WOg0E0KnbC/c+eKUfTmh4oid1nB4U9fQbMjrTF0SPt8ivcCkFUvlJsr+YKSoKbO/QgiDU35gKynwMzBEwCI2x0QtcrqgAMda8NZFXGf8AW+XiSPPekMSoobfZ5dusum8UTUHSIv43ZARYl6l/9F897WXO+1+hwD4+isVTR8XmDfMnTHJZ6GlBOfiTULrkqFf+Viv2O6x0D3Q== 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=FP2ngn0/e9p+Rtab/w0LROBFog/ppvM0EyQcEGtlPuQ=; b=rtCKB3mmmuTiRN0qRMPzQvUJwJEaiyyQgKoBUrey6l2CUnIjxJECOUBXDKUhrIOswWzZr4O/8jn+1G98K/JCmvti4aUW3fjsFggHfJUA9E8rBIdpga/ovH8fneQujMpUlFzlzyvLeA8QbRPsLGygYk7HP4NwdtGiVfO5kGFdKM0IThTuL7uMWZ00z+GzDWU45QylOFy8MzHTUxB4/rs03fd0cjaztSCAtKzFB5yn7z9MrVZ1vKOPQjbKhZ870Igsw2ZicjkKhetvtQPOSEr0ZJQ3fNSx+i2WOISFAQ/e5bY9UzPhNR0bmsPyiTpS+kiSQ5efn9fVv9F6KJpWHRDvrQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:03 +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:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [KPdSpCetaqQ6zRVmcplJDxtafH1or1B4] 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-33-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:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a0a734a0-8b60-4e1f-dcb7-08d984188150 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV5C/IQ+NYWVWKJ8pLytsgGEeEBTL1e6SwUsr2kei3/VbDF6eRbb8agbFzoe/T7O952dVRNurv3id480x8dv0YymVb4Rd9bWDgO/ciP3e4eIi3wuUIxl0l2mcJ8E7remtyOTs3GB5rAm0ZvtvHHyoaz/wvIh3QO0w7VxTnVh1kpreAF3+Dd8axxkvtFvV2/nh4B0KNuNh8Y6CRqk04sepnB413u1iIa1OfgR5lU4mUJRnMAWaQRasWqifyv/G7kcWws+ZfQGwN+Xt0h4fs2dFLiTTdIkSZ2V9E4tOjDy7q7HshdGNohRS9e2q2NW0tNogj4r/BiQlGbLI+ocScbZD63Fc00E8CnHzppAepMWQINHU5ZDC3Mugn2oCgI6GEW5lEO9cgg3z8HcoXrO1uqPyL5ydluv/WHywbGOocHxw+ZidaBwQpbAPAxh1pkiBGvcxHrHCiltNzS3yXHOc0xHPjsnnQXHrNUtVBhjpWNjHMnT6ycjV4nNBV4VjUFiwtVr5kfM+9Z3oltzUdEwwC1WCPBJcUzR5leFh0Bh/7Y8MJVlOv6g/UUMCRpL2rwlItre7Ql/ZMJsNB+AH7QzI2gBUk9uZLnEeDVJtXe+uZfrhZuWMrwrc6V7nke0NzlFK2WQCCrFq9W2FqNcpxD5ftl6fwKMP+HSeDYrJDS6cS2CHHr69vSfqKyQsf5Y= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1PUXkDldFaXFU+/bC79JbWrw/ASSulL0yF5lJ+r/mDFX9TiYN2bSWYtY6pbuBkptW7nTGyu82ePPuuLz5a4AFjKjToJ69cfWCLQ3MBcbm4XgOh7hs8flQkR1SZJrFz3lBkG6g9Uejow1dc1S6hsXHkkJb+lFoWQfxD3b7kuS9D0aA8SjQR42TkK7do+UozJIlSQR4+Q2ab9uFAedwMn8V+I+Dd+YXq50dNJMFEh2WK3ClAtqC7Z1jNerIaSru7U2JmpzaMNYHlwj5wNTcsInPld8ihrgqcKCiwcPoRUrHchUeWfPSi3iwtaYSckr/WaQKHw17rWoEQ6MDXwoZ9r532/ym39ZKvZycc5MZx3cl6QOZjtlM3JhxDiVq4YoSXO/md8W6KZjDWtVHglfzpMJxevskvDkbCzPjmQIeWoXJK+mFqc1Kb7tVLE/rJQgZUOc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e3XH8LRmj9tgevlTAI/lpNdMgDXP4khiqIqaT/oi7PLtA+rQqVh6YmxvwY/JvmOLaMDJF6Z5OkOdLdVkALIaxRUf2eAJKfSGsPehTwwdDwZfOxX3mPAT6af2RgZcp8edx5XcpSXpELD6BMxvNFskuQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0a734a0-8b60-4e1f-dcb7-08d984188150 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:03.5846 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 034/218] avfilter/af_compand: 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: lum+v4MG7m7o Content-Length: 1457 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_compand.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c index 6eb68dfa19..2f8a580279 100644 --- a/libavfilter/af_compand.c +++ b/libavfilter/af_compand.c @@ -100,23 +100,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_frame_free(&s->delay_frame); } -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 void count_items(char *item_str, int *nb_items) { char *p; @@ -580,5 +563,5 @@ const AVFilter ff_af_compand = { .uninit = uninit, FILTER_INPUTS(compand_inputs), FILTER_OUTPUTS(compand_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), }; From patchwork Thu Sep 30 13:39:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30833 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp412008yba; Thu, 30 Sep 2021 06:49:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+50Q9PlQ6nfRf7TTqtm55TQUPYMSfZGLonXfoj0Lh7ZLXBeoGsnGYs0K0p3msgjBGuDPx X-Received: by 2002:a50:d94f:: with SMTP id u15mr7111798edj.140.1633009792936; Thu, 30 Sep 2021 06:49:52 -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 p23si4148734edw.135.2021.09.30.06.49.52; Thu, 30 Sep 2021 06:49:52 -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=dzP4o1D5; 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 0BDD068AB49; Thu, 30 Sep 2021 16:45:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064078.outbound.protection.outlook.com [40.92.64.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B700768A852 for ; Thu, 30 Sep 2021 16:45:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O5omKX66PmHiFy5XWTWC4+umBjcNvZ15JgIWJVUqmTu9lqnEsQKKmvJ5FkWD9OIMQTAs6gF33QrOiar5HC0f+06abDJPtRqMo64464TonSNxQNKn/jS0cGzcmzGRsKkf6m6m/PQrNdvmV3YZdBxbjjrZb2WHX+Ft+taAS0fiJu+BZAS4Bz4lkfezwBl8QfUcXcx+9bHLQRkahKL4WlWjOmViuy36Vd81E6t5vbuSe9lr1n1RvZqacsL0CoXIsrhaKA1sgGMePVpZ1ZhUA1o+1MKOOsHyD99fFaDUOQ8tNX3V3tHSmAEy1owlCLE5voJQOqzWoMXAMR0I1mUulBfA6A== 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=8Xclg96DtTomCrIJ01L6SnvygpX/12Gh6GS6M1J1Aso=; b=FgS6i+0QUbjoy7G/M8/c/gaq+ii0Kexk8NgpLOkYog4ocphC3UcCXXmMbY3A4D821bZ/LW/lzlBtjbkrKjaw1IjRdzLFHwqiJv5a0YLjhSgfrTHUDisu+tcrqX0CpXZMsgTh8cVc6KKUlgETA3yKJ3kf7GW6ExkTsgbgwoGRs4FdBtZRlkK2vgIgA5gaMEkJhzkoi5aWy4bl/Wl8SHg1qMSNi4xZfT8E6fv9qVsp1j67GNyS6vRC730p7j+8ajHHZ86CKBm0im8kCHkCYhvYKXq/EhR4G5CMjKBVvrxdWthpTpd3qzUzIVLXsO94kIauMbvvAUtL1XFi9wTCuGueLQ== 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=8Xclg96DtTomCrIJ01L6SnvygpX/12Gh6GS6M1J1Aso=; b=dzP4o1D5p9zbpNsex6z73gOjoeT/vsoMLaW/R8BSPLh3FEXmopzZtK//po1Yy/0mjKICGtX6Ekq573vgrbQWxT078HgreAeENo49ATRNEaJC5tHFa2h7lFfXGwJqIIe+mNDkkz+fjmlTubWpyrZvp7UckDrhFhMmi9YnfIoBsIZ2xIXbzGVkLnMxcXvwbZGHBfarAU70CXoRCKh2l8XQrMRITp2ckuIxnam+nhXRt7RmeN607J5Urt6ncxt2BZr8BFnu3IbtFQmOae6K7E5DKJb6g0drWhIGFHYR69nZ8XSQRTGHf8aIcvb4u8qj1nWlivqRkSjgtNq3AKV4lt5JKw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:12 +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:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:36 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [2be27NX5niJA7tNeya2Dsvuuedsfn2Ld] 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-34-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:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 037659c5-df83-408b-ce2b-08d98418866d X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIBqLe59qjkRp21wji/xErRfEb04gImo6EHnhm9++MrMVFFCNfyqr3N6iw3ByRqnnD6BLDYqmyLgrSa8mFes/mR1GEVkdMWwBVEo9jzVr13HkPLwYXh/aFk9be2Vuh3iaT1jjXxTJtzr29y7wRXFteLaPmtJJ86Nw+LNsVV86zB/YN2C3x9NrM9lQWjgpnZ35HzRFba43sMgnKcuXJUURBVeWrcKATLa99G2RugMRNQUt3rI9UhtdBoIcKT6srR1Ga3/e78JKoAylk31HRUNH+e9n2FCw06szrVrzzbYprUr16lYNlGTf5sqIXBbgyxIrf9BVgsdzgBfv1Uh6wqvG1aRc/KTxyFb58eiXquEJSw8ef0Ry4OkYfr3rk1mxEZTv9uUGhNNtZy6BfdirXGER70tJUrGjnDJBhNzbDh9t6GXYqEPWGpY+9Kh7p6b/PKmKnlRFLmPuXFA3ir1SNvZiDYFPOfLuL9G7VnHnWUVAGwL3fGnMGdzQHXUNASn7E/voATeK4aeyEnm10Yo+qouzcUrs/TlB6XGMjxb0ovkKeWqAVL8yg/f7oaW0mAdxsKPXrIXLymrSYA47qNYmdv3ZezReXMgHGu2PTZ4IF9Sn38TAMDwLJuL1eRPDhgQyUDIAe2AEy7VwGaiQBDq1R/3xpOz0iWd0MBUz8N2yBOJlk6injQS4W+nX0fwJv6dTAoEihfiwdOjmbsUQ== X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QWoGYIGag9PIb6QXCPJC6NuI6ZjYL0/eTxSS+/KgW/1TNR028DiYGoEdfmPG/07I1XkiARVdTL6JdOS/6O8wUe0KcRpxzEuHkvJjOnFQ8nv6vxEcy3B6TA2EOnAH5SthnUbuohwwBvOyHKUFegEE13/BfGxUgweLZV6Fxl352HcUIQCquWa3mp3u6/LMfCCkjUscXna9ljHn7VMWXnPScjDqQ+sev26xh2K1W+2g/wcmCnQOqmFP+R3q5+g8aiopuUmcsd5YcaRdoJ0XF+xUNPguZXt0t2d5b/IV8BgtKb2dswUsPgvCZasZRy6BnH3y6OgtK/dPEhgZMFmCvvg4l3/uTSS4iv5PGfdGvvJR5VmEA0gPF2kDZ1JEzGLoJzCJ3AE2t/DmI7AN2sTy8AnwpqZDVWsxxkDoG4YK/wQoHHYuJNhfJ9SPl/4q/TupSqF1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PkDcPiSzSqoMLIE3BAJM5c3IdjncaGLqhW44WC6P+4bTMbXe3Fd6dDiC4oUi3MFB+G6VOzVH+yET+khLOHDVxA1VNW5h4S34qD5Tfy3VpF5KWx7cKMCP+tzKIFtvgT50e4i4T6K774HQ9HUY1prYLg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 037659c5-df83-408b-ce2b-08d98418866d 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:12.2654 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 035/218] avfilter/af_compensationdelay: Store format in filter, remove query func 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: wM2DBsg9EYPS Content-Length: 1662 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_compensationdelay.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_compensationdelay.c b/libavfilter/af_compensationdelay.c index ff6f640370..6a58fd21bd 100644 --- a/libavfilter/af_compensationdelay.c +++ b/libavfilter/af_compensationdelay.c @@ -63,23 +63,6 @@ AVFILTER_DEFINE_CLASS(compensationdelay); // The maximum delay may be reached by this filter #define COMP_DELAY_MAX_DELAY (COMP_DELAY_MAX_DISTANCE * COMP_DELAY_SOUND_FRONT_DELAY(50)) -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 int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -179,5 +162,5 @@ const AVFilter ff_af_compensationdelay = { .uninit = uninit, FILTER_INPUTS(compensationdelay_inputs), FILTER_OUTPUTS(compensationdelay_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), }; From patchwork Thu Sep 30 13:39:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30727 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp689908iob; Thu, 30 Sep 2021 06:50:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxi9K+D5Jzw5KrU8CbzSozOADNOPlKSRXvJAFTSvzWp+Nr2ST76pQaCWoIvKpAvHi6SjGhN X-Received: by 2002:a17:906:4892:: with SMTP id v18mr6910514ejq.145.1633009804125; Thu, 30 Sep 2021 06:50:04 -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 lx25si3470224ejb.159.2021.09.30.06.50.03; Thu, 30 Sep 2021 06:50:04 -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=G+1VHLnY; 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 A5EEC68AB9C; Thu, 30 Sep 2021 16:45:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064037.outbound.protection.outlook.com [40.92.64.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 789F368A9ED for ; Thu, 30 Sep 2021 16:45:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Opcex/szPUk5FKS/R1ksZCBcb+QrnTrp9HBjLQRn5d1Yccxoii8MjWe7duIq2t9GXLNJo7IV+DJsMVOAA/9qIHvVn0Rff58R1LVvZQe8ZU5XEsUiSdua7i/l7YaAULDNsvZjxH8GTqc3LK4Bmfia8pRMH8zTSns2SKbf8M/k8zpoM7e5XuBoLvxWrdmoVWCLlSPn3ur1oFwmKcQ49uW3SBWBKgwyCk3X/s3rpj7sR/zcgP23TUsvMLll9wYhC8g/U+beJzz5O8KLBjpxUMjtyKdGiy5tlhQe4dkZ5guyLUCicXfDv7klY/TSp3/8gL/e6PX5h966RM8oyHhig7b6DQ== 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=dN25W/GfLEN9cNXs0xQhQGtcW1EXJqPzh+0Bds4Ofqw=; b=a+VpzJDYr4oIVfKdnHS5CqgmZh/liIBgRCokB5UngSNeghgMo0jS7o3u8hr99RIavaFIXiM/+H4X7hd+EW9+TeDE1RML+v1JQIpzKFtxCUdWujkbRJbCAJzBHKp2kmi+Y1RAn1x/44Z3g00nj6xKdhRa5ABv4eJI2FagTWYAvvY8Uoe7fkKWJAHbAYRSnc+t3FNP86LQsoGjlYbu/8Ci1PxR2nesVt62d7tlypUfUigOo68KzIDIgaXNrOsioaibaDkkKLCejlyV02dWSg5918KXEE8BkgVarrpxAGshf4yRL7od+oDpqu1Miq0InS/SVWUEuvIWqyqta0GsM+FxAw== 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=dN25W/GfLEN9cNXs0xQhQGtcW1EXJqPzh+0Bds4Ofqw=; b=G+1VHLnYR67bb5RExbKZuoENl4LnrGjZFaZCJai7ZGBoc8vLHe4p1uSR2hV4IEXHfKklcDeWi9FwMvU12nX7cd5GNP9/DnsZM9dXeBLKs/hHMK95A8caAspx9ZjM7rreTfGCuiXPQQswzdF33JKkayloLo9pxZsPreHifec9s+uYipGCdANoyQMqB992yWg5Hy8Mkx5FkCJm/L78nDfs7XwCskuld57yIFTnTV3iFd224eGtoVZrZHXFTZbYX2MRlzfoBNfXYYa2N5u8s3NkmJ+NFAk9W+PR/FoKcTm3OoZUrweJq66GJ5bEhn/HZOLqtJx5FpZFGB7LBGynUvc48A== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:15 +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:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:37 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [lt47ArjIzOOrx8DnuCcLmNJYFX1OMi4K] 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-35-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:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9bc455a1-1153-43df-7a26-08d984188836 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FMx0hqN9ZiZz1d2/QTEKSEy/N8Yn+TSbpGjf/bC96DVdjSwUSzdzSt2apT8tU86wG/gnLogRdyrJbOdwKAj/UrJjZoDbv6JiAJ08Q6GAK0ts0kwV7wxSZHBBzxCGYlNM2a5PU2CFiYfkRi9qVojW9rP/3HSeZEDijbI9DSNKojhhQ5qIzi6HhSxB2eOQ/XFvr37sL9pkSL+RYFT9Au01jR1GdqESCb5Scd24T9qBzkrU3kNP3htcRlOyzvy+/eQhPt6py5qglbP8MAL3hoYMcNvKPG/RUYZWubpHAD7Fxyfeqe89UiuTqKoHFX8L/9TdH+uiiue/ezH7VvUNM7wWOsqsJB99hxZ9+sAlMBPR9cWxgGdtzUb88I/YICTZMdNKCFW2P3W9scEO+4XCVRlfm97ime7PQUYeVHr9ysQPu3fHT02CfA7Ijr/NZmJrs+mla7qusrxYCingFYXKloLszHdMlnXGaQ+denWZzu+kcDgkMLoJBnShQ9zmdOiW2bxDGWJ3SAq/dJ4YKH3Bw/JbuXy9RyXiXWcKK+VmtWjZJ3g309dsvnOFW1VZ4R6bmtigWdfJc64+wYDCTi5lp3vji+aE2slHaAfw9TsSGgnM+kAwHTK6kSBuInlj7w7/EafKBnB6OwaOjxoW/IXyW3T3JW/wEBOf/3Diwal0+ZNtNHE41WtfYojuiMw= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +G5lsKH/JVvyNRDF/t9YFP7+0UT9Cclfb6rrf1WX2JReIEWIcsdqcdRhQZ+8Lr/xisJQJvktwJmXZch7aCP+TNU39eBYStDK1Cko2/JNjYimQ7GDO4bna1xtw0/QTiVzaSPHS+sWz6DP55C3UCOeD74kW76Gen2oDWavUN8RRG+QxXm1yVviXwn+91BQg4Lo7cNujcPDrR7cdbG4huC7KHbWjl0Tk+BcXH67aNvQ0nodM0Z2riPOhcwreRYrIvOjI/+VOvyA1hIVxL5ujPsa18LPd5dcN/3XbUSI28JxMTapLRrmZBkXG62Xvl18NJL8pJt9mwAu6x2HOT8ReL4cmk6G5afLPaRQpLfWkG1ai4EVtAI0G7ps6Jadc7fGsrPlE9KGYUUkLRGy5rJCUM+++2EJwSgy58agFf4wCG5RtarlYvk5hsf1TRhcwxD5QOK6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gpoU2hM9aTQ6Wt/yTQqx2050dAEXdNjO9NZrIHFQzeEw/WslpoJbfTc/EA7eke8ng2exnRVtsvs7wdRBiJMy65sw/geSqMykSTX+orF9TIV/s2ydxuveHXkhqLcKpSfvxdMYqUugsWeoY1j4T5x2gw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9bc455a1-1153-43df-7a26-08d984188836 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:15.1587 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 036/218] avfilter/af_crystalizer: 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: HQXsSOpdB0xY Signed-off-by: Andreas Rheinhardt --- libavfilter/af_crystalizer.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/libavfilter/af_crystalizer.c b/libavfilter/af_crystalizer.c index 9e1a4ef9d2..8d967fd629 100644 --- a/libavfilter/af_crystalizer.c +++ b/libavfilter/af_crystalizer.c @@ -43,24 +43,6 @@ static const AVOption crystalizer_options[] = { AVFILTER_DEFINE_CLASS(crystalizer); -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 = ff_set_common_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - typedef struct ThreadData { void **d; void **p; @@ -384,7 +366,8 @@ const AVFilter ff_af_crystalizer = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(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_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, From patchwork Thu Sep 30 13:39:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30726 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp690076iob; Thu, 30 Sep 2021 06:50:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy506s7M4AQElscN6jtAnh+N0CiXuPXmkWrqDQlluuwIdH8ygHc4FKxKJWIHAlv7WBnNq2u X-Received: by 2002:a17:906:700f:: with SMTP id n15mr6706966ejj.319.1633009816146; Thu, 30 Sep 2021 06:50:16 -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 m1si4162806ejj.616.2021.09.30.06.50.15; Thu, 30 Sep 2021 06:50:16 -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=KTSi95qP; 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 97EBF68ABD1; Thu, 30 Sep 2021 16:45:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064040.outbound.protection.outlook.com [40.92.64.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D519368A3A8 for ; Thu, 30 Sep 2021 16:45:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=clxMK6g98cLNFDfPgL+7QNQFONd2V45LdyCgWc8efSK0Tjy8vcAe0x21KK9+HPVpEQcU41Oue5fNpbaHx9R888bqGNqACEOs/5URUtFI9wqNXeoxO/TEbeQRr66Z8dbKOIkcR/cnUdd0Vi/qi2rm8IZ+Xy4my1J3KBjSyoLsz5v65KG0UQeSxxvY0NPYMe4qP7JGwWqiNn0adzMnMoBgxY59EVzwv2ivKf/pKlhHkFS3AD1tLJnBABnQSHsV/1GfyfyT87u7rrkY5LaFwLSm3YzgRlGHeaUXdP6Zirw/yDkfPBvLVKkNMdB8jlblVfezgIHuNr3q/c9VQ1abZcrNTQ== 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=ud1AxZ8x7bEDcYdsfuNlYVJF0a2I+OvXmRm98b4BPm4=; b=YLs/boet9yMGoCCIrO0gcrI4xdBHPXjemPXmZZX8ufP8QhDPtnubuE19A9MrRh7QvJV0et1QH4tn7CtNnUsLRzVSbOs1U4BLHCgvMk6F/n+gqxnGEDMV2eMLO6cfyJLhaFqYdovlL677/oLut/zaCz/QOvI1vp0gmz/BGuYK+L4lnhodTPqmwRrdS3KGiGqGmFhiNOcMFUHpGIENLKSXqJ0LdK8CsasShRUZq3CJLy4CWYK005eF9qxauW4GeqcqGhY3Y3CRVSaDfu289sYxR2FZ30HM7aSSCPnyc/X1Mj233Koznar11fFor3Ps8Hgnc3TnOKTDvir07L4TKTF/Lg== 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=ud1AxZ8x7bEDcYdsfuNlYVJF0a2I+OvXmRm98b4BPm4=; b=KTSi95qP7hI4FgelGjml2oBYuD0MEivQNIIow9tzeGHf0GIOXI6JIUsfZnLhZOqs6b82s9mnJ+n+sfoGGFB3N/5SWL6kbkE5jsgV9kuYUm1YHvvmVd+tbQSwB2fuqxwYq1a4jd+/ARbLzZFQU1lfMTUQBF8wlEnWIHEl/3dPhGkIED4AQ4sX1492rkfCv3/5CrjBzdZlz+a19u+a8SAW2wjrwueDNN5U2Jn8wZPX06+e4or3H6dUH2oopP6pXYFPx4mw9FhH2epBmvYCDyZvfshqB89DAF1X92rqHhQhgv2ygFAotHo1kDkcnh0bWN4Oc8scMDfzYBenx9z7CCtlfA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:18 +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:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [qaxIpQzeciCckfmW8SPCIqTb3hC28qyA] 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-36-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:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f5b619f-eda6-4d32-f2cc-08d984188a0e X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV3q/dY6tK3E9jIVEiLj7g8FdohAvguSixp/XY85jt47XIOzbLquNFNnbhCUca7yry49hSHRWWQWuP6KthppRkOLMhEYXbqBejUGi2ik6daTtDaj590I1gq/1jjJl3TqyUKS53U/zYNSAjCW6KZAx8GcCEduuEIfVr4pgKlJgiotMdTtOBsFE3T6CqTNCK0It2AomX/0sGbizJyvceo0wPpJ32XfYsyWWg2o3M1S55/9i727vq7bfPOhejYLbLHvkHdR5zlf7ZLfZqWHY/+Pp00474aa316lvaWP6gaColqHqDSwja6zUTptY1NLZyNDcK3uPT9TXUWkHLWDel1oMuPAsT8FgkUGeB3MA0VuK5TKl4XqJeGdmhzEtND0CXdZo2vYxkd5LORQ44y3nAhbIv4WL7gIc43Z0iojW5Ijw6teBbxxPSRoMdpoErBiPYYLayth7mlk7IuYg0wULyRgrzXf/zgdGdXeU4nIAF1Hl9PqpY7YenHjCWXFvXXKru8Gwnk1RlFSQpPDC2pYNxSW2dJRB1QqNKDcic5Dphw1eXpl3nCYJQkvpXxcvonoaSwXrRk7pFgA1GpKsF2+ljMabolUFnHP0v7RShhef9O7UxHQDUJ6aUL2/Pje2sOW2QqYltQUhZgGRFCR/gw5/75sBNPJTF/f4J6cAcx7a3S7MfwRH27KS0CTg/SE= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Af2PmK/UDUA7zbAHKaHFqUsJ8FRpHqXIYz7bRrIKAwjDqjaIp11MdjyAvJof8IueV/VLnNDAC8XPcOCO4dcwAhnHAcSMQzvqB7P/uFFtcVvneSLHyGOuWJVSyV4hPiENyxqaHBVVYX+uVnDJlHGYwQSUB6IKgPr2vJGeW1l1j3v4rUfk7M6gQVqWqlqRNJX137guqdz/Q4DbrwXgo0HN3gkuSQ6JwHRnd8F/zto64OTEyMw91czGr/qJTXQUt6bQgGd5xawut6gZNYY3uKO95FYE+OGRTjUSDEmkHUfjlK5U6E+t21f3nJBGT6L4ZOgY7WUbiTLXmxPQyH+E8ZQaS7X2wjaTL5mWxVkGGX2y8WPsCCvPRe6vNbHoo36Wm2ZlfVOJcuXc6d7iCoGIP0BGrTnCdWKmxowBreWJdrRZ2tOCycKjzL1CJIeVrSaq2tXz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fBMtZ/2TK5cuNdXsq71PgQWk/efACHsqtT81W6b+eteW//sgzia1LtTYfQgWnqcVcg9ccVleONsNRNXaUnJp6RvH1dZrejFzFQXiGbboaZBdouDZEaNGfss9YtbZGQTFkGh/3f4OMp0Sk8q8gmX+3w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f5b619f-eda6-4d32-f2cc-08d984188a0e 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:18.2541 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 037/218] avfilter/af_dcshift: 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: w0gqygDolz5D Signed-off-by: Andreas Rheinhardt --- libavfilter/af_dcshift.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/libavfilter/af_dcshift.c b/libavfilter/af_dcshift.c index 80f2600e7a..da7c16550a 100644 --- a/libavfilter/af_dcshift.c +++ b/libavfilter/af_dcshift.c @@ -52,22 +52,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_S32P, 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; @@ -153,6 +137,6 @@ const AVFilter ff_af_dcshift = { .init = init, FILTER_INPUTS(dcshift_inputs), FILTER_OUTPUTS(dcshift_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_S32P), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; From patchwork Thu Sep 30 13:39:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30741 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp690214iob; Thu, 30 Sep 2021 06:50:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFlXn3VSEN8aSPSCKXY713hgc+Dw5BjXk+QaKhPK0ZhtEF6Rg4Y4N1++IMtUjJXS0ERoxq X-Received: by 2002:a17:906:2691:: with SMTP id t17mr6733753ejc.522.1633009828033; Thu, 30 Sep 2021 06:50:28 -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 o9si3668734ejb.684.2021.09.30.06.50.27; Thu, 30 Sep 2021 06:50:28 -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=jGT9DixU; 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 BB84068AC00; Thu, 30 Sep 2021 16:45:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064105.outbound.protection.outlook.com [40.92.64.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D1ED68A3A8 for ; Thu, 30 Sep 2021 16:45:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G0RXdm0lWO2yPZfeEzi6frv6Qcak7xuSQCjXKZ7bG1hXfTsx287IoPjM0rRgzzfxtp18XbOzYxru7a1g089PAqDTHJ2V4j0zm9Kl6u7/QOSPu4frVcW1RJVnMQq2My/7iWiqvI9kpWcwhL5IgtK5sho4FKuemj1miTb3MMGPnqBcNkIBX7awC6Rhdk5i1IXuHpY2DPU3dYwMFqUwxmV9oM7PS5ygHjGrbj5LkK/9uZNSU4vNZbV6AZnADA6N1nhfILm+Zc8VART5oKc0qloNPPjmZapgs/beH6YMU9ak4l6Q10xf/rbr/0++JWrx1U5FNlJN+Vvi3K6ugErMyZOOCA== 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=n1enjqGrM7z/A3tfjUgqR6snVCuGOt7ML39Mos4hQnQ=; b=oUlos5YFul4iyf7hMzrlVKTEEXtR5Hs6Klq6AUj3wniEKhNEl6YysrfmpQpIU2aQZmDbjnmo/8TiiejjaGl9K9st0+sD5t+FtEcpM+auiKDffw4BW7D4vFoD6vIjQIcJrv3LKP2DLP6aYi/bOaiHN+TPEI89/SgR5TSN/lXWB9VcrmByakN7SKh8x2g+YkF+2x9ukDurjsbtbjcz8PAvL33roouPYAZJZ1TAjKBbFukq8H4RpujJqUfmdX6OXNSB0lRdfAOtrirAYHKTVOAKR8I8VfDSSDpROoux5hyS50vhr//TVv6EAfoScukWsgJ/amvbJlD0JOWBqVXt3n47eg== 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=n1enjqGrM7z/A3tfjUgqR6snVCuGOt7ML39Mos4hQnQ=; b=jGT9DixUaydPeEkOF77kR7jjc34Mcu3ZLVehcaiogjMW+azs63YFLC4uDSHG6hkxkzrg8Q8CsqavIfmeMrVMWQMHIIbvUVXY2ujdmC+vRiN+9V1INTHEfPqUZmjrrAMCtFV0o4VIoeuoC3QUtYfiNjMk8c58MVdJSKhmynTxLtW+hb2w4zta7aL0XAbn1UYspzP5j+66GK/iPeVPUzKosEOKd9tMbAZTVo45dRVhQgD8V/JoHmp7jKDSXjNL0CdFZGPVV0x93RBBBcuX8ivBMOS2cPtqMWxwz5BqrMm19clqTG6DWPLCVzv2pDbpkug3FLpDLeBE6fjIkJt5kCYuGg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:21 +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:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:39 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [mczo5W3NtgjVBOsrQ+yk8qvWU4uKBdqa] 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-37-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:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7964a106-e0ba-40ea-a6dc-08d984188baa X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV+LMfI5uGNxryu+keaf06qt4TebspuBT1vKeSH4qBf3qaGlhSEnuB3sLRtAap7G284ne8QWceFZ97Dz/VTVAINe7JgFq6fPlsNppFKOiCAz6E11Bgxrm6jgXFcYg4oy2uGZO9Hx9RvMQ0U4Em2NLhihlexCX6OzBFglFUY4GXiTaoel7riMdhNJaWm5QECpeWuq9mR0SxstFs2Jn3Tu/SEMimRMi/OB0MFJ9K5efuTMDm7esJdWugL9w/jhd9OE0nnv0H5fVf3GKvEObKOX1QuAfJXo0t8whVJb2QH+rFYTZISOypZO6k4Y8JsCzAoqRSBAPorls3o9LfgIPTyfL+mNllZNfqqBguwsgKhvZjmBGkyhsN/cyF/wJvh8MgliwEPAf/dA3rj23+EZZFRJT2XLFEVg1rsZjaJ0ferrCpxNfF0Kd52iKx49l3cVhFfSSkUyKsNxBDJXtLtlfP/JFk2Woo9EDIBJSUnMQxZOdSfQzUCKa/0Rk8Fcgntcp9pdYiWl0U1WH61xbmeI9/6vmN99lyJjsZ9J8WIdZDpQSxgLTmSbgffHeJWzLPmCWoHPSRu43Sod3c/5rbN9InN7J/rI8jmfLcYIy9EbFE2ZB/6bYQLx9iBVGi5/NmuCzipoMLfCJ9vCq/G+BnrO6Za7GbA8cV0LxNF8ZtT3xR7G2BiGyvrNEi5TIhFA= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Cj0ssUSCMYyBWFZjQqoFadwTiIWIwmBehF1iIM+qifu4oYlIxr2ilKZUu61nGYaBiFaBVA8NiZBqdAymYGwctzehUvm4H6i3vHmNFnPwRdxf5jEfTZIvye490XrDHwPjT4sExfteNh7o9aP2oiF/vKvYbnfqrTR1ynsxGBWzENn0wM39MecHcI4jdP9/icLusi5FIcLGX/6pO2a/frYTYWjfnc3WYd3D/pnUAG8wZqY+bEas2zyCdiF/gW9ww9bfm/Sw08GxCJu118nUw2vxw53rBfXfdksVjpirV8kjxW9pVYcDn2VtqxXAJpb8WrCVEKrkr8nBR1lZWlWZi5tpkDSFPPTEOz7mY3AbhZy6N9wKQhIT/5x5mnhmXhnWSdKzoM617zKmQ/rn2dWuUVR860Qm9MaufWDnxU+lA0nBQK+usfHV9UJjQmfLw6BZLpHC X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QfckbOUCwoR1pPA72VTJtXnVyCKSkAnk6M1U7dvzBWBiIO8enx7aO4RS+cYzBQLmtyIGIzenPcWFLVskI08xOZotUm39EbZAYzlzi72mFn28H0pIdccW29GcnqmkU0igBoOkVUShvErLJQ33eJqx2w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7964a106-e0ba-40ea-a6dc-08d984188baa 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:20.9074 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 038/218] avfilter/af_deesser: 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: tindaQ6EbVf8 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_deesser.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_deesser.c b/libavfilter/af_deesser.c index a5cc0e63ed..1093e242d7 100644 --- a/libavfilter/af_deesser.c +++ b/libavfilter/af_deesser.c @@ -68,23 +68,6 @@ static const AVOption deesser_options[] = { AVFILTER_DEFINE_CLASS(deesser); -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_formats_from_list(ctx, sample_fmts); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -225,6 +208,6 @@ const AVFilter ff_af_deesser = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; From patchwork Thu Sep 30 13:39:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30755 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp690375iob; Thu, 30 Sep 2021 06:50:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyiBqujIOZ5E90crDWUguBnUZaEysmkNWQu8fCgCOUcMUHJwuZPtKSnJl6RCBPUIHIG7ar X-Received: by 2002:a17:906:3281:: with SMTP id 1mr6730446ejw.167.1633009839741; Thu, 30 Sep 2021 06:50:39 -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 q15si2791184edc.177.2021.09.30.06.50.38; Thu, 30 Sep 2021 06:50:39 -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=TfFS9nar; 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 E756B68A8D3; Thu, 30 Sep 2021 16:45:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064105.outbound.protection.outlook.com [40.92.64.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C7A768A3A8 for ; Thu, 30 Sep 2021 16:45:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LJqgWulF5CQzYxSqOaWhny7pdVcDP90vKfp1Fi+CCSh8yC/KR+wBxxCtGxKdK118ZJLG+pjQWjWAM4DeMtwyvoRKq9qzjtJmlmjJgtuvvklhAn2T+qfnfnnVISfkQW+zu9YBdeE6jBwEFIYaFYuSfi5F9xgkRGlcU883mChxhssETEvhRO2Br0E0fyFmYngQ539qoV9zY0V/q5xjoGwraG3gvQRgcpkOta9Cm4snRejS0Q9L1UpqkWrOfD918/PjMoxI/tC+vSZkoFGTG7zwh+EvqQiRHq9dlJoE08FZoyynjfPbcNOjmrgI5cR3+EnpJt1Oe4SpE2RpyM4iESlFJg== 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=dHoaE3BBHYmF+nepb9L74qcXZ9x9ASAS/3GYb2yPhvk=; b=cSdfhC+fLJGC+LLOGMumnEV1mk3JU9m+f3x9Yj+XiEI0Rard8x0Iq7C/d+5RnVme5w8+3tV88V2vFHqRimadLtbMeoHO9lIDcc6PJr4oswY5cLX2gdK2iZyoipwxHCaWkZnMqOt6/dhqJdCZv65IvfeSt1vQA3oiHvNDgcoTHoomsXd69AknnN5ttzEavkf5lPPM2rju5bKjyOnCVoB7hxytweio1keJhm3L+0NHx0N+h6U/+r5Ynt4HiAubyDqkqKZpJUutr/7SAaZxQUIEzoaeOxfEKA8QNi91mcKi/mUYtHBGcBFSHMcEhPHXx/jEpQfL9ABsOtg8x8YtJXOjAA== 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=dHoaE3BBHYmF+nepb9L74qcXZ9x9ASAS/3GYb2yPhvk=; b=TfFS9narM8twfs08xYIVkxgOcKCe/wN0/txF9BLf7KTxnPlK54KKMLLiT8rHcFbHngXbABnYA8Dy4QxFj8XdRw+wJUlpKaxzLh3XvORRhJna6qB3etGPmuwAST0gdbxQuLLzN9p2Um1eNf/Gvln07mmMn13cD3KFKg7dZAzKF6P1IvEIzESKC7lG7Q4tRKp0b6yNQPfdFIKqUPA3GQUX/kBRXUiQieDdp9OOTpvccIHwHuISm1UFZ8pYmZsWA8Kgz0JCMdKdFx6xeMzOdvyfC74WLqWdOQJLpjkv1rRM74KR0YiyRLBfF4tJc3lR36B79K00tciiYpfMxJ0tDVmX8g== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:40 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [lLw2sAwKmsgEIZOu7cyVHZZLBTVJrESx] 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-38-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:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 13ee65a3-8625-4903-592f-08d984188d16 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FKCJ+SD65a2p9xIB6DE0/00LNJd+FeyQNQc4anJTBQA2oUJzjbZauDfkGIXQrVH/CZ9qmJ38Kj5X2oaewsT9pA1dMul8JKPG3Um4ZpLrU8xdpAhxlJbl6ziDc/1DEZQN4QbFTGEouNM8nSeWSP3fAY0ybOnWmOyKrQqULqb5OLDTzlvSUeG9SjpAVXfQ1Q9/Q+EzX+pqJZdL2pAIG0IBpYsGN9NZj1L/G7eM9dzu611wUtVcQfj/6uywO3wPojnRO/irlBbvDsrs3rSdZJC2UAywCbRmy8a2L17EFSCho5NcvTPLfNQIV+ySFdpF8nM70fdUyG0cjxWSRgxcbR3HkuH7Nk7LFjHqRkWsnxDPQZVu8pSFzVudoHy9/UPNY84g1d8BYF15uM7XLjIlCYY4Qdyg4cnEqxdNRZT9haubzUv9lqnkSQbhlTu7SxIbonZ5/Z+vlMWVtU2Y8rZAAkrrsK/WP+iVc9JuxAyKzadHzyvR3J7aTvs8pq7c0BEjVPWaeIYY+J0S3gJB3pCxdNx6dagaffrd1io/wvO9x6H2JxVpF6g1FcMz+BlsBqMYjZQE7I43y5LMeN/PosTTIwyJHtnb9iHcKbW/QfmCxRpVy9lv2ERLR5Z94TapqEMFowcHSh6nmtB2KIswUvjSdBslWqp2e2Q2TqChjG6x97iVoM7uSorFttu2inI= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4veA7jJGHv6Sqgd9drCbuenwnnZS7BHbSyLhmot8xzZfJiCi1vRn14dTz+pG4wz2IEIxV5v9hJkYdGay1QT1sPW2o7756fhi9RAxDtr7uK+DHxgBNK5Kb0zSEHjiOm4j3SxDRDC9LcwjP3DQ7URAmaaMKQVN9a7+jIGqT1Ug4oi6w6XQg9NjpYwXag2lBGNPDcpv3PofPUSJUJJsttgcwRHCe9do6tKmlIzN3xQ6hj6JVfceCRpGW9f8FXyLiPe5AEjwWe6r5yXjrGiMsFSd+h8j+xtyYi6+zl+vdc/59uCfTbQ5dOENJ90dRodkM/NoP+WapS1kyPM4FsSOsmz6qwPtrEQzOSSIFM+m2E1/KKCNikhxpe+EbQ8a53XpOkzMNok9NFyNRd4YZF1f9bq5kuJc7bYuAuMe5fjVYkBYfYtNs5k+Tr4kwC33y+I/gcfb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tzXhkifuQ6pzHmZD9DXxcV1qS9SvtMWln0tnKmXp8i9VCGXV8aJihsGyvad86GjlYEWlVoX5Aksm1Dvxi5Y7UZNoGjXtEnYYIJ1Q7nigpR3WlWhCVUoIGei87PJ2rjROURN/3lV0p9yjlORpHqHL0A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13ee65a3-8625-4903-592f-08d984188d16 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:23.3168 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 039/218] avfilter/af_drmeter: 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: G+jHsU7VUOSc Signed-off-by: Andreas Rheinhardt --- libavfilter/af_drmeter.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_drmeter.c b/libavfilter/af_drmeter.c index 010c675271..a4f35b130a 100644 --- a/libavfilter/af_drmeter.c +++ b/libavfilter/af_drmeter.c @@ -53,23 +53,6 @@ static const AVOption drmeter_options[] = { AVFILTER_DEFINE_CLASS(drmeter); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT, - 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_output(AVFilterLink *outlink) { DRMeterContext *s = outlink->src->priv; @@ -219,5 +202,5 @@ const AVFilter ff_af_drmeter = { .uninit = uninit, FILTER_INPUTS(drmeter_inputs), FILTER_OUTPUTS(drmeter_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT), }; From patchwork Thu Sep 30 13:39:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30730 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp690555iob; Thu, 30 Sep 2021 06:50:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTuZHXRQT1LrIsssoUCIJLV6bNKMFQ+vM1hb8iCTaIZ+bOfHWmFeOmQno/pIR+OJpj2xoA X-Received: by 2002:a05:6402:3133:: with SMTP id dd19mr7530018edb.172.1633009851171; Thu, 30 Sep 2021 06:50:51 -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 k18si3772390edj.175.2021.09.30.06.50.50; Thu, 30 Sep 2021 06:50:51 -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=LVJ8vV58; 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 F1F7868AC2F; Thu, 30 Sep 2021 16:45:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064017.outbound.protection.outlook.com [40.92.64.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DE2B68A9CE for ; Thu, 30 Sep 2021 16:45:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kjUDkHwoYRTZk2mVhwQO3UU9LNneiTsCif8dYPY9BTZxsXM0Xj1q9uIWp8kv5SQ3w++/Y+PV5mHsXXri83Nlz5jK/BqckUH9FC1GE9asFR5EY/gnC3C+SBgku9wWgO74Afin9ovQ1t8oovFWeiP4JfEWQOklfbi+B9ov9JI352QdnQma9uWHFbGM8efF/6E6psKhoh4njhdpJVNeNeTRsz5NWAFBTIzStxuUK/JzYrcXq4LQ4rraax11/qLva0yOX7x1RMXZcj5fSoXZyPZ/xu4S+XEU+536OLHM1lmvTVb+peuin1avli1GcH7TxYjkTmWAT4/uW8vp3uIgiTb5XQ== 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=ubSgplfH892yAfldWRASVPc9m/OA6d3+oDGek85hshE=; b=aBzsI0vaHgwPckDEW4ixEoYa2nMBSlu2osBA3GXBOezi5Vsl7JYVOcdw4adShJQ+FSlGXchWAJNrzZ+k173mdzDOF+j0Oj073CUPdSRe75ztU2Z3RQSMHuREH+Po1l90v/4/WYVR3CS8IGJv3nx5Pfs02Z5Hw93jemjrLRjm5BnntEoLTZ/1rbcdo5FIHqihvKH0kmjOFKJ6GvEPJurhyRiFQw5CFBOUK219A2hnYU+yvUSurfYlgvtwmcp4CEVzEQz1JAyfe+PLnYck7+m6TZF3G68s8qgsqqJGgX0bs+p9L9huolh4yQtzH1grIpH+776Zpd1/st/fwPJvvBKttQ== 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=ubSgplfH892yAfldWRASVPc9m/OA6d3+oDGek85hshE=; b=LVJ8vV58fhdPvfGPexaWRt7Kt/QwYhyOrAnw/gEg1DiBzscSjWX8IthoBjiwV4PEsZi7JTVgnBNzZRF0plmAmlagWwW4wBsQio1NXqC4h6llL0tGmgxCa6YfPQBdYUUXgMbSrIaBatbs9z0ZaB3VT+NnEalZ+wJ2a2G2FrH6LpOn5RLmGohJ/u3YjtsJFfojlv9PHqMbz3X6ZuFTJfk1EBZiyCOxW1D0fF63g7wKEGNWGtnkvmfSpNotRwi3SNUV5aPo8v3cv4ZAbpPUaJk1gXHcapuJESWJG/H1MhFJYY20TC/hQxVPZ23e4B4gE9zbfV3FAIRxUUQRxPSEcPhUuQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:27 +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:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Z7HeW0JCL9RM2tvo3ZmfioSFrjQfHzRa] 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-39-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:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 67e821c9-ad1a-4984-f997-08d984188fbc X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV17rP2Vj0OJlpLx6nUZ/zLNa2e6HiYJ95UOEkL0ESaxNyjqVJZZCN90nmnQgHYXsnV1dZjZrg984T2KEAK8QMErgjNEpIVqOL7PJr9KU7PMebsgvtdhqN1/c90HPlQ/6pF+oRd7qOGqbf9KaGTrXSQsOGDyqcIcQJFBR+xFArcMW8+hN8xhIZeKwxYxCpKqvT6RR6qvbNOLNxIATMfRzJxuzOsxSEt1Ir3r8PZdaXT04drp0lrZ+ZW/k05Fj0Km9y65N1wJvvxNCBUA2OS72A/mEBj6BV/yosRFQfPeC/Z6ByJQ1/vvRVerx7EsIb9zq1ftvuvtf8jzRHTHs4Da5ZRg/lDFf0uhz+945niOAawgmqPn8UQo/clYTYoMiBSvsyosGvFt5oIFccmh4CTCbpkZcY6F0NLlv9TwfTrZSNw2GyRzjNpnwU81odx+3hiYgOFiNjQmHcHkxx/Vhg+lle++hD4XfXdEQJVuz2epJjxBj0DX9vD22LmvAEXpvS4ernju8jSrlD0lwrtXeLsBqIC7P2FDJJwjvKgMd9R7KkhvgcyNsDZMeGT0loH2vYHZt/FNfNijkoL6feZnBKi3ifD14wa8/iBI36Jj82K7Eus783TO0gIwZ3a7kh6JCaFPlnlLL3L8ZVFOenmn8msCGAfEAQriG4kzM65IiUaNVgOlMgOGXHxxx7Tk= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2mRzCDKnz3/+pbaY6J0MHesU8B5bAJv0p8idZwGKvzVvsueRFmA9hnUlV94J5WR6kuGBQgp6OqRdOhIAnG0zfiqJc2i8/2ZYjsO824DsyX5MrxAh8W09KeA+g4PwQ3A6ocXhb0ievQefIyAdXqn4Ziz0fFADaVa8rNlYH7Ra/rUCXQfhVapK4iowjm5m7+29T8Flfgmunf6UKiiirfYq0TrkhLDcNrQ/FKd1Y5cJ6XwRVOM44ieyO/Zr6cdYBOWSXGAuwic2cBUK/XBBPUbVfcgJQ8gHSV4ARPWqXITyhQPXfIrGjZdeS/4dTnqfh+3SsCnXleeNAY0O/mAxjlmcyFoJ65N/rX7TEK3BFHwHA3yd9tND93pxuqnt/VDRKTU3nx2W2b0m36rl8KYQQF2ReOBYEaFGOMV1nrScJJiWdDoYx25pq9xi55jKwVe34ZyL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: p1pAbE9qcPw0tNcbVRec79H7Gmw4kuDUGoBP950GwYAK+j55GJHBKb40kcBJq0zCfQEd6+0PUwdfz23vWhVXntHtsBQdF9AWNRjrvhECsUHQHnPdzz2kKWNQvlCVf19IAKLRXHIFnMp2VL2p1X+lIw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67e821c9-ad1a-4984-f997-08d984188fbc 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:27.7175 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 040/218] avfilter/af_dynaudnorm: 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: ev0v5M4WA3P6 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_dynaudnorm.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_dynaudnorm.c b/libavfilter/af_dynaudnorm.c index 73dd9fb04b..bd17998a26 100644 --- a/libavfilter/af_dynaudnorm.c +++ b/libavfilter/af_dynaudnorm.c @@ -127,23 +127,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -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 inline int frame_size(int sample_rate, int frame_len_msec) { const int frame_size = lrint((double)sample_rate * (frame_len_msec / 1000.0)); @@ -865,7 +848,7 @@ const AVFilter ff_af_dynaudnorm = { .activate = activate, FILTER_INPUTS(avfilter_af_dynaudnorm_inputs), FILTER_OUTPUTS(avfilter_af_dynaudnorm_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), .priv_class = &dynaudnorm_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .process_command = process_command, From patchwork Thu Sep 30 13:39:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30733 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp690694iob; Thu, 30 Sep 2021 06:51:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznspVcNnNwroiHfgzSbfTpL0Oal9pYvJcazFRKzo9JDueSln2aa9SwN+bgtZ6T0Qlkt71Q X-Received: by 2002:a17:907:869e:: with SMTP id qa30mr7071754ejc.249.1633009862880; Thu, 30 Sep 2021 06:51:02 -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 hr5si4905281ejc.602.2021.09.30.06.51.02; Thu, 30 Sep 2021 06:51:02 -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=BNrt7o0E; 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 E495468AC4D; Thu, 30 Sep 2021 16:45:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064060.outbound.protection.outlook.com [40.92.64.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D6C768A8DB for ; Thu, 30 Sep 2021 16:45:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BF5vKW97HukVaNEKPgU2t8wVo/JxttJPcjzzTTw6q9hzWlRsM7w48QFeBtb9dXWwb4WBGXamnndu3kqHsGZ3G5TlY/Jljvd3ENotN/qGu8e9H8Kla6cSSNuylXYR8LbFARSF0wyGMfYDzNQuC0oM04SO5oXbCNUX+3kG4r1K1OmLDs4xyephHiFL8QGNVKbpFk7Cq9BcTcX9pcgGNOM21C6mo5WvZmWjs+Y9aa0VLTSW5ITlterHbf/WBMCIGeLFPeaIHBTh3vm2z37su87Y1FlIPZg5CGsgtEFDufnpi/v4SYrSSXlkzSB0z407ypPLn0CBoKygrJZULieXpTJb+g== 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=uITTEBzjxuo/ftywlwSNE4ljD6OVyMB5uZ+NU+WmBvU=; b=SU+x91E4aHr2rUCAkX5qfvFIXEMGvw+t8k1aCzR02LwoWEBw3F3No9FPryrxQWVrkYoKxscZzHF/ifojnu+dduvD0K3zuuQH1xJGovNq2nb6sTSnUUO5f8pz/8mcOxPROWjd1ePP/2qy+cShAZdfVnMbBjH7/+ae+OQ3T1WT2RuxdzLc1PBMttrod5LSfXGAl97/EgTok9e7Q5D6ZDUzOOzjl1+X4LjW1iYfl6w+c8zyrXmYDT4o6TYRPtgEoLZXOPr6Dy8/lMvd7y9tdTkw3UTo/CT84FtJITlFwqJMIN9dAkDhvgGGZi2n1bZkMpKf+vHRqrqg3oZ6j1rFY/g9YQ== 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=uITTEBzjxuo/ftywlwSNE4ljD6OVyMB5uZ+NU+WmBvU=; b=BNrt7o0EhW1fjTktIynAO6Rdy1s/kPn1W4IyVdkSQrLwVjVSG3tuNk8NCn5wNg8VkFiMhhKlsOqtP5U4fdtrcPw8bdX2xVdyVf2I2cT3E0fjbacZ2aK/dFStYaGg5xNOwZG9OnYiPZBwSLsB3oUxCgjvkXkehVJCrQkSIyYmhLTfArpCSgCifIM4mKAArISSoGsQn9hORUIZIfuDR9+WjSsOvzou1vxzOGmYH3m5boyQAN9FgrNn6bPdlS6e6Kh0rzA10fWId/G+D9YIz4z2fACiIBadu1cn6VmvZKcLDFVA9HT/RXfr9AixEz8aD7AbiQ5jhzejPcjhZcWVyVvPOw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:30 +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:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:42 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ne+NiVVPILXYl2wc8lEXmt2MN5ak+AWy] 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-40-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:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa291fbe-a85d-4add-3a3e-08d98418917c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV5C/IQ+NYWVWKJ8pLytsgGEeEBTL1e6SwUsr2kei3/VbDF6eRbb8agYWrtYlpVMjBq36yuYwBYp3nIsOQTvPUs0B9Eyr+bW+rTxx1j1J1PAYLAuovrIzjrUEIdHIdO4/8qgIX3ylzQQmrfluK+/T5XK0ZDhqXcFViIhxP+79hZcNCW4VBuGrbCQX5oDP208b6MLUQT+iPpKGXfZxR6QgKrkUpBvJzsXRkd8/z8Zdy0GuJuTYrUhoNJOSEVdEtSHsSRZSwMbAgadSVK9M+ve7/y0MF+Ow7FKdzY3dwlQEmv5Hu7jFQ39sFlfTiVrEkqSWuvbHuFw9t4gweu2bZdGDoKDYwI+ZKZstJvfWcDnsVqRiY9sCmgLbNJEQU7oS/oDxHrKDXUPxnUVXbh0ZiYJP5qBY+DlsIuKD7pm+j1ZoHZYZ7Gz4nzNihv8jYSckd58XJPxGlzJVm+jzhamxNBiVMS3uIZ8chOcAYrhlZrTSR7TVlX5SkH40JLdHxAZS77KDMB4HRlGL7dStfToICohOYZlvI3GZUPsuX/DKhjt7nOGRV5iYUrx1w9CJH2Q3EWxZJzDNWQTLL2c1cEIEaWOZXj6lh+EtbE3/Nh2mIW66PNjIgfVHdZBtoS/Jv2cTM3NN45OrYDsNe+Jsr8lT9/XcGEVLsdarlnbt7KUx6yhww/A5NBCy/u5oFhQ= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R4gMNowafbT0lqrGRgT1HC0vaaZPcCDXvL5M70AU7NbVxllvLth8UmEwt5EFlMyzLpPQhDYIomfjUh9+nysXjdQufvANtXgJlsrLmW7NI/bHBgToii6XQ7+Y0cEsP4AaCz9k5y20h9fsFemKPLCWqpreXnoGz+MFajEhT014olS0ONDLggyYFgqgzbZK6VJ6NscNF2bhZXUXcntkh2psjCMNpYOQlXBtMZMC8M/NOpXX/oXsFtG/rRgavj1smPvKiFwIXY8oLS6rZX2kjAzfJ389jSX8+83tinCMXiEgvcC2GjKXhZ9PqDbhK3zb81UVBTwKVrrv5nuheZLZfYIpsT3zQtPbgllFxrcCHgX6Lvx855az+NcFfgfBUiZt5FyFG4l7FqkjK8VEL5wGGEJk1CJpl5/tb9dR70+cNqExDthDK+T73I4HdTjpyWskB4Wp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tIx25WArDjvYyqdsZ+xuXQ6qL9heHeWKn7NEBfoRNpsD0nLL4Rzc7XXXd8+DQAVAEOgzPpN6Nxa4l/yB1pi/9lTAIUQ/WJ20EK2ls8BNyWQO5mkVqlGU5NBBEqCb/lqLfV0ba+rk32/Clrkox+XDnA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa291fbe-a85d-4add-3a3e-08d98418917c 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:30.7103 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 041/218] avfilter/af_mcompand: 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: cLZquIfhn5ox Signed-off-by: Andreas Rheinhardt --- libavfilter/af_mcompand.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c index 5b689caa49..90cfda38c9 100644 --- a/libavfilter/af_mcompand.c +++ b/libavfilter/af_mcompand.c @@ -122,23 +122,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->bands); } -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 void count_items(char *item_str, int *nb_items, char delimiter) { char *p; @@ -659,5 +642,5 @@ const AVFilter ff_af_mcompand = { .uninit = uninit, FILTER_INPUTS(mcompand_inputs), FILTER_OUTPUTS(mcompand_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), }; From patchwork Thu Sep 30 13:39:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30756 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp690879iob; Thu, 30 Sep 2021 06:51:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzI8IIj7pp27Gcz3NS/1FhsALzC+ox6tRDVV0nnxkSJ62Qn6kV1TOs2SiarDPoq+l3z9Rc3 X-Received: by 2002:a17:906:544f:: with SMTP id d15mr6905240ejp.520.1633009875018; Thu, 30 Sep 2021 06:51:15 -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 j23si4016138eje.21.2021.09.30.06.51.14; Thu, 30 Sep 2021 06:51:15 -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=lpG4CzTA; 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 F393C68AC6A; Thu, 30 Sep 2021 16:45:36 +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-oln040092069094.outbound.protection.outlook.com [40.92.69.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BAAD68AC1F for ; Thu, 30 Sep 2021 16:45:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jXGY2vPyQkGrEx7S15jBjt98E4PvfCHzB+D4h+vi+Dw6x7zlTqWthu95CfCaFZKokMJ4y/DpVydG6xZ6+0nrOk8FAUr7lwO550dhoR4TdjpNCzWTRFQlUR8/1S9KgV+ZpQCb9Hfx6DaVV91k63sEcCbe0wADyMwhPiJCBMhIIZSUWGg/+R56uOxlSGVHQWc6iRtC+cK2c+4MDJvovrsCCLRqIeo7bg+9mm8DP1uh5EgF05q3ieYxjCRxT6uuqYqsJiPK8JzT0Trn7Ssdd7wa3eCGfwc2PU+2WTrMpWEgG/bN78vfmwZCTnvyKnQI6zqQcdFM9mpKxycDLdPherUvtQ== 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=7pL+AEppOMwtzhwssX9Nzo5QiDBdEi3P+JDm7SrL2Y8=; b=ioYCA1BGqilcpnbQrPxxNq0lPV6PtBkMna06sYTUk9WLHopMjcko7DdIAq44wThhGg68TnMNZ+S0WV7kREcViqoJEFwrN1rTByt6Yzn7hcAfxIZvTAEmdirpQ4CfOPervXI+xyhql4YN33soxmkPdyTQAHrec0UxH75J2C+S16QWZq+Grooa2XCfdSyQOCdW8Q6OYIsc8NUMzLCkwRQICl6M1LzjA3PA30syBb408yfzblO6AJqZyaKIN1fe3ulBH/IBBaEChJPY11StMTHjPtyKyTRlj9GtLis0Gw63FMIVYUlkcrmzrN9lM9AruDVodY/8sto0R+yseZKVmVD4hQ== 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=7pL+AEppOMwtzhwssX9Nzo5QiDBdEi3P+JDm7SrL2Y8=; b=lpG4CzTAlXh2jApbvIxv6bh12gTD4E4khiiUuNxpbunQL/FO3VX8dNn6Dj77cQGZzeU1tTQvrAiwqXQjr8agcrnhkKQb1bdx9qcvSSAhXkPXr0hrbKh61pneZCSYN+rYHK2+ircT9QE5mgYSlPJF1ve91rZMhReEkOM8nlcevwMeSs8YFGZZzn8m7V7AGNPW79NxbOkNh0cu5vQ/fteuStuCz6rNvcsMURHMs1V71eYdCChvS4wQfAeXtQ0Gbf8SrHpjarW9FXvv3XEfHDN3aZcWPiIausUZDPdjU2w1vOH3FsT9dXqccJOkThp6u4+GdxiPFyNG6Ru3ysribj8X+g== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) 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:33 +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:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:43 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [sEiTY4l0xcMgr2FX0UGDCGLZ2Jct2xsz] 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-41-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:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5ced7b06-74e4-4250-5922-08d984189370 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIBqLe59qjkRp21wji/xErRRRFI5QUJRfCNVXrNQM3kC/hCFb2pcviDRflsMvYDPnglK2qBPYTudubivraNWqbQEDINde0z14QexPZZXH4jd7M15IEbNaTNZeJNJNbE+ma5CpQcWQRCfMVtENTp3+yrGiGZp7a+eJxk9vx/4o0EV9pNbrsHH1p8E04ZLyt6aItL5PdxK1EYLGasDxxmlePmMN6qWQW53KXd93uiTggRwyXJQvMaJebKP9FbKHgQCn6kdRB+yUdctRaLclSYlQx8kiWi13c9WyN2+7DFIf/flPCvJ5/ihXZeHaDMKH0xZgEQocQHR+pq4LrdKQSfqXXBX15s6iXuq8TFpAowtrhBP9IPXKr00ocbzC7b4AtGrrNUL9uPqI6TXnibewiEEmcGTBjWmjvf4gkaJobvJq43Anqi1OZRa8yIT4ebJMY+WiIgAN3kceqKcOhz6W+vxRqof8RH2PQwQXcCgE8SuHUD8cCs+qT0n2LAlmMbSf/J/3qRQMSrJVflJrooqTCqJ4LFwYXPh5uLo/iNCDZKRMf6Cecf4DPhlzPtVi1iLZOYSTRwgNriZ+Psp2EXQqOvZ0co3QD4vKMq7mrwZ3BTziVWO4mgDxSUNOYo8dfAopeRtnhlaU1GdBWWUphb7vwSgzN91aI0W0EUD6KBMYOvMHS2NKCPXkVe5kklIoH2au+YB0wgNdwRwCPIxg== X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TKi6fRnEfk6I8oYrqj73NY6b4Fe7u1tqJ+C/uXGOqp4d6kGBNiy9BhcY2/Jcvq76e3/UJbv4FxdNDJ0PDw+eEAKWe6W8F9VfsDw+JMecFR0OuWZQcuVZvDfzNBYGFvtQlMC8/GI/KJNRJ87G/Uf+fazsuoGzAns93jhLXckhTOCbZQtS6FdOJ/6YVJj4fLGO4NMv6i0aNGme4/Klk7aVcnnswB21SAD4rg0dmVApsIhP5ygkpOnQfUcyt6WJeub7gC5iwuXqinnc8IX/HojtUI/G3kq8yaCQbpUFGFZOHdgz1AEkOk7iPn5xItW0zw2nC3Mxwr9oFa8l4LtuFqEQYid1r5iRa7ZFPFJQEYBs05bsQ+FEf8qc7r2HD8ATd5Zvk0ZmDDhK16wBtpsmayT9vjqNNY3nzFkCs7Zrd9I8wQ7MQA2XQmmezy/mzTWwJzUy X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cP8mOvqGOz23uvwSsTErTbxEhTl32RqSUdJ5lBtgPOSsDcDG9zl4Ch5ybZnuFdNmIA200jKzF6D+zZjJC4rkFZylurH9ZLSPQoQ1eP/i5FijJ8NS7t/ACrLy+YPLt5QYEuaisLZjJk4Ei3F3GSGavg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ced7b06-74e4-4250-5922-08d984189370 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:33.9312 (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: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 042/218] avfilter/af_firequalizer: Store format in filter, remove query func 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: jIPx4ggt0n0X Signed-off-by: Andreas Rheinhardt --- libavfilter/af_firequalizer.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_firequalizer.c b/libavfilter/af_firequalizer.c index 83dc3ce7ed..568b78117a 100644 --- a/libavfilter/af_firequalizer.c +++ b/libavfilter/af_firequalizer.c @@ -180,23 +180,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->gain_entry_cmd); } -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 void fast_convolute(FIREqualizerContext *av_restrict s, const float *av_restrict kernel_buf, float *av_restrict conv_buf, OverlapIndex *av_restrict idx, float *av_restrict data, int nsamples) { @@ -962,6 +945,6 @@ const AVFilter ff_af_firequalizer = { .priv_size = sizeof(FIREqualizerContext), FILTER_INPUTS(firequalizer_inputs), FILTER_OUTPUTS(firequalizer_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), .priv_class = &firequalizer_class, }; From patchwork Thu Sep 30 13:39:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30740 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp691319iob; Thu, 30 Sep 2021 06:51:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymKaB85ccuLyR1F51U/k1fxBSQUB2XyxSjoJC29MwFT/vTr9tMLEIgW6aJpTBWu7pqAqhm X-Received: by 2002:a17:906:585a:: with SMTP id h26mr6813215ejs.31.1633009902091; Thu, 30 Sep 2021 06:51:42 -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 5si3298750eji.132.2021.09.30.06.51.41; Thu, 30 Sep 2021 06:51:42 -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="BK/QXUZ9"; 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 E60E768ACB6; Thu, 30 Sep 2021 16:45:45 +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-db8eur05olkn2020.outbound.protection.outlook.com [40.92.89.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72F6868A936 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=mAJsdx+Kx0S/vCctoKpl7JhzpvwxXdK7Naj6zGa77Gs5jLBr7UmrBOBSusjgq9qwRmWY4AFvXX2/F3KcFAgyf0guzeVIY0Q0P4bB02h+Io1tCs9eMUCQ6ICFUdsyELBecPaGnYj+7YcufzvlxLL3rtWXNj8aZR+M94GIlsMxWFGGqqFr37blE0KEiNUW451ZBeXfbSI12V9w43b9Sf7KNNpYMxw/ciHova4BwU9Pkxw84+d4uOuXSRf/nJF6hPwjPkiwlj/SjSkHMHTzvTrNxiDhureRH73kskHumG9tz2/izF4gFCh5urFecl0OOafvJ0urYEtrS+0O1Zzr8UKg/Q== 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=NNHxZ1cm7kbmnPqy9mHaN92NEfkcm0HP2CJN4HhW5Zo=; b=OgzZuOTtQhdKWy8EniDSCHH5q4IF3naTG9I3mDZ9B8au0/Q6A7yTpv2V9qGivyYSpy9xN7RykMNjJc4lBnY0uVuyRxas9FBHp8tSYbFY3hQ9F0R7lQqnw2VD1KN+IPQlVw9VPoEjb7Lq240PcwdRYygNwP89XyGwZeq0qzNatrtOYDapwcAte90qkkSDl4Oaf65nRD+UDJB1yYqDUUv1QX03Bw40Y1D+S4Cmkm/TsAXqKC9ezKqD/Vjt+G6AuxJgUXXyVbMZCP964HfeZPDkr+BItvibRA6ApVTnBFNxgRxu8Km54X2MhpwHr4IDQFLlDxDNaTzs5NfxCcfuRegwew== 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=NNHxZ1cm7kbmnPqy9mHaN92NEfkcm0HP2CJN4HhW5Zo=; b=BK/QXUZ9TVb6DzhMdgmGSMOu6uQt8cbVa6bm9uNIbgBGS1KmYz1fYS1y81ylZz8h7Ymeg+QG3rY4WicdfP2YiySUxsAuxUeTh966D7EhGeV8jmOgabXdcOASi6yN0MIvqPyCwjvWHRGAC/xWc4vmC/knv4zc5BHv25JHrr7IHEEjZAZVu2Wguug9DKyVw4/Rv/WHUHgo4YUgbQD3d1vqxddAXfp8NtX5VD4iyHKyGq39sBob2gnFxq007vigN9LhZo+ydBcX87M33jtc2hlksc7yVPv0zwDC/BK1JAR+2ATTNWbPFx9/BuIDTUFJSLz3LVo4DLm8ADXfAbJTYcs5Vg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6428.eurprd03.prod.outlook.com (2603:10a6:102:77::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:45:40 +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:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:44 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [KUcaWIASvbuWma1cbd6y5skwIR8Jj6Wz] 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-42-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:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ce9b553-b853-4577-f257-08d984189711 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0bPq8Fe5HKswxjrusjrVkDMmFRUggFEdjOOs7JnHbslCPuHF/9vPj0m6H5gUBXJJA49wfCOsYGreZhmj0sOfhqZkU4fwgicjQaK1O+Pee3prsbIx/x7Gj4DK+RJyx476Q3VF+ddbky1eYQ8WwhfmtDAdFN4jlZTL9SY6H6PW0HUT7pR3psRulgeZw6SIkl5d0ekPUtAJjJIZvsDowdQwnf4Gguw2wny6/VqayAP79vVhWnv5NrFG1G/7VjD4VlcpPANwWBTg/ggryrxr9DNVoLGlzs6WQM1kS756TfmXpwb6iCTlmRRwHlL/J06JxwJzeFMWnQwyJF6LogGaMI6ivi4TLoMubauMl6q48TSjgrNl3sO/vy8A5ehXgoE5TX+qKrEn3I0AOYdz0UCviSVRWEy/tE1lbO6ZjY8YOTXKKqh5qcAXhCqJ5LwBFfQYAQhBP6JBnhcdG3DbOMT6Nw/C/3xcr6r8g/c1DFks/aLngxuLiDcfJXj6vdvJPSP4WHpAcv1Mfj1ubKOKDPNK2V2wG89LDkW4lQWDpF6c6TyLrLWnE3IGIAbyUzxoDXEWTOviTRXnyHk3GIDNgoAvHvpz0gMll6hB155DeTGs1b2fhBNPz1GcDu24cLxIa1FJZh+bLU/cN8+l+osvGlmsUq8Yrc1JVcqZqSzOZTB5grLXEMNyECmQkN0ysWK2JExkJQSG+A= X-MS-TrafficTypeDiagnostic: PR3PR03MB6428: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OuHnnfmQLwmcAmiIOetCwAzmdeZgn6PmtrQEoZtX7pF9r0eoY7cWjNBMdo1FoD/3uYNyX6VvxlSkt2jtB/UZCz39yOgrcyOoiFAEOdLbAfqVWsQC161mjHWoMPYdtKVZW2e3JsrV/Sd8kpRimPGG5Yd7twasxFVwKfydVn6oyzIrYQj/IrCQ1qnJoYxosH3OUEmVGGyo2AeIr14N8AuHnitUhzDMsIaNVLIonfkjNPATKRs0C3w6p1FglsQGEF/QjfITlmAnYFi1pIRYstwzlNlF7iL1EO9UlWPXWOivbXLBbwYQZ9a0TYH9s3AzZZhexGv8clX6UEj3KYq5ZQ+uH1uVNbOnoOZMNcJ5oADHNaiZlOXSyFVfR9IucgFLTptHHCG6tAv7nLCkl4sX/vIjY46xSrpdEaqT2F2cS4fD3iefkRhV+EVxjDnIMlWaJgu9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S/QRWwNUVK4LgTi4eDNb7aWloVt0Oa99/Sga71k4Vm/8BFGRki1Si7C9uA7YxvE/daBXsfjZCv00paPunJVeGjHdmMDTAKW6qeeGCzRPP+QABpiJhNNAg+DjqoLfgV7fKWAPLapRoSKooELyE3K96A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ce9b553-b853-4577-f257-08d984189711 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:40.0841 (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: PR3PR03MB6428 Subject: [FFmpeg-devel] [PATCH 043/218] avfilter/af_flanger: 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: O6MctqwxGu3x Signed-off-by: Andreas Rheinhardt --- libavfilter/af_flanger.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/libavfilter/af_flanger.c b/libavfilter/af_flanger.c index ecf7f9365b..ba8d033ce8 100644 --- a/libavfilter/af_flanger.c +++ b/libavfilter/af_flanger.c @@ -88,22 +88,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -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 int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -227,5 +211,5 @@ const AVFilter ff_af_flanger = { .uninit = uninit, FILTER_INPUTS(flanger_inputs), FILTER_OUTPUTS(flanger_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), }; 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, }; From patchwork Thu Sep 30 13:39:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30725 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp691489iob; Thu, 30 Sep 2021 06:51:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz30zrbceqfWzD8rm0f2ycQjS34d7LjQMqLKyPxXrwikf0jfUoLD7kEDd0XQ+3NZMF068CY X-Received: by 2002:aa7:dcc2:: with SMTP id w2mr7264564edu.192.1633009916267; Thu, 30 Sep 2021 06:51:56 -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 g24si3385713edr.84.2021.09.30.06.51.55; Thu, 30 Sep 2021 06:51:56 -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=f8ZyVOwY; 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 D841A68AC1F; Thu, 30 Sep 2021 16:45:48 +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-db8eur05olkn2046.outbound.protection.outlook.com [40.92.89.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EFD568AA68 for ; Thu, 30 Sep 2021 16:45:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h9M4xDjGsv5fMPon7h2AyLjArmAsSoAVEa9cc18SA1RRPmv0yhOd2bJpFn5FaGIbv8vAgcA1zkoLGeBVf3x00tMI2uBSZHI8VGBf86x7XgtAbD6xYt0v8Obwsm4yprGZ9Ndfz9efql7/Hf0S1SgF17rWgUjnoBNxCAzbq9Wp04HpkWqq8mRjSlqGf8/8Y++PnSJ5ZjS2TLndTgyK+TG4hjLIrbxcJRqI3yt5yTw9g2Jwwogi5bl5VY15bVNPIya/bW8nhI5GZVSFopa8PZ8XCkbX4gv1Dl8NQgFuWCqiw9F0k7SP5yWW8/aVgW/JNnK2bcdnaaSDy7xoIF3h5aNVUQ== 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=zrsNQBQwghk0Psu7pnAUGxhPGHSmrbqMtVnuwGtbEpU=; b=EK2KlMMo7MiKzRFp9XS4+dRRzK2OT3Iwb3MqvoGele5hRv4gY4GWcS8Gz4X/Uve1l2IFLN/NVmUUq1ZbBAmFq1xeg2iLcTulDjP4RCsdp8gHWp6IuUNCEqAB6qEr160dxJpxWUC0BRGaTXOuiz83eYP+iCC7nq+gYTXAdSF+uLbqlQXtwwhOtfN9lWafR5H6Po3lE3EwAvLk3f6vT3cLlpGT5X2ds5SuXZuoxv2FRveO440KL13i6djlFNuqP8y4HugSLO8t9Qa0JiQIIlS0ssemwPkJ+txjYCtjt/hrrw6nYirhrLtvg3gUC66zP/8OlZk7t4WVRL51mk7Qv9y39w== 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=zrsNQBQwghk0Psu7pnAUGxhPGHSmrbqMtVnuwGtbEpU=; b=f8ZyVOwY4+zgzyk0ag5ZQAMiFQ4NzH9BNPpo1bihyJCRpwY1Syr1yGVjybnanDn3Kh2DOmmv/5lNipQeh5EzCj1VNACnHVklnr5W8Dm79Staa9esSEmMdO7Tn2l6sWxq/0KLZmnLag5MgKgmdeIzrcCgYceV73HMeTplwXdWdTW16Ny8bNvj07T6b85UjuZIZw6bi1xab4FgWhXWjWZCKZEDN854TWley7jwwXRfKslhnWxOtCLrn0iSIZlmgJicRnAWSThH2IuBzT0+frEXvqEinjp5p0yQ0JX9f/UzKR/XDQySUWEajv4wY5Tipnahmg8yP5WoA+OrBpEYB9cesg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6428.eurprd03.prod.outlook.com (2603:10a6:102:77::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:45:46 +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:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [8pWSNuBXOx9oy1XaMNzoBT/wEbuOlg+V] 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-44-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:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 861f7eb6-85c9-4ff7-9251-08d984189abd X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FDEU0cQkzOOhj4g5FyTbw+XuYuVM9wLG6U9Kct7RvYDH6YjUpj2y0co0Qfw2UKvgzqBGTjiyC+Hc7UwG3xiwFYA9Z/xR06pgS1l5SJeQ5AEN5k9m6jOFpJ40rW2inC7nzWeDOJHUYE/l7gKknxOxlZ+BhAbCDxd97Lyokhrv2E0envA6/qycc1hA9y1bZ78SIE8ObGmRV+Zs6xFyfIJEuhS3F3nXqHtQIfSLKhS0htbJ8NL/9AcD4aO3PdpjgthO4D74CfGwmb1gL86pLUYEHkv/058nEgp1cNd4RNyn773OH9y3pBpTNE4+pzEeymRV2Kz6HrZEiapsbMyVASpGDkYFNaymZnPov5nS+TYWRbs4m+GTsRpSis0PBQvK+4qBB57HcQnUTn0WB9WjQ0ItgfrIbd44xZSJRK6Ie6gleRIX8DEOF6DPtJkyU5U9JmL4FfBxzjmnzGssdF7pFdkjwyb1HF9iC8sLWNjhOozK7OLn+OeWpA6tf2OxZkdCZNensLMcxm/pcCbSIq5t8nnTx00tL40/0cZ+EOzNPJ/gWKM3GeGh36ZdS4EAKRhwjMXW1iyh2ycM3wqxDyi3qMx6fLpvWDr/WD2s/BjPZoRPCpkAAPcFzd95AcwM2vHPDS8uytMHCUjufr8bARwYb+v0PmUxoVrnvxbDFtYqfPPSCi66qO26S8sWjSI= X-MS-TrafficTypeDiagnostic: PR3PR03MB6428: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wQktCyoHnUgUx58KZtze7kb0+c4UrXotIQ0TTcgrsKwKlQl+h5yvrFNbUySrx+AQWlDxuQgY6Gubkxv4KJMioAGHs3OZx5fbSrvr/iZ3gRpXrmL8mJHMTjibUPxo6wU/OJ01xnvedi+j1pVbgycYZPEQ7q47HcuCSo8+lvh+rOS8pJcR9c3o2d6wTS6bhvSpuMJLbm8yqzaXRSscvY7P6Tk53wQGQKxGqxUHaDpcPOUxUHU1jOHzSLFEOy6rg8i9OCQrBq87wHKhISrB7rYr0cX6GOvjQTOxJNcHck7QTzbFBhaLo8tPKKSeMhH33C8/rgmaH04eDZVLriJ4KQwLPqpjLHdJCpRp5HL5X6BiHsuiEgjVL9M6kcgfon/Y0Ut5PONdtVjP+c2Ou1Ul/60dd/hHzHJ8Lk52oWFP2G0sLGgewvR9GdVnkmtwytp2VkKo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ONX6oD6hhw9kY/kLB6MCZ2PaV8a/jEhjrAKG8lmkkriMd8Yya5quRiPxhOEpb1553tMrJAFVfwScwQTK/Xwnn6LRlYr3cvUcgH9xV007KqH8fewn+RzzDhvg44ixuKI6Z6hAemcbMG4CYfcoaes04g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 861f7eb6-85c9-4ff7-9251-08d984189abd 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:46.2082 (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: PR3PR03MB6428 Subject: [FFmpeg-devel] [PATCH 045/218] avfilter/af_sidechaincompress: Store format in filter, remove query func 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: hMpvXFcy8pjj Signed-off-by: Andreas Rheinhardt --- libavfilter/af_sidechaincompress.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index 7359ba8e7e..c0ce82066b 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -406,23 +406,6 @@ static int acompressor_filter_frame(AVFilterLink *inlink, AVFrame *in) return ff_filter_frame(outlink, out); } -static int acompressor_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 const AVFilterPad acompressor_inputs[] = { { .name = "default", @@ -446,7 +429,7 @@ const AVFilter ff_af_acompressor = { .priv_size = sizeof(SidechainCompressContext), FILTER_INPUTS(acompressor_inputs), FILTER_OUTPUTS(acompressor_outputs), - FILTER_QUERY_FUNC(acompressor_query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBL), .process_command = process_command, }; #endif /* CONFIG_ACOMPRESSOR_FILTER */ From patchwork Thu Sep 30 13:39:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30742 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp691672iob; Thu, 30 Sep 2021 06:52:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyqcH4keC2PBUe7MhvDgk8BD90Ll0SxE1MpCxNWvtWmmtBtoNFbCqWJFe3yWUyUKxvle/R X-Received: by 2002:a17:906:469a:: with SMTP id a26mr7053208ejr.38.1633009929822; Thu, 30 Sep 2021 06:52:09 -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 s12si3369265ejc.488.2021.09.30.06.52.09; Thu, 30 Sep 2021 06:52:09 -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=TAT8auG6; 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 ED7FF68AD12; Thu, 30 Sep 2021 16:45:50 +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-oln040092074095.outbound.protection.outlook.com [40.92.74.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64F8568ACFD for ; Thu, 30 Sep 2021 16:45:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jMUtz0hTDCvYCGRezhd0ZVlU6I2bdQh7Y/SwmEeVCABtL+4UJomHgh7qIwBx+HlMqqt2rNcAqHEMYNt93t4BfPpJL9OdXtG3Qo17LNnhaWRtqkxpCi7iso0hi/NqeSr0BrDnvxmB3+639oAG3jxzx6e+O5xfBpON+qhedbrnfUa/ep/L+Fwg5IZwwC7zL9R/yJVNFW7m0BmHjcSJ2xlfGBERsVRYbgxSLfaMtoJjftY5+W3dFXzQ/rTklSzQp3IwZES7pqrsJe6mpXBXDIj7RgujOFx6lOLL10Nr77IQt/RgRKVL8ZSEWN/yWsuBz/i/R9iVJv1E2O2EZR00Ik446w== 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=PV/tqLXjHBx68u9m5XrRMUVdmrRgyY0VEzlMz3l3jmI=; b=UGSFh3rZCxURG5o4XJUO/McxhQwrJkSSf+pcLB0KXmTVPXNvx/gVO+9pVvsFIgtYV9JwoNLiBe+BT+lolBCzvGpxz+IeDCzk7fe/n4p1NxXyhYF2sqKKg8Tl2cj2RONcR3NosazuoSHho4sYGIeh6vIMvSicRDB68+rZi9Dp80lrjBGxzGBUAmkp+bVG4ie5Xs18ltufPU9rLI7Ndi5vRwOPTrqInpBVFmxPqaZbe491HvxcsJSDhTuvQCes8Vf9OAjG+yBNHlPD/aZ3g8DDHuPCq4Gru99uDd7y2vb6BNPrTxnK3Te6SHDOf4Tkfhcw6t6K9aJ8nb+fN2exqZaQ8Q== 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=PV/tqLXjHBx68u9m5XrRMUVdmrRgyY0VEzlMz3l3jmI=; b=TAT8auG6kV0sKGHrXUYDJcFAwhvJqDdcwlk5QBZ7jzDAN0ooWzzUNegm9UpEb10Y1sQ5jKMlpC1XbKOTGjJfXCmJdbHswIX7oVBhVJO8B97EiR6sTh70LWB5SIvErCIoYZqVhF75+AEjBAUV0HKSXRlF1nnjrX3sD1MoDQeWIWxfoEiyhtCn381DUk/vm8kh//wDShGi6yZmW+ztzqcxmEJ5AENCSq9JMoeybO4O6k1zQW4lvVi5B8PKTIwzxrLEd4k2Dno8G8jqhALph4fxc5hdjifqhPg5Z0dszCDsdnj9sparK0NdU6eRsEziR4WoMOAZ0Pu8x4y1zwOk+wqpWg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5163.eurprd03.prod.outlook.com (2603:10a6:101:21::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:45:48 +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:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:47 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ppzTX58uLRgtiBYh/6FIeDRpWTdJsEM9] 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-45-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:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cdc3d3c6-5987-4b6c-7253-08d984189bd8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeRC8IpstjpwUsIckYo5RPS9u2V/e1jLGirAX579WYhvkQYBziIlolqlkC/94R2jJw/u022QI/PkYCMSWLZmTzh+BjOz887dQ+Pkeq3Lt/2aG7bmJbIuaat3RR5womZQ9wgov9PmmS8bfbj0dpFRP4H4yt9CJI/4dr3Oc1QsUAh7zRWHkuj0Y0me7IAWyLzjOvtizC8qBeHia4I+Ha9pIbpfb5qlbU3iDYfEFAF3V/bwGth55F8+fbuIDXlE9DSxtTdjeaF2+ucEsy2Js+yN6HGoP0uIeaDNcS4kTyEspWvCbjG8bcikNZPCymUCoZM2OnMOKPkylZjILkZNJsUDnaKiHeP8F8Mhr0OgEuKiHAvznuwHfY6tx1AtBCNodAzuQxNz13OyC70faTRr2ekdK1mOwIkIoObd5jSCMrsfYdbmgh0UGH6G4vbAb9ZT3lRKPTXBh1NhXxHxYO26U6y1NrldsFxYUE+dT1IFjiARAW2/9gsBRxxDPt8F8XNvkY0MpBgjtpZMUWMH6BrvrQ0O/KH5h1WYBu6WPnmtp1xihw4anf76kGWFYjbNFWA2lf0YHWawZcoA/+rSHsLZNYo/49QiTWx3aIy8oK/0UVCLT7C2gnuLed1wPUSNIgULnarXDT5Q37bPBQAOMKn/Lm6fqhDgzssoyI5A8WYY90zQyGmOEFIKq6yfORa1TAcxtPTGS5fkcIDVWhj/U= X-MS-TrafficTypeDiagnostic: PR2PR03MB5163: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hn925lNqeK9LiAmK6qRUyg0P5RBlyINz0mwcug70342j0YxqRPg57eilifmUYOFAMwDXE5f0yMHUCTVmWGage0sVUWRJhLf4/fgNH8+Qb+VWSZDSqPJR5o5nHhR2oeLGQxGBfSXkx3KlaCKsLp6B4QgO9zYVu8zs0plURf1BcA63BCoiy5I3WM7nfxKLdbl6dTrFmr+AVv99wPPpszJoiFyaDj7oTnKGf5JFw5t9TDt5IAuuBAlizgcGmtypkSUP+Mb7tE8v1g5vZ0rgSC4KHUoV7jTbb4AnFe2K3EyMteCWoNEy39ar5GIlxElnzl1fpFRy3A9oNsqO9ORc9a9qO2/R+x2cZ7gEDSEnrBt7UsSuQWkjo/C8Gr5WgASFo6YUswb04mRnnTI2t9zxpVVBv/ErTkhiU0vDsgWwVe7YbbuHm8PlGgLNgTP9HZSrS3Z0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wMaDzM5rEd4Tt4Ksjh/Uf3P9jv10kHkaWm1CKQwSt3hdYFppDlkOqWCbpHajXh0D2pUOaEN6w4BLFM4HXXdAK4E8mFxQ+u09DgE+EWDT1VCPVmEtJ+rJLitaIdmBEzL2PIf2uFuyfr1+lkXTyICMuQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cdc3d3c6-5987-4b6c-7253-08d984189bd8 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:48.0899 (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: PR2PR03MB5163 Subject: [FFmpeg-devel] [PATCH 046/218] avfilter/af_silencedetect: 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: eEdrTCM5oz5n Signed-off-by: Andreas Rheinhardt --- libavfilter/af_silencedetect.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c index 482270d3f7..fa0884bee8 100644 --- a/libavfilter/af_silencedetect.c +++ b/libavfilter/af_silencedetect.c @@ -232,26 +232,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) return ff_filter_frame(inlink->dst->outputs[0], insamples); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, - AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, - AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, - AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, - 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) { SilenceDetectContext *s = ctx->priv; @@ -287,6 +267,9 @@ const AVFilter ff_af_silencedetect = { .uninit = uninit, FILTER_INPUTS(silencedetect_inputs), FILTER_OUTPUTS(silencedetect_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, + AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P), .priv_class = &silencedetect_class, }; From patchwork Thu Sep 30 13:39:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30761 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp691804iob; Thu, 30 Sep 2021 06:52:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwawG9gHBF6qNeA9E7UzemU1LFWWA+daFO1XO/dp8R7uXBPyc6cV++U7/H70Lanf1tZvwA0 X-Received: by 2002:a17:906:a3c4:: with SMTP id ca4mr6755892ejb.529.1633009940558; Thu, 30 Sep 2021 06:52:20 -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 d29si3684351ejo.60.2021.09.30.06.52.20; Thu, 30 Sep 2021 06:52:20 -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=cPrV7Hsp; 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 F2CDB68AD62; Thu, 30 Sep 2021 16:45:59 +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-oln040092069012.outbound.protection.outlook.com [40.92.69.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47A5D6898F5 for ; Thu, 30 Sep 2021 16:45:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NWaNsaVt/XEGJRhexI0gorzQ8HxMVpp1Ghmfl86rkPVSNe6k79+WOFxluchpQFAvUzRHqXWa0RtFCGEiI4wjAw8zC7uwTtPCa401MXi/p/1w0hu0vqGSGHC5Y37W+O6Hdzw8mme0tM91/Ruq5EXxhfmRUTM/IzmRwrwPbJLQbXFDQGJ5MHjsHSqLI762q1Tr4KAMKSQc2oFbGzZCBGv15V34lB3/H/gEirh+2q2L5/caCbtqnKq1roh/+/qS1qKwHGaLb23OHXIGBhlrymh85Q1lKUd0ga9S7GZ8mIC1S4FzqqnaAoTaVvWagqJ8w1dZoR/N4lP9QFu+Ye/0o4PMgg== 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=N9dux4va4Pct9pRJc2NlHmBpV5vJzDFAc0HATou6u/I=; b=b0b5fVfcjfAdgL49kYJcFhQvpVvWWGGt4TdqEHItu5Jo1jIpZyGw2jlGPUN33JhHvizeaXDuQIBj32Y8/9uvlqMNKSpS/9JnV1Xa5Lzs8k3WRmiex+sDwAl0IyEwFTfYztuWVdn82wZQCIfB1wTbcTQETWRm+tFIVEZvfXHsJfmURj+XWIX8q0XZK5tza3zWfwRdLWEwgZ3xDpkJVISIeTBli03GL8d5c0W3qt44rQJ1fri90n2jqxUyJArboUx7Er2/BrYRTwelylTMqmleYMpSiwdbpkje4h0j3O9u0/bvF0ZR9qzbNYofITL6qrCm2MRNZ5mTYuKfK4sVZ/HL1Q== 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=N9dux4va4Pct9pRJc2NlHmBpV5vJzDFAc0HATou6u/I=; b=cPrV7HspXTUwvZMlr/44osVg95yOhivHkoZMP0WZM86ebBUCZfcZC1ukXhT7udGcmtbC39eD8G3GkKq5MkKidCSOQBxPFo7h9ez/fQgJjcWVLNCbzWDhyzYLkscE2l3Ojt50inW+i0YTpK0FbI6eT4ZBJ6PMy0Fd9stbeSNXCLZopi+NS8msXgSrkmX47b5eJIKQznbtBKUl+YEGllD4j5Btpr0OwQyQ8PGXy27moBUl+2xbm+IioyAij32TBUNi0GgAWMBSgmvrXYKulwcm7Fmnb4EQRCSJAz+v4lR5q84Fr6RLduG90YYOwffoIY6t28a0scUyfyMtqs1C+viaBw== 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:45:53 +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:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:48 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [z7qo/iPUogWbPDKB7muyI+I4BnJZEwnQ] 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-46-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:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b3a18410-3c88-4338-0a24-08d984189efb X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeRC8IpstjpwUsIckYo5RPS6R3vDa5Ho8FeLD0+iLtUyXd8MrvWxIARnUErijGVd9W3SqTqDBT+tggG8KnXiBgdxPPK629Ewtmqit7M22XLSJ9oSKcJ5Ct5JEyvQDyJIDL+F/z3GjYGeb3wvuDGsJHEItygEqcwvOmTz/KVPRkpkz3l+CyWwHfbN1u8Xklj3g0is8s4Kj7cvW3Ggv/I8lNboSgpbuk58iCoUwxxeUC7rf7ABcPeCKIxR44h7dSyqfDq3wo36AyVDoOeq0ADVGEP9RZaN8RxBqj9Bd74MeOMUYiPVz33yf9Oa5UuWc8uh0spaX6PfgO8DIOGumt9j5JEVgR4sYPX/XT7qab/j0vSaApLxsoDKk40h+KK6F7E2onmXj41RDsFlXFy+jFb/9odVBljR9+2hyUlmvwXawoc7jfe4O+4OH6nlkVehkVkBZmef+TbR+qg5PkCvFahQdcA87U3eNq8+97X8LZDqb2IBO8NiD3S9c5Q1XLrm4zPH+YKyxNywa54Jz0KJwDTIRSdR/XyFoOnZzXML9H8FqV6VVJflNUrtbMeLYtqLYfurL4zxThOOuZIxHVZJkC8DTosQp3j5p1TfUK7Z7W7qt0lIuPeIKmMONd+4uxHWUqojNNNrfc72qTWJL4hKJNLHC5f0l4zQp9Jjo6zU2ZS6h8cLI1a+wq78cY598k92+YxbT6vFDNyukuCMo= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RCCRN1uR1V26W0rUh8NspNN0Y8HrSXngwAFfBN3rfoSK3WnxwVqoDmLq2jUHhFgCJcMm2svGBFHtAj71naC1Pv31DoWuY2leycjKM2rxgxtr1xNoLBbvYFYkRzP/eWoDiSIEX1fYB0ku10KRNnaDBshm5XvT5/ZREOLU+ZHgy/4UuFqmOzGHTe8JXfuQoROB2Nn2lslBb97+ZnNOF+PxaNJgbEf13hNo4KyhoqcnE8U0YZiHPW9H9wOR/W6Gr/EpoATdXxZd4hsrElBGurHEv/cwqObhQvzTDwohdMc0E+QimnF3iLBUMxin8yJr9Y/VQdmxn/sD0gXJGJLNsVDBoyp3Gka4EdKD8EDnU2y83ezS7Km2fC6lAcHRmXO1l+grnuXqQDw4EGoBdw49G6+GqpxXFl6o8+TZrddRWkzkjW9IXOXpjP4Dj0/R2rDO2Rgx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x8NJjaVjiFl6ln0aE8WdpmjUyYvWAeLrlSsLId8qiFaXK5OPSE4FvvcLTSSkwl+N/mwVW1gjw7AhsOBeoeol27U5toTE46KZZ//3gSQqk98942KrcmQXG0K2khXnhzUotQ+Mg5BSUM4UXHGdQqGIdw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3a18410-3c88-4338-0a24-08d984189efb 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:53.3219 (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 047/218] avfilter/af_silenceremove: 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: gLES7L5vaRgq Signed-off-by: Andreas Rheinhardt --- libavfilter/af_silenceremove.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/libavfilter/af_silenceremove.c b/libavfilter/af_silenceremove.c index 1b420d7838..a02e1de783 100644 --- a/libavfilter/af_silenceremove.c +++ b/libavfilter/af_silenceremove.c @@ -923,24 +923,6 @@ static int request_frame(AVFilterLink *outlink) return ret; } -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 = 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) { SilenceRemoveContext *s = ctx->priv; @@ -981,5 +963,6 @@ const AVFilter ff_af_silenceremove = { .uninit = uninit, FILTER_INPUTS(silenceremove_inputs), FILTER_OUTPUTS(silenceremove_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP), }; From patchwork Thu Sep 30 13:39:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30745 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp691936iob; Thu, 30 Sep 2021 06:52:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxT9F6COJPfLAZKkglgdFZZuZWox6tTMwxQAl3eN8atGG0aOXYMn6PeoDSk8VP8PUQnk1BY X-Received: by 2002:a17:906:c205:: with SMTP id d5mr7011830ejz.74.1633009951285; Thu, 30 Sep 2021 06:52:31 -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 f2si4300633edl.338.2021.09.30.06.52.30; Thu, 30 Sep 2021 06:52:31 -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=MGaMde0k; 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 D64CA68AD93; Thu, 30 Sep 2021 16:46:01 +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-oln040092069012.outbound.protection.outlook.com [40.92.69.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69D356899BB for ; Thu, 30 Sep 2021 16:45:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CQ5iU2fPL+Qf14+bhasaHt4nZBznvorsB7biahp8lmWZY0fw1JfoH6IgDgtRfFXm1xIsyXjxYhhiqHhmVeLt4ra+SHILoI6wXdrHbCtqD+yt7ob8IR0orbIKagKU+eUydfynCIr+y+bkGSj5FUzYJw7Px+u76kQDFPJ9jdCsWklE6Wx3zm/oN8yoxzrDRhwRdeehg9BtmHglIt7xSYoeaeqMVoyOeTB9HqaaeUJLc7eMhRU/9wF9kWQsIWLcFiJ/B8hAu6W4g/1nzdrvPjViOl87kcW6HWzOT7/ILvXqqw77ncXdtEXZjDksBPjlUGaKKs46N9dbOkMMreRqazs06w== 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=V1w3Jl4c0+nNoyIxSNKQbQlncUxmFeu+Awtq56mtEIY=; b=BhvV8MhA5FKW0ZDjcDWDlRCHo9ZduoHbdzOzr2qHxL5zSc4qRLokNcPCv5+30k/OXh4R6xhd5eLT1SCWkyOpugCqEayyf/h5ydgNwMh4BBzzSTHAwaKpr3g7Ix0XjeyATJdLjJXTxNHRzzXe4lzD3UO9r3ISoffbRZYtvffBM2S8VmKKwgKRQP08tWct+uApPsTYPXMYlDzKB8mfWAxG5pYCg/tlGnymtlCZ7TVjS3721ZQFgv3lXaJj0QvlNbTmiQZP8RTVvvLL93KWbgxqEP9+WO+hcQFAszaVjUW8SNsafSpEYohBbk3P0BXB22B5Z0QHp0JJ7YGYoJxV/QGtoQ== 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=V1w3Jl4c0+nNoyIxSNKQbQlncUxmFeu+Awtq56mtEIY=; b=MGaMde0kezOdWnbZqCWWlbzQy/mF7+ZvXvwdV5ST4TR9lkhkPPJrzJnxF3pTP/BhJh3FcMSDoc2pDAzyPTTScCVcVWtm6XnqANBzXVS1/fhwFSLKCUQvGAcN9qbWu2wVdpTRK/baSQbChd6bjggiViwQ2RD1zkMWxszWKUUoQB60+tRsIqbPrhKHxSoZFS3s3SJMiZi4ZfVjf7TOtaVTS2Oi31GT1ARvCNhHuwwWSixYulG1PwogKb+IrXuWvUxs7aHM21VLwXd9VBA1sA8G+xs96UAb5pMgm31GPVuGsZX2WxGJMxh0xt4ySosAY+dVGo7gESPVb7kuf3Yzg1p4KA== 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:45:55 +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:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:49 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [X/ZXkV0ZlCF5yEyVGUf4NZFGAPm3QYwM] 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-47-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:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9119c771-b144-49c5-8914-08d98418a076 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FIbOlC/6ENyTOw24IyVQlcfMskHBGvSRHxen6WNG8RuPKNKD5Mro++g9xU78RAu1dXu4oSCqyfM8PmhsNy74++Sm5UAQ9Y6nKc4qMbsZnOTk0V8aZ1b5Fp69KgdeqBxGDIoOrkWm5zr2AAWlwXHO9wZpzq9MwjgY1zJHIytM/0FGDPH324Oc8qDD1RfaaMPnUrYIH/aaUvqE8myLGFLc+Otm2c8LHPxs4waH1rin3w+efrBPOqk7uU/lkHzp7gLCPQ83coByAEctzqjV2/8UJpxA7y34zBH1Ru8bF77IRdXgwyv1/LA+rbUJZlvscZ/e+9o4JWhHKl9g4ZFzxgquLTySeplPfVA5e+Q5XvjYOWTGdo5LpZ+jtcgQXaRjr8M6kw/v/LmPfdIVI0KaslY1s6uFeN74XyYzAp+W259hnwDrexFrg3L7Pn7+55h63+MG33YGA0TrwZruyo6yN+smQdi8DqObYiANGamGbAaJLhoINmug3xcNtJi5k9aFBYos0M6/W2yJh4v5ckbLqRrAJ7OIXrdcFec5Zq2kZLKE8WZRhRD5TCiaKh2BnJ5CizwDVPlAMBi+xiJNqLk2aWJPLif6MDbpQinpUErVWXWf0HAlsaAqfqhQnHxtrOH4pRqU5LYr6/Gy8SA5KsTWY/jVCfBAplDVcEmOP395Tk6PKNPB+Zxm0N5Ge1M= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wonmi1n9YJIEgHNKb1F2MShtUA0kO4QIkq7q8xmlf2a93fllhkWQeEs5W2ZLD+56v1XanNhC84VGWPaToM7TVETkMT/HfXOpSARqP7HuiQaZcCk7SlajECcLU0CdHReHDm/W+eTh0qyhw+lDhNv31xgEUEaid7Ju+nZCvREl8Up0J1DXF4eRW/1pcuwDDMm6dAzpto8ogfwNhDQR+VisH+ItScpQY3mYdtDeAnRmqu20OTgTyqcIjQUC9soFHPGdZcL3t1D6mom4FMkyL01irD+SlUfbQlcUE3plWE2iuj56F+ua3NI3cGjSXEerqsPVimo58+67gVr0u2Y7tmDU3Drhw+/DC6lazZyU8JQoG1R7Tv7dr1uh6/vFDLjmYjTjwkZWRFKdkNdzB28To78Vu7gxRhYEljXUt0KnyyEgnhzBKvDuYpVDMHU87IyzommP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1TACCCiuhHnvAhuUQxPlBq4aLyPXDWnKpYmo9/xCtLuDzrc9VDshLfPjf60PWJ1NSDhdRQcj+8F7JjlLu7859KBKjFWbkmNnhVCm5QfbEW+WQ5B0DXXHez0ulqhfcbKt5lN/HGxa3zXGdjtZ+YWXjg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9119c771-b144-49c5-8914-08d98418a076 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:55.7712 (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 048/218] avfilter/af_speechnorm: 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: ejUv87TMWy6I Signed-off-by: Andreas Rheinhardt --- libavfilter/af_speechnorm.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_speechnorm.c b/libavfilter/af_speechnorm.c index bc83a347e9..4a19c7b0b7 100644 --- a/libavfilter/af_speechnorm.c +++ b/libavfilter/af_speechnorm.c @@ -114,23 +114,6 @@ static const AVOption speechnorm_options[] = { AVFILTER_DEFINE_CLASS(speechnorm); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_FLTP, 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 int get_pi_samples(PeriodItem *pi, int start, int end, int remain) { int sum; @@ -568,7 +551,7 @@ const AVFilter ff_af_speechnorm = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .process_command = process_command, }; From patchwork Thu Sep 30 13:39:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30746 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp692101iob; Thu, 30 Sep 2021 06:52:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzt5iHt9l5YagktTk/Sp5ugb3vo9HnM7HkyO6G62AIsjMebd7b/r81qZhIgbSG2q5omREMB X-Received: by 2002:a05:6402:51d3:: with SMTP id r19mr457154edd.60.1633009962096; Thu, 30 Sep 2021 06:52:42 -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 18si1943034ejc.508.2021.09.30.06.52.41; Thu, 30 Sep 2021 06:52:42 -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=ZHcR2a1w; 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 A382768ADC0; Thu, 30 Sep 2021 16:46:02 +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-oln040092069012.outbound.protection.outlook.com [40.92.69.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F2566898F5 for ; Thu, 30 Sep 2021 16:45:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c6gKHDMz7AqH0imU2ulBf/wcpCALJWgdUjKfKIYx9QwcPVsm7TtKXZ2wvfYfQcU7AkSVAsBq2iPKfuk/UuFVyGK5Apb8jXL6g3BNk3d+OBz9pK2aRN2lBCvf6fNlKeqmvfYJny5bch7JhpZF9yc9+G5U9mCCjXHSfW7M+OHQpiQdu0k5JrKDTDpKM45Ca3ufIoS1/paddMDKA7d7hMDu8mABdBxAgJuqYUCpDXWIuTFzqvEYsS4/woTgtmi/XGdJ+Zf4v/GClrrErRSSReoLC4icPe8D8ciyqjpl8ATaTQ/4Nq+gYG6Y8bKS8MMzujcUu1mhEsok4tw1I8Cs7dguLg== 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=MI7+Ko0OordObD+kCkkWkf45WjH8E5HT7A2aaUBq5iI=; b=SBYFkiHnv6lKV4ebFzD1AoUm2KW4prifI6A9aVTcdwIP7yHW+R9/+ddYzR+cWuBbKW860Z4h3E/wzXh8rxrbJrDKTtriOtUlOn1T84QbCVjGLM4n1Hh1kcYIOydMVsOQKgnTfB4HMhyvwURs0PqkF//wWrIpjq6yXnag2K7fOO4ZfQp1DmgeBEWiaqUqptZ4niKi/Oo5bN2pu3iUraS8N+R+BkZwpw2NN6T1aigSnXQzQSvwxT7HVwV3++tQahq19+Ti7Tjg7tHxCFJZo+i4TVkI4ENPPeqMYCjZ44Yc6XJwf65qRbf6CCBLvLDur6nETs/Z9jC8L9pAjDlDsB51uw== 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=MI7+Ko0OordObD+kCkkWkf45WjH8E5HT7A2aaUBq5iI=; b=ZHcR2a1w1GPEO+ku0Zad2VI1nSmxBFoJgltCiWZQqVpA+8cXbjs6n5aL4uBB/k+u9yBG3wm6H9cj9vQOFdJL619ZWPKjnFHnPBSzTfgVdvyqjYTpNYgTzHKJLRcTNL4m21rDu+SUn9ZiWEwhVCLkLBXwpMLIgGLgX0V+7TPeeZC02XMr4E7Ghe+M1TLdDcdib5swmI0QrA27eWecK9ePCyiX0XaPiR7sE1W5yxnyPAMZImKHltKMamhOwSVHG8iHl2e2MBZfEo50TvnSkJhl+oDBY+UBka8yKLBeZdCoqmxHGDChekaV3dCI59CatAxDia+KNoDRuYrxHDzUDmt8qA== 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:45:58 +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:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:50 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [LZBLgbkgKns4ljHdx2RfzQv2OAP5/FUD] 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-48-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:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ac12959d-823d-47eb-5a1e-08d98418a20f X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIBqLe59qjkRp21wji/xErRRRFI5QUJRfCNVXrNQM3kC/hCFb2pcviDRflsMvYDPnglK2qBPYTudubivraNWqbQEDINde0z14QIzpwPQ5ef2f/AV2dy0XQq3AmtVBNhjCbqC9X0wb2+aa+cWdPhOAWVGSsETihb0noay4I9vttC9UGnkRYpbsIfXPK65VbqUCOHILrfk+BaDNvzEzTJDeC5fG+v5DiM66EnMN/Y+1vx18l4C4COHQMDg/qss6XWh5AGt1cHk45vR2ZuIUcxr0ttrKs4HBsKyQIE4Ej8xzez+3vPzoPDsV/kSUp5Iz5h+sM4p24Wn+o5tfWAZDv/3dECxGpJJqVuUFZ8N9bXdFyICzt8vJY/IpKGDM1Mym1e4jnsfQfFu8tDTloiOD+v2FfxSmnoSXRp+nRPshPTG6XP01/Xbro0zynwS4cb2tWILxaXQZgeysGmPGUJgDuSKdtoCedycIlz0kYlK6pAdFv2bBChKstRUpp2OD4lYraO/MQMVughFh2sAsu3oIhrRhYjhYa11OPvE8lLKmWM4lKEwncO7xnOcwihnXjomqrN/7tlszVEMpsEua8hy3zhMd5T88ZaSNASjuqzxv4PTJcdALjh1QsCK+FO4TI8fuJ3R8Ru7D0wYEII3b8RQrMjKZCmYloSPN9nhFHPFusUhOh9i+aco8CpFpdWOnH2C3DJZhh7jcMTo9HdFw== X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CaKggEoIsUIhwnV1SyWgFEQaTDjztr9LCmCBk1oMXs+eRyUjGFfrrXc+lvybC/bqa6zstK/VzaxmIO5JYiMGJHQmIR8OtBapNs5ysWBm+CrKyoCrMkE++n6PBT+FaZncZPk6xk0ZvO7IBpyOT2fuA/YYlhjeTPQyQkQU82DrBdt7PZjgztDc1TI2BCsD7fupR2EwmNKj3PbpPqZbD7Df6e2H12ctM0aF7888a6AeLkbDSvwrUnibNiQ/XqILhK+ZDX7r9CU/yJtFmpvnJ2RV2kaj4Y4PCX9BkQTYtnEL9exM3JM4Iwh8pcjupOWb6PxGPHAoGdx5wmWUHlWeC7bEl8fTqBcv0evXetq5mLs3D/qLJ/jdYOUsBFsDOO2YIT6rTfIw1Uqh5ziPIlO8XRXjY1785K+y6enrcTUJeYnbV6MZXDwPndUEfRjvSRVVUMS0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZJmdLOzMlVN8aZBtvJxFC/9W2qg8c8MaJFS0P+6rnoUb+BL8MFUquMM5PBbBfaJJKKX3QuMLqmEvpn2u+478A6qeAwdw7eIlweFxpmb7NCxG6A+reAC/0VEP5SM7fxWkHIwdyzR+d2dRY6FE+U9hLA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac12959d-823d-47eb-5a1e-08d98418a20f 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:58.5629 (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 049/218] avfilter/af_superequalizer: Store format in filter, remove query func 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: n4ASoKki73Js Signed-off-by: Andreas Rheinhardt --- libavfilter/af_superequalizer.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/libavfilter/af_superequalizer.c b/libavfilter/af_superequalizer.c index bf55f3ab94..aa73e92039 100644 --- a/libavfilter/af_superequalizer.c +++ b/libavfilter/af_superequalizer.c @@ -270,22 +270,6 @@ static av_cold int init(AVFilterContext *ctx) return equ_init(s, 14); } -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; - - if ((ret = ff_set_common_formats_from_list(ctx, sample_fmts)) < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -373,5 +357,5 @@ const AVFilter ff_af_superequalizer = { .uninit = uninit, FILTER_INPUTS(superequalizer_inputs), FILTER_OUTPUTS(superequalizer_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), }; 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), }; 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), }; From patchwork Thu Sep 30 13:39:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30754 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp692875iob; Thu, 30 Sep 2021 06:53:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3NWsqDtDTAed9cCJXb6ug4qHdcXh8aG6PnSJEpc+AhsQywHyD6QZPNGSbps/JPxjnYv6k X-Received: by 2002:aa7:c941:: with SMTP id h1mr7477173edt.128.1633010019721; Thu, 30 Sep 2021 06:53:39 -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 hz13si3641980ejc.2.2021.09.30.06.53.39; Thu, 30 Sep 2021 06:53:39 -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=qtl0N0Hb; 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 9DC7B68A98B; Thu, 30 Sep 2021 16:46:21 +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-oln040092069048.outbound.protection.outlook.com [40.92.69.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 845A868A581 for ; Thu, 30 Sep 2021 16:46:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LSCdDphydk+SIH0z5WVV9dpboXh9t/eHmiPQWO+MxngQV6WfSMaED2zYPBeUa01bdIftnfcBP0P5P1UpdZVpemF7FMeTwm8SRgLSdhTeGDq//zgDw55ygx7Aqt3+Z8IRtmyRqBCEt50FSiIrWXVIp47I4NZWj6w2Vru0Uc0FHIDSfzYbDHaowkidgsc5N2/gaOvcuRvzHhKvSX7FZztrITX1RkARPZMEpbYK+dQd1jT4w1wqcqMrFZxyU4Z+3O4sIG3qXVVlLvcK312BJMwaBsSLqNxwV37/rQMzCkdDNboZ8plCPmA64nH0ak+YRo6YpXlrlyswNNf6DFuc2ZZnQg== 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=Yl0Nh7T5aTdjJhjvWaXww4K2gi5ZUaEKDQq5j8Qxm1U=; b=nf2CHiWW2hdCjY4YIL7qJ18dG9W2IHBTBO+CUQKTYHNC0lba3Cd9bjgTFI3wgZ1Bf9LbDTNVFqniudh4PlviiacfafGUsKScHGma9e+sZq+tTh56hnHJr5pOWCeLC3VVX7MqajUgc7kuOpyn7nkpobLQw56z1EsB5DwMHnit9dNovssEFRUkF6c5YnhTKomocXLKMipAs9O1x72ktH5AQKscDGFV80WrDjUpBGjeHLRpqPIX0dyDHnpZ8pqSfqekZr5MlTczczZJnNa3QUuB2mjJ120Pkq2YAChmSXJHuME54B8QA++iVP4fWTLGGq9KTCffxd98BzT0+j6wUWvqvg== 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=Yl0Nh7T5aTdjJhjvWaXww4K2gi5ZUaEKDQq5j8Qxm1U=; b=qtl0N0HbPSxee3oSrbdhcRFLPtjenOZcCB8mtSi6QjuEMzs0y0m/GHgzOrmhyNgXpN8tq0s+lPOuaIwWLUY6Wyl4qnXTXhayG+Owr4s8tiX0A5zhwT6MqfFxgfdu9rMurnxkb/tH43bxuv2i6S7qa9iBWCjkfhlpeLNcxKjmQjGGE9Xj8bz3RNanPcWxBsZ+VZuXB5+8ELg56oP7GkTgdhpHVwsBZMw8kqyCo5bjmY0COS0Gz6XhlNgfqDiMOGbw31hEhVajpZvnOxLo80riRKz4ePXz3zElp3vzq2wekDIIYhKAz+eHnRm6wUTPLZjY569zpRWZ5YWizMPrwsA6Mw== 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:19 +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:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:53 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [BHLJ0WFPG2FPxts0tA5DvV6w1zf7T2bh] 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-51-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:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65c46055-f8e7-440b-5459-08d98418ae8e X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FMZ+sjotzuy8VsuCv/Qxm46RYSl9agxO9/+FZ0pQWc2SYdEegHBMaIOTdRTr2DPZ/rEL/JYsKTGCtHMzqCB+9pnR3T0koAj4jpsNRs0/12PU/pB7NsNbqcx6rnA5HQE19YOiW3fiEzLVzmd03Y1Wqn1nsMW9G4euWe9ltWBVoVjWguhmpxziNPkTMpWd7zucEl4r+Z/3bd+9Rw2K2De+zhOziGjqqQs+4M0x9pLUnHwNt8Aj2mzbVmYyGshCq7SKZDSVYeMjv7pMwDUWRKYZefVnf0tqmiFYNnbu6jcOjvpq8NDw4dIbD+cdnEkM3eDHhMCl62aXevUJSDgWLrc3N9fSYM6a/OYA3arjuVL38sD9L7muqDJm/zpDdJB8piWdEqZt3iQ6WIY9PNxt7bV/PESlkHPaiXYk3V9+sKV2VrBT41UJj47esu10/Z0wl2M0EiLrb3N5MstrfGkZ/3ePDZOyDed3ugAFipO2QdeHe7NBT2X6rv4OTrWPn9Vn74jPAz/eAXqLoHe8nyuyzv9fFbPvD0yTvWtpkEaeoHDMjitrRkZw86UoVYg4OXZWDdkDdd4+ck5Z8XUdMyT5huZOtgjLO6LeAVvCT+awr59d9W53IS7IG34mvZTm8JxGgILLfURkuDzgtXhl33b7qr+XGZMdH+oaZDZZMVRA4YKx6l4J13+YqTYUUn4= X-MS-TrafficTypeDiagnostic: PA4PR03MB7246: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b17Q8dk8zt+re19Qdve6ZPIjpShjozbq7wd5qh3x9K2xeva4DfLyIiJFrKHxEGBa0w3C0ean6a7JycYedYXgxEyjykXlqCDq08Y4+85SUUS9ut4/ILgjPvKANxhe7/8m88VU8H5IJel8j8RrP8luLVkbyirqx+5M7L3qCU7QfAIxmJNp4rUqYcx7XSMQ2trLPQcFpuaoyCpAiEHZaUHvwttFBTr2l7P2zl0ThIvj7lC+bm198qEV9C5D0e0ECQXHjB0ZpDVWLtCWZpszijj2x4Wr7jfenm/KMPSbQtYE8fVA5ITW2DtyWia9G5bAZUbwG/RSmlNMamQP6I6h6D4bRLCBWJ2YS+23YrgUNT/ieUawWrY1mFeprjk5aHXsoAQSdG8+up4j5Wz7Y6pye2sXo6iFXdnB8yZOYTHV/itONg7KpKkmE31tDyb8XtBRdl6x X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: X46R7lOk7GGDst+VIyeZjzn7Rkc36kh+/LDoNlz3AVZvFJlyaoTNgiMndi/AIUKuWxXJ9ckvsE7lyRTuPCtmIaJONuT/+W7xqfkehkGqDHk4168fNe3pWfaXcV0FuaLgt20WT7KiDmFmaTCm9KUACg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65c46055-f8e7-440b-5459-08d98418ae8e 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:19.4938 (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 052/218] avfilter/af_volumedetect: 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: zWQjrkc64o6o Signed-off-by: Andreas Rheinhardt --- libavfilter/af_volumedetect.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/libavfilter/af_volumedetect.c b/libavfilter/af_volumedetect.c index ba49b3ca37..c137cc7e50 100644 --- a/libavfilter/af_volumedetect.c +++ b/libavfilter/af_volumedetect.c @@ -33,20 +33,6 @@ typedef struct VolDetectContext { uint64_t histogram[0x10001]; } VolDetectContext; -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVSampleFormat sample_fmts[] = { - AV_SAMPLE_FMT_S16, - AV_SAMPLE_FMT_S16P, - AV_SAMPLE_FMT_NONE - }; - int ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_formats_from_list(ctx, sample_fmts); -} - static int filter_frame(AVFilterLink *inlink, AVFrame *samples) { AVFilterContext *ctx = inlink->dst; @@ -150,5 +136,5 @@ const AVFilter ff_af_volumedetect = { .uninit = uninit, FILTER_INPUTS(volumedetect_inputs), FILTER_OUTPUTS(volumedetect_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P), }; From patchwork Thu Sep 30 13:39:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30731 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp693092iob; Thu, 30 Sep 2021 06:53:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0yUiFaDyQvqOHCcwzuNlJbpMgUB53M45/KetsKOA4ShYKPn7sHQuvDbKjeDFLjy5449uN X-Received: by 2002:a05:6402:50cc:: with SMTP id h12mr7617429edb.112.1633010032386; Thu, 30 Sep 2021 06:53:52 -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 i11si4663349edb.132.2021.09.30.06.53.52; Thu, 30 Sep 2021 06:53:52 -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=N1oiRQNO; 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 82FD368ADF8; Thu, 30 Sep 2021 16:46:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2058.outbound.protection.outlook.com [40.92.90.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C25568A581 for ; Thu, 30 Sep 2021 16:46:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k7jZVT2odvUaSbQMqpf2/r6OF05FTQSG3PEaryEWmITQFnkMjg4KQwrb8mffXAoEooOEN8KtUxrWn1LQ3E3HUSrb22OnbMDRDxecrFzBfmo19JKtcLbWINua3GcQ+2Li+ejWMMljbLDSNJwqau2o6p6wF2ikRA+01XmBR28rG9MAKKR0lepr4yrNqwp5F1oICaNvegS+wdAL+5m1dREQ+YciEN78UfTYPtg2a0zvbVWZmwuhjmWqpr0HDFoRPIxA/f2iORzaMm9zgenFwffDQuLZ38mliUh+zxzWAu7pQLCZ3nKx00XnXLNrkwhzPnx4UEZ597iK0bsFLhR5h/JERA== 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=OXHT7NUMykAb2Bajq333PQTfBqJb35Qz7WvkAbAUyME=; b=UUvw3UL9YDdayEPbNHdeaZdZ4mhGElMrO8lAXwa7dcZ4WMIT697Ij9FTwWj9y3w84FmakiDFAUp2p4Osum2kkryomic05jho1eNXrOYUfYQkwCRAz39n+GQ0KI04BiA/MOBGZlLhkUe7yH7RfSl85GYfIamimhyYmSMWSgV1iTWHPzoTaWPtvqtFcDtAlV0n/oWE2WDDCJKrVIupC2tJkhduNyGnFr9e/JUIz5N/a5zh0B3Jg9jh60IaqCCBrQlOL+KsE3QsChYi3PWvlCrFBzZnC+Q34xAsNPAPQ85KpNGHE+Jd3c0w/52YMWfJhmFXvrCeT0tS9XSbUapm7m/F9g== 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=OXHT7NUMykAb2Bajq333PQTfBqJb35Qz7WvkAbAUyME=; b=N1oiRQNOGGbxoFQwnxcUsdiZaYxq5++Fu4+0emDCTi5VDKxrd7qWGuvhcQQMu0DNT/rFz2W88GDj6q251LnIuDfrGIxNzl4y+ecd+kfTH639yzvJmPRQshUZbXnimIUcRLA8MqCLu3q7E5+18Am4/8tFa0qhHxXhDFTS9y351ulq2SmgCl7kXoU31P1HtXB/cQa17v3r1Sb72QOIIUYHYTa8eo6pK/3Xefs4A+2u9Oy/DD080imOr3WMiEdrLSasmf84HuDi/YXWohmNexJyyofq6fRvGqft20ZaZM6IpHMJUaBKs3AFJkRa+S6ikaDrUdVdB7v0hV6QW5EbueNHeQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5163.eurprd03.prod.outlook.com (2603:10a6:101:21::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:46:25 +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:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:54 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [jDi0MkZin4HOXE9ihymcSyPJl1YVNDNR] 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-52-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:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fb205f9f-41b6-4925-4a13-08d98418b20d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymIOARQAbZ9l0nWhlQq8d0Q1nB0j5z3dVvN3NFKdLxVEwAKRi5U85ao0YnIZCLHYrLV3G3cZyX7miw+IBonLTTxuSH3MtokrBjU/MBAOwSXq+BFFKmhulKH1Y8dXGxwEYgstQVilKUVsiQY38x30iAzgPeIkx/yv6+rLBMX8iIobvXwaof7DEiyhM6G/b9jgpjsIsS5dambMtgqWxKwHEDaRCC/kSn09cYfqEUBPjRrEASwtJVhJ59NTZshYWsp+4TT6y4boaaEESzqSrkJzr73hj7lsveYfYeP40X6j+2bVrvmY5zMd4jk3NNiITRMMgAu3SNUz6QmCS8RrPoThbfqU9vJ+0JXk4x6AF0Tq/nY4vdAQ7w68yGXzXTyEnnQ8mySEIXRcbRmIqcmWhZ4/mmJzJ4ITyfhtl0MjYMHWWqhQCTbPySMBE0ZMtSfVYXozHT6sxtrqeAjhjnOXZjqFIVJ+g6qXiEtl6uRSCzS3Btuztug8ZdvOyJ/v+j0ILjr3sDnU3XZ33D+ADyV0teshZXVjFIFt1OcE28KZGNGFFwJLl3nAkdo9pSiGv1zESd9OoRHmR0yNbjBYu+B97MUeJS1PL9S1A3EOl6BpwwTNdSEWVOBPxrHMV9trqWT4gq8K88QLPZqCKQWL68EmfhO22aIyiNXcJeJ4s0tMjoUtofNLAyf8h0vVNElegB0SKGfEIaWihdGimfOALhfzoDblnLZWI+Cfnm8r1Lw= X-MS-TrafficTypeDiagnostic: PR2PR03MB5163: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6BMlBhYQsTbdJMuAJcOcJV9pX6/2yfDHFtUXz/Tj4zz5hDAo63xnmrSTkX56iKWY44ci8WQCzRZ9I8scH9RXKPXRr1bNrA81AUwwJK5kWeNtVjl9eaMv9BeqXsM8RqSBctiyAONxXOJ/B6oysXEf/w4TBJpgKtJAUHfpqLQA1QtHqAVJRHtogsAL6SRnMSWbRxoI8XtpdkrnQKQY0BwnizXlFC7bkV2TYIUTsrJs1hv35E5xsEsB3I/d2W7HCiwflkU92RIzLY/6y8KmU3qvLrU6LHTgo7aze2zIiO9Jo08O1YQ7gNT+9cknOt/5WZFvhf+XvIRz9QtYYjftpt6NWoCWctWbARzNKGPunthan1ociQOJ6zxDKKbCxXVRwRedFGJjPfLAYWxX5gdCOwEPuL0PfqBpbAoiD24HrfkvPxKPZ8KUd251PbFvvvSUxLbW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YFms8CqXOpa///et7JFMJSE57C+HvtJ2MiUe8CN9I3akTcOmNetc/dixbv5KqkeaoTT+wroQ4hmR+ShrBpE0MtjoPqWsMGwpgv9qDFxqMEZWFRJWxRORc03SjLJe5WDPlzOpzm3yrHxItcjhe339mw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb205f9f-41b6-4925-4a13-08d98418b20d 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:25.3152 (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: PR2PR03MB5163 Subject: [FFmpeg-devel] [PATCH 053/218] avfilter/af_afftfilt: 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: mCNKxUa0xjQo Signed-off-by: Andreas Rheinhardt --- libavfilter/af_afftfilt.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavfilter/af_afftfilt.c b/libavfilter/af_afftfilt.c index 7714f1768f..a135a99d94 100644 --- a/libavfilter/af_afftfilt.c +++ b/libavfilter/af_afftfilt.c @@ -417,23 +417,6 @@ static int activate(AVFilterContext *ctx) return FFERROR_NOT_READY; } -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 av_cold void uninit(AVFilterContext *ctx) { AFFTFiltContext *s = ctx->priv; @@ -489,7 +472,7 @@ const AVFilter ff_af_afftfilt = { .priv_class = &afftfilt_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), .activate = activate, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, From patchwork Thu Sep 30 13:39:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30735 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp693275iob; Thu, 30 Sep 2021 06:54:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRFDn9pAfANoDr8KQiGfaeBmx+J2ySPKOKt7uOae3igPy9OvwR699qx3xwhcCruDL8xyLc X-Received: by 2002:a17:906:7847:: with SMTP id p7mr6595384ejm.335.1633010046748; Thu, 30 Sep 2021 06:54:06 -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 y20si1483173edl.579.2021.09.30.06.54.05; Thu, 30 Sep 2021 06:54:06 -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=n8Z9wP3i; 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 5331668AE13; Thu, 30 Sep 2021 16:46:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2058.outbound.protection.outlook.com [40.92.90.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5CEB668A609 for ; Thu, 30 Sep 2021 16:46:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RPWJML7NWwTNP70lzSVBsy3uMS1qK4VlLiJKJ677QsPOGCI0MeLP3coMiomAXL/Acq3LNK49CKF4Snv4S/IG6cQsubN1FJ+2U0+xOx9rGxLJe7ImliuT+XrHHnGAGhxf/EJ9nEw33uXVK9tM2lfsYD7MN6KxDTGmUte/QfS6V/Bm4VpWdIWkWJcBvoTldXydhhuloAzJ3oqNSKMWaYHNEyzCrz+Jj8MOrI5+6bChOfPs6RuR2Nx82vyaBrcRNNR4+2h51ddw80TpnYRgQEzQBX7G8/pEykyq6GwY7iUweKuTgEPkPvBIRPep9i+W53UoPQPZBv+q/iOFfMGVYGhEng== 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=EUlubkMkubfMQmvHpQYuXJI8ShiVVBAYt58P+IpSeZk=; b=nfv7U1jF1jiPy0p/wPKyOjryci4IEC+uG/i+XTaWjHSWZYejtkA+H0Zg8EI64Nv09kV8FfjiMsg8l3175qVEpVaUQXqCp7a3UYuat9dW4j7qUQ0C4CJSFDsWjxW4wG2pbCNYhuyG/JJFFpHwNi31XofpqWbAi/xyEkPYUrJsJbn9pS2HuzV5EhE4n8WA+6d++fEkJ738/4FN5bVxN7U6FcgfRX1gKgbKkIuWR27vZPUvp1h8d5Bm9ivKXuqbxOm24MsooSoIBKrG+U+aMPD9V/NlbmJNQd1tGOYqIUZa3i2/3S2lDxpptcs/sShrrnlx1LdN/KeMkbG1ymaKkfqIZQ== 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=EUlubkMkubfMQmvHpQYuXJI8ShiVVBAYt58P+IpSeZk=; b=n8Z9wP3iMwMF+T3BrSX6AZZD4oqz59bILDiSPFO+LN6dvQcvNF32hrAcfD5d0Uye/tr+ztTVJXUZUmhAFuZ352HZKgmWxWlutiAXIpDjXnIWBPaN4+gGHheAXOd9xYk9p5m6rs1rksgQl7w8/Q7HTMrZ3cNNH1t2aOtkpWOKi4JGWiPdIWWrs7plGj39P3dfMatuYuMzECcDq99QEWSYa/EgHL+8sXchZFcnSq45X7rkpmeoyYzjtWwd4dZ5SODLMQC+A5BI68gjsxl0EIokBxb5pz5Ln6no65VJ92pl4qz+xlp214xYw/A/czJE7KNLQGTnBuYJvkT0AYCXVWKucA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5163.eurprd03.prod.outlook.com (2603:10a6:101:21::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:46:27 +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:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:55 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [rH3Ss8JT8+g4s2Ik8WQx3R3m2BoyhgvQ] 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-53-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:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1fe54123-c4e5-41fc-bc32-08d98418b38c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZJTXVNLfSoV+zzBRHPeMYTf4veONp7FYGVPypwGxedjw4E0IhgVKH7f0lcJV5/HXaMN8XaUOEufdWnPNZUbNlbFrQ5OmIaxlXApoeZCWn96TvjoN3pgWuhoJVXkJDfJ6qSsIUiEZKXKePWUodych5lWOHAV0Cc2onVdBOIZDHeNQuS4pDDHIG8q/DN/CfgQXoR2zTQd1LVALJMMI/bFAISD1Zq4/BmO1KBTDMFobnk49dexAsb5r1Qu9OsSKi1EsP5AN5hhdBHl9OE81nYOFszETLEvf9yMBMooQT1sJqiFP3HO/hpXKnmldTWy+Qw6Vt0pIQNfFMavt/uY0F62f3Zuz1+CnGs/EyCm6lUC5PpuDoPgdzwTOXTt78W8myyBdOylA17mp+gItOnmTnYM1ZkaY1Rgb6eJU+C4I+6VTxtqzIzp7bBGPiNUOzTBHyIC/CI+ZcN5e7od03lkTtJHFZtLArhogRnMR97ngKgB9i9bJjU2PwvPL9gQVRzgg1ByB6Jyb7Bo5xMN3texYwbQE4beVEssWwm53qIPwA8yI0IerQ4J5jnKa2MfUS7B4KMlrFLFOmovKEcTSXVu2sKpOTbJmDwkIo16kBuKgpPtcTUutmlEPzvwTvumJovYumH3XL3YOSHgRgePq3ffK1mNL4cjRegBOKynCfD686uYAI0V+ZO2kpGijjYy+aocCJTVJ4= X-MS-TrafficTypeDiagnostic: PR2PR03MB5163: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 61kg/Uerh7HB7EMAEvqo9JJDRZ4v2EKnIEAEFAutvBqKGX1ONBLWZOrylS13/ZcoZnLy4ZIrpTGUG5nZ0a7fUI8FU1QmJWex6daOHWgUMHrIrYKsKuTRAJ6aFjiVNqOR3kyRYxJzfXJJL2xxpWS6/I9cyI7WWbIFP52k0FMHiMi2WoJIz6ywfRCyN4yDrgutHYIZDsVSasbSPfNhugAatmIL4o1nrNvy/FaL1bOjIA+xtvavlTB9WJXJYH+q6KC22BTnqKjz4h2SGuUtEbW5D0B3QwgWU8qwY4H/6TE5+J7ZL5mgSAn9VVaqfpP7U7HFlszH0VuHCE/wZ3zg0HkflQG7ucHxlFHTg1wJCsF1NrENIU6ghNbRrR5m1sjk8MBe1xVWUj1DKmYh/4CdqOmV+rig8UuKR5rLbMnp+8oT7ZOawnjqBiOInBspgkJnGQ+I X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1/cmVdfZbEYvoJ3EOvp5mNpRhqAnQApxzGiXkdqUUi8sDsm+3nnTsevttndb2k6iV5rmDAvSoSnkNLl1oS8WiVEPfZPWsQuGjaUvaGNeEuI74WarL1AQi19FhHG8xKBQTfms7Foihpb/Mg11rdf4rA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1fe54123-c4e5-41fc-bc32-08d98418b38c 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:27.8421 (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: PR2PR03MB5163 Subject: [FFmpeg-devel] [PATCH 054/218] avfilter/af_agate: 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: IE7cmHp/ckmC Signed-off-by: Andreas Rheinhardt --- libavfilter/af_agate.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c index 568006c1f0..64e991f2b4 100644 --- a/libavfilter/af_agate.c +++ b/libavfilter/af_agate.c @@ -185,24 +185,6 @@ static void gate(AudioGateContext *s, #if CONFIG_AGATE_FILTER -static int query_formats(AVFilterContext *ctx) -{ - AVFilterFormats *formats = NULL; - int ret; - - if ((ret = ff_add_format(&formats, AV_SAMPLE_FMT_DBL)) < 0) - return ret; - ret = ff_set_common_formats(ctx, formats); - if (ret < 0) - return ret; - - ret = ff_set_common_all_channel_counts(ctx); - if (ret < 0) - return ret; - - return ff_set_common_all_samplerates(ctx); -} - static int filter_frame(AVFilterLink *inlink, AVFrame *in) { const double *src = (const double *)in->data[0]; @@ -255,7 +237,7 @@ const AVFilter ff_af_agate = { .priv_size = sizeof(AudioGateContext), FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBL), .process_command = ff_filter_process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; From patchwork Thu Sep 30 13:39:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30764 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp693455iob; Thu, 30 Sep 2021 06:54:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHvcqSTD/B8bIIDKwL5SJorIfPKUA4B4jut90A4Q9RQNvDg9xjMCu42m4nsh9VfIWmJ9lD X-Received: by 2002:a05:6402:3088:: with SMTP id de8mr7457950edb.76.1633010059374; Thu, 30 Sep 2021 06:54:19 -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 bx26si3487254edb.432.2021.09.30.06.54.18; Thu, 30 Sep 2021 06:54:19 -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="nTReuJK/"; 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 3A78968ADF2; Thu, 30 Sep 2021 16:46:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2058.outbound.protection.outlook.com [40.92.90.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7136A68A581 for ; Thu, 30 Sep 2021 16:46:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=akWE7AefjEuJyWD7qhsqmG2kmM8xIrOz6dVZ+VQ9i/Y5azWJleq2HAhvJNbn5YGBBXnEWhhhJ/ZG1txUzIbDXgNTSysY8WvMmJvev5ATw32GIjG6AGJmaaS4Ni8ShtQhtRJCnewuhJcU6X5YJjpvT3MXn3Yo1DpeVGwjXOBDEaIw4Oug1MUrB3sbgTUNVp+2VEu40QGcCeQjaTw2PQDk2sPloPdj7UMJWjNBlRTtsOUzM0wFvcanY+aJ8H5h4RGVUxOgm+hfhGcbABm8jrdWllEMQDldfnOB6HckRBLvKpZrXmrM1KbMHKgft6hYVUT15Dl6t5v0OG2YwFm6075SuQ== 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=/NKD+j195nrQAFXRruUcLaRDDRyR7yvMANfXuW5VbAw=; b=UMrAUeZj/Qh4qMlz9REDL4eYNfKWeIHT+QUOjE7n/n8MMwBXnPZ0Aat5WSn4MHy4cTXuxhcUjN8aOQEh0a98AK4UEE5sTeuZ8q3Dpr/u+0uHhzAdfEZRH7kZltHZsO85nFC3vXxVnCFemVEl+dYU4fBIF9o+g/UI6Azn37hUwbUUIgerSc2ZhdWXu2mOQk+S7XxSEhCK0KXCZ5DHFhH1Um6RHnXGju1EAe9IP88W5YX7CgCbHDDMHbV3WLdFIVpWrdQkjD/QI85n7aUQcLDMJok8z5MfhaIejElRlqEZzwRk1VVhe2P4Vl6yC5gEnXzJ0s+50P1t6SQKu364PaI24w== 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=/NKD+j195nrQAFXRruUcLaRDDRyR7yvMANfXuW5VbAw=; b=nTReuJK/2ggA8LZlI4MYLWFBTjIyqk9OFEbhmWu5G9UTISCZ5yIMRSXnicBxUUntlwDkUgjhjlE9Hk/TQtHEPJ8cFuGAIyRUa8cTxpwQa52kMJfUApQxQpxw5XohcReR8nleQyewTomnMu/rMx+5JNRTWXRgz1t3e4yD9Zdvrwm4xYhV81opWisborSBmPoSQhgr8FUlw8vHSislu1kdoW0eldL5+AtRkKezzYtOZYBJQXX/jgMuOXnH5k8ECMJyuYs+ta8q8QWT9JC3s6mj96LfcsYVwhPqQNddEf3Vn+lVjiRee5Gp1Gn6I7Dgf3lY7rqPdtcBy/KcrbMMb8TAxg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5163.eurprd03.prod.outlook.com (2603:10a6:101:21::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:46:30 +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:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:56 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [CxdFbn4HVu3/SzqY706/OzsAwYVRhUI4] 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-54-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:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 04c9d929-4ec7-4ca4-dca5-08d98418b4fa X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOddO3cs4VPgtb/iHUhgraew4c6cLOOORoLvinOI/9KhmVHxl5ATYpEXV0EpHRBV0RYJtH5Yu088CWDVkdd7ZGnat8flGOA8QnCRJBHL4OGS6rE3h2scZ2653gRey87MWa1Dgd4fFEXUfQ+nLTYWC7OndvHV9grlodfatApliJ4cSRItj4VgpHF6IszIz04N9piT72lXVH4XppVYrQVM0W8SPfxrP5AjdVj+DB4A6wf8QvRfiqlmjE9tMr5kNDukoK01VMv1Qb0m3yObWVrmPtZqzMVw9agOk7tcM7tXgLVvxMceE83HA6KjAUHVlnOp8wDmA6cO9W7NTBeZ8UkEscIA1NiwrEI5jdA7Fb3jx1452Y1xjwNEkGHrBxGgUK4qLFUTqFi78sqOLpZLags+Vz4ale6bIm3h/7gl3/IDIibHX8W4OiZONSLb0ztukNk8REIxg6uWsI+tTkL6+z1Cys2xjqQbXTdhIYH1CH8MZdKQKs/9xxW7EAVtY3PxWwRz/YV5BKq9dCEYztTJGfpYLFDObKn7etIt5YnlPtAsfOPx6otBr7T8Anz5G3rUL4cjJt4+03P2ZTVllZOl/ZA8nVnowirfLinlkOjznyV4+7qHDCG/vK5NoDd12GFO5+MapRCajEQosvmevYEhkOi8k5Y10lumvu/X5yJTzSNjHFXRaSX7uhc+EIeae6VJkYM8Jya/meutu46KIfdVvNE4nVZApmELZCFpNg= X-MS-TrafficTypeDiagnostic: PR2PR03MB5163: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nP2VSVxjtApPXVfU8RbuN9Pq4tZ6Th5pt1qVqSIGgf+ayiiwOKZAGfPSDQ/QJZEOVWCBzqljcSQZPskTfJZxa2tyzbyu5e3MVDqfMjQguENSFS0dF9Y5134DnRB0xgYJcSE6BUheaxPswzmQA6OH4lPqIfKBEcff5wfDhG7l+7aDBS1OzMiniroqtmv6wh6Tv6quvK8zcbZhGeTCLHD8YIt372IkVFbhNoS+eTzYizjnYcywixOOotsryVIwVIob1oALuV/sv31YiFY2miiaLzfrEHg0KYRAEF3LSnxs7rudh8KI4jNQxDGO/rNauU21MfFKnPpCLAqdP/IkPyVJQg5SN3FX8kZLyOwPFONrP34f3ADv9EPIPp1lZ4Xfsk8oJpBHKhZby8z+mhZPu8Uo9y1ktBcsrhZe/SHVYSrw7y5/R4FROSNkJnvXhUvYHgdR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YMmh9i+e2d9pSzQIYf/FDzXVMBKJmYLaZ4tNhCyCJuReJc8/P0t65F0U+yZEMWZzQDAIjtlm5t0NNGj/CYC2+Zp9yymQLbzqCmkr94CompCurK7jXAkzu0XwfkHM+MSSV1IL9Wzx8Rw8cGw/+5bnMg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04c9d929-4ec7-4ca4-dca5-08d98418b4fa 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:30.2276 (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: PR2PR03MB5163 Subject: [FFmpeg-devel] [PATCH 055/218] avfilter/vf_amplify: 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: 8Ybh3JUDxH9B Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_amplify.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavfilter/vf_amplify.c b/libavfilter/vf_amplify.c index 558cbd918e..ed7dd80b5c 100644 --- a/libavfilter/vf_amplify.c +++ b/libavfilter/vf_amplify.c @@ -50,8 +50,6 @@ typedef struct AmplifyContext { AVFrame **frames; } AmplifyContext; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pixel_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, @@ -78,8 +76,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pixel_fmts); -} static av_cold int init(AVFilterContext *ctx) { @@ -316,7 +312,7 @@ const AVFilter ff_vf_amplify = { .priv_class = &lify_class, FILTER_OUTPUTS(outputs), FILTER_INPUTS(inputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts), .init = init, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, From patchwork Thu Sep 30 13:39:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30753 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp693652iob; Thu, 30 Sep 2021 06:54:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXnLd8rJRBA7VTREQALjiaPGfnPXGX9LN1dNhVQOfiJr0moayh4bjo3+0VnWKWAYVF7JSf X-Received: by 2002:a17:906:784:: with SMTP id l4mr6719360ejc.469.1633010071007; Thu, 30 Sep 2021 06:54:31 -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 ch29si3252450edb.479.2021.09.30.06.54.30; Thu, 30 Sep 2021 06:54:30 -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=GZWrWPNi; 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 436F968A7F5; Thu, 30 Sep 2021 16:46:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2042.outbound.protection.outlook.com [40.92.90.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E965D68ADF2 for ; Thu, 30 Sep 2021 16:46:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LYgEuXOF8ONyk54xbjggW4fZybgQWuPlM3qLYMnwZh7EB4Bc4G/DVnJTPd8lP5x9AaTHRV3mioNOM7nkB+zVABgg166MLdwrxNTxaZR6p63fcZ3Q7zCTzprS5D4rczle9sXl6qCTxnO6WZgtifo/gNjEWAQyKtsKlgLcBhzW3PXeRQSdLPfdAgStJwItBUIcfjF+/UZ1kPA9hDTGlA08b5fZKmQIoSoAX4dsctp6m15ogwwK+4wQJqdkbKDUqe0sjGJPPYb0qDu2TT+QRbUO6seaZ6i+Ceb7isKuqpGUaBCzJLtjjwZ1Knrnwuba3j/eqmyQqp3kbOvyJsqXsfXMkg== 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=RnCY9diwzkbxk/37l/UeMC+wwdlU3xVxkSTfEzMQnYM=; b=ZuwgExF5XGoQ2lG588EWmU2cwqfc5ppLubzIZooqJuFJQHhjY/+elqH64H5POqSv+wW8n8Npd82bz7nvURyOhMXryDsKa1PrWKy0+EY05FgbS1Sa+72lNBRIvwMftpluy6o+/J69dBmSJ7XfuTqQyK9/fG27x55CRsBRfzqeRKlBeABi+XCWbDbjrzvCCaB/82rm2bU4Ybn+wsA8DrjJEwibbM2b9tS2c1mGX2UV12ETMBYvNwqrCHBjj345rw9Q2lzc5CPAPqQing2Th9UQMre9IbavEU10qJIxsfaRjozmECl2LYLyRSDCWAronxCqXrFW2JC+0pDHjOr0DzHABA== 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=RnCY9diwzkbxk/37l/UeMC+wwdlU3xVxkSTfEzMQnYM=; b=GZWrWPNiCpMI9+/jI/rZymOGvEC6D7QKcBlE/u692z5Jy18ty5Z99QVg9qnHG22tWG5h1mtjtpQwy5/scAbxzuWqw1tOl1NqWMja2cSMS1o/9D4+a0JDc911BOlpa/uSFOI5PZSpmLQG0fh954C9VYbUu3RVFYscYAZc+0+9IsR+P1sb/8HWdAnuxlvKLdJevHObkuzwPdpf2z197uEGVvPjiPou4JWtjdV48RJsjHf3atY691AzCRe7/1fN0n4r3bQ04eHmYtJZ0hUaC369SURkHU63Iy4FgcWZDLWiare+Id7S4piIWAwKVpjIwNz0x56hY0W5K1JTKjK7AzBwPg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5163.eurprd03.prod.outlook.com (2603:10a6:101:21::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:46:32 +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:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:57 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [269k4bDm7sDQqZbDIWYX65tJBC64jK4C] 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-55-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:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 226e7b9e-a0ce-44cf-bcfc-08d98418b67c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FB6++p9nZaNC+bsk5xduRtp72VlmnzA/zMiZWhY+HnRxIyviTOW+lDHhgnoihBIAC1aJ3QTerxX63ZV/4NFyw5etURSnXbAzsoqcZeqoOrGefGrLg5UdBx9/hpDlVjdUfpwMdw4xUmF18PNb+uKCZ2O4e5KlHqaVHYx+iaEMj0YTugTx4xBG4ekaL//EBB+xTsOLqdr6peEMHatRwRVsN/QBFnWu58eB3iJoQSxKwISyYOWjDeMGe1nGIjxkAP3r2jeVzUKzHwuAgwrwXidAsqc/2PTp5HBrylmv6QfBlmlemb3tNZZ4Kd5MRLdYdErWadfE3+vAC7zjeTR0xjUFS0iI9Au0TnUV/vMH9cqxRJQG8YW/b3IA9dmT/rXheWG2Zkw+mB9i8rYcZc+HX8vy8zdMTlG9yeT0hqQjUcXLyg1D4t73ENJDi5JxxBPIDo9FzFX6WwIEeWBf96Lzn779/pgbZoyBwKj4AoZySteaDI40Nw5qotAPrfJipiPeU2XZwoZV21g0QraGmGyyVAoGKgXz4eyTO/9VIUDqWLLOGAx1u2lQoX66VFMzpfHVgtUyxvfxPxsoV0Opo1lyKYzSQtr7Cg2hq2BfXC/6TgtaFPF5OidmPK85EhgM3qcogfqaB244nhYNXaHCERCmzMqGGElP6jVvfI3v2oDAi5w4HdMFCUM2oLVMecs= X-MS-TrafficTypeDiagnostic: PR2PR03MB5163: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wpjvr69p585RR65LO2ZP6Ypb7UW7pTf9f6oVbidgV0XUyRfkrrQn6J0+lf3D7JZbMeZ8iBws2jILmsFQuPglCdDqVnivbLm0wP0tQXkaBkY3s2ie8FZYY+7oIcqjcAKVvLc1PPZBc/7JghmsWKyx96GeAezbOJc2JyjWT9dZOwdxcOv1p2G96LkdmUy86DivLPBjq0AsktMPf6iv89/+wsTh4tPGCyFnDjYiMOfOhl7GXyphx8JXBNM/aG1TkcY87iDu8KjYARZspy9e/vwUvV/OZHBEvOHzVGNNASHbtE2JpwT2hZa42SreH9bt4tp2lkxxpU06VP+y5RRCbEhLLmK6VQYd1/FA8IKvBq6UoekL2a/LgGAHAwjOdjbDrmcev8MrkIMJw5wzHItWSCcObXE3lfnNE/1fhYxbUTga7VSaW3B4gyf4b31+SLw2TkiT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: I/Wu5hwJ1x7ZY2krHGG04RzU8RPYS3EdowMyRXD+V0S0vw4mmE145iYRYVTB9woo9H4Ajcs4jE5g/+No0O+zn1RNM6m4zlBQrprNMI4UrlTH5vqlquMjWCXIX5fE8ev+rkPSAKrhP1D6xSUfL6N0gA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 226e7b9e-a0ce-44cf-bcfc-08d98418b67c 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:32.7346 (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: PR2PR03MB5163 Subject: [FFmpeg-devel] [PATCH 056/218] avfilter/vf_atadenoise: 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: jP5AsaPjeaG8 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_atadenoise.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavfilter/vf_atadenoise.c b/libavfilter/vf_atadenoise.c index 40f983cd9e..3a47c32cec 100644 --- a/libavfilter/vf_atadenoise.c +++ b/libavfilter/vf_atadenoise.c @@ -89,8 +89,6 @@ static const AVOption atadenoise_options[] = { AVFILTER_DEFINE_CLASS(atadenoise); -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pixel_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, @@ -120,8 +118,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pixel_fmts); -} static av_cold int init(AVFilterContext *ctx) { @@ -576,7 +572,7 @@ const AVFilter ff_vf_atadenoise = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; From patchwork Thu Sep 30 13:39:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30759 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp693795iob; Thu, 30 Sep 2021 06:54:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5uwfzHaeDuiH95T0tF5+k5cTGOQ2PWBfqc47HOUAwzAGHhpahQ30vwZThTeBsCGstwhFv X-Received: by 2002:a17:906:a394:: with SMTP id k20mr6799551ejz.137.1633010083343; Thu, 30 Sep 2021 06:54:43 -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 i2si3481144ejz.559.2021.09.30.06.54.42; Thu, 30 Sep 2021 06:54:43 -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="SV1v3iG/"; 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 4616768AE43; Thu, 30 Sep 2021 16:46:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064084.outbound.protection.outlook.com [40.92.64.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7917368AE3C for ; Thu, 30 Sep 2021 16:46:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xx0aG4i6a2oZrAefh8j4IFkCwZCtcFqG1I0EsJ2SIVbJn/2z5Rs8tQwO0hwiR68mhvIXkdZHRJCp5ucUTlPl79tZPCTry0zjN8g2L6sXhrwIelzaeYsgnUV4jASDyJuhd2hhMLd2WJawjqAS32S41SF3Gdks9AWiOmNU75vHPuafm/o9bfP3s9BWyq5kGSHuHZak448t+cUobhOzT4BSXAnp42We1XKDTJUJXzSkTdhSZljzZ8b8+ewNKJl+noPR1CbeMfL3wOCiWvYh+WFwT3vzumGnS5hfLBr292xm0KAnhnkZiEvE4aUJDLF7rkcyalGXRorEsvn16Lc7QmwIbQ== 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=vAEnj/eoE5U0Ztsgit/DeaMOe2WmGFArgpfSvG0QGks=; b=n3rHN+SpUs8ferMb0uvLiEaTs+A8e3aMpRCEbU+7bjd8ei4Tq8fLcTt2DDfgk0PlE1sGTJqXCPfexoAVB+hlR4Q44gf2NoYdpcTOGleWgK5CMMAHtnLfU5R+4O0vuIEPO5FX/4U+PSjofVwPe7s03R0aJwIt4b75Tpavzg2+m11gIU+vKjm8fFQf7nt0AInP74pUZOLaY9JsN1Fux/g5ETULML3ioauXMn7ppE/+zzmSoWT2KlBG1bw+8qdFnMYAS2eBlRz6UZA6bbJPcanLkLIWU9uoWz9vzoyRfdlE4FSqX7EsqjiXVm6Rc/8IY52N+6uhKAkbqi40w7V7QBh/1A== 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=vAEnj/eoE5U0Ztsgit/DeaMOe2WmGFArgpfSvG0QGks=; b=SV1v3iG/R+j9iXNYtdn7ahT/DBcgsP4RtD/UxMVeA5xKiIw59n+qXP7CXIHXxi7JY88hi4YuRBwuI8AWtCMeophsMauvqC2gK07i4cCjubMol4KJwFFmEiUDLcFRcKsWzeIRve8cQSm9kwd0wh1zfbDl+Q4msYtwUEJxChAuiZm5V/3gp1IljsxaZPWbnMWfJ2QzSKyc6ERrguCDpaQBiGmp1t84DUiHoNKuw23wakAlJTRhfftrWwRAmO6LwSOsCE4m8R9hVHqDXI1p2I1eW6mQl9Bsqmh7XBgpoRLQ4rQXF6pnccSjHq5fi5ip+NMR8bXjOuM6GUwBJTwDZ0UeYg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6704.eurprd03.prod.outlook.com (2603:10a6:102:e2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:46:36 +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:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:58 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [FIqGdqtmRpPy3qoWzbDpMpXjBQk+98dl] 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-56-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:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 077cfe83-5237-44c6-a57c-08d98418b887 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9NZNq1qhPpD1AuVutncUTHBSLuO4MhUpYMOo6w9BbUUBaJdbHJn32tE85roPAPhM2tvKqZc0GNfUhtpvCq0RciVUezRRbf8UZiVuQBQUxicvYOL5ohQq12+vZq+Y7z157i7GTxGXEK4Ds2IeeGsM7uBoa1K6RbENjht6/4IcahCzs+fXmePTXHxyQ4dR764t+dwHXfV2/VSaXWKhfqQRe0IDrSia+jaTU+1M6a8yfc114PUzHUVqVZVyfmFeDucDFWW0dS9B+ezb2Srv+iEBR1QjnaFejB3fwHdxykNfF33h9dxM+xlwdnUOqkUfZse2QTEqAV00EuB265faYLbZfFrWpZFYHOutZ0dwvYMDyc0cTLIFbKJKF9+h7Z3VLPM4TYMEnVJ8DWClGTe8UfYOlI0DL/2uECJWZN59a2XFrjDjA4YU9JN7fjVz+3MiagZsAYCWOKOiLYh9ooqXKwXB/XzRlwkxNbrgXBGJXj9blz0xwzzWXDGsqNq1ZeOI/9KtPyTGFqqyJbdoDsmG0OZjr4xkH3I+xBJoHBKTg2pdmE2WD5L2vJbhxvO21AkAIgjF7fTIWKQLonFohKSeOx006g+MAX5O68AVTPU7hsaCJKZtSBT7eWOA1bYqKzy0wN6Diz+BCMhLF7v2NIP2yUsWG9JRFC8X3hVOz9wOI3kg5kTL0ABrNK+AggtICzLyY0ta3lk= X-MS-TrafficTypeDiagnostic: PA4PR03MB6704: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ve03HsdZilqYyC7tCLv1Agoc25vBVwXYeYApSYT9TEC5ErhmuUwv4wqCWST7/9EUS9HUi6vZfex7i/D0hfUql7YQr4E9anKF37ANGFtbfYkr+45Iv2EVwtytBLTG3Z4YIDBcNUrYF/K1UUj6JR03f8ddJSm0UtPgrgeIYtWFQqU2Xvlq7gJdvxlqrzLPukHDlBAHig+CYLQwmFbYyXdlciP9wS+UWKUMcExG1xyzIdf3JYEw8czWpSDABARobs03T53nEbBibSL12dZXkt9nOPmTYa1mW9xYMqIJ3Qra0t5jAyLkKzPTNCOpjdhPjBgQq6x5vchESoSRaQr7XYtG48hnIFkYUrfBO4wStnN3z2uvGhNtFG2c1ypcyDozkolL9RWcd3/oqYsmeUOkVMjHxjelN/3UZ5w0ssDcUkfRs7hezqFa6NbKz37vuoNwWXac X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: T3pmManaRAmJAAP1sJ4+ZdBUOJ2ulIehshGQY5YQf2WpA+uBLPOwVS7IywVtizafV4yuXtILNMYAaXcsHPNADRMQULe48Aakh/AlQsPw+FQVucOMk/faRx6hTw69yaDz+5FbcaFBK5s6/c4ZDdfoIQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 077cfe83-5237-44c6-a57c-08d98418b887 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:36.2761 (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: PA4PR03MB6704 Subject: [FFmpeg-devel] [PATCH 057/218] avfilter/vf_avgblur: 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: pjWEeYJCa+cu Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_avgblur.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_avgblur.c b/libavfilter/vf_avgblur.c index 01f055e5bb..a6048b8784 100644 --- a/libavfilter/vf_avgblur.c +++ b/libavfilter/vf_avgblur.c @@ -237,8 +237,6 @@ static void averageiir2d(AVFilterContext *ctx, AVFrame *in, AVFrame *out, int pl s->filter[slow](ctx, &td, 0, 0); } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, @@ -261,9 +259,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; @@ -352,7 +347,7 @@ const AVFilter ff_vf_avgblur = { .uninit = uninit, FILTER_INPUTS(avgblur_inputs), FILTER_OUTPUTS(avgblur_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = process_command, }; From patchwork Thu Sep 30 13:39:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30749 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp693961iob; Thu, 30 Sep 2021 06:54:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMOfuifrl0azhhnDa1K/0RMkQG73RdfuBKBXFTeLQ5KU91E1e5WVTj+L+shB7KHjJ89eqS X-Received: by 2002:a17:906:118f:: with SMTP id n15mr1149266eja.239.1633010094747; Thu, 30 Sep 2021 06:54: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 w6si3467779edj.147.2021.09.30.06.54.54; Thu, 30 Sep 2021 06:54: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=E91HRhRq; 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 F0FD668AE4E; Thu, 30 Sep 2021 16:46:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064049.outbound.protection.outlook.com [40.92.64.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EADE68ADE9 for ; Thu, 30 Sep 2021 16:46:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DgRUxhmSjT1gOHrI7jhHijVlgMn50T5Ma0mO/AixOwDOcZKEyXYg2QdYvmIT/BlOvGelZ4TvGPalaDtcAW33saswK8TPZ1g4B8tUAFT1nzk2HTx5WzZ4vgp9SkvB6DAUSsBfko0PQgFhEQqG4NftSaVIZemLELTuCAnlrOeLkysDy9VZJOdn7V1f/Az7QnwNgGEqh6Ra5gOzDCSnO1dHzGULDvJ6hrLvx5ZdiPOJtYEAOB+TOzxDLs09UKEtCi1mubBzhD0rGZJ4sjAJorBSVUebRAAgHzqMf+nB3qGgSVgRxKAjP6xVwJCQMf/Pwe8yZXrF0oirPlL74Jvzu9hRvg== 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=CdwRq8DXaCmToOqDtKMZ3IfqiqbSR8hu+W7g41sQA7k=; b=PDGbMIgbJmK5H+31wSItWSemNR95Ql9m5Tk816zpHub7vSWjw4HA/IN9ece7DFLgeoDLWDg2qC/xqVB8GdMhv6HjLoEehsG5QDYtIE9harRfZiVYSzp3RlFtXLzRahivrk7Gyrn3RP0gY5DBlz70ZOewAkiELSEsUo6+bN0iQvQslpwnTstW7J+7MbdbCwrPzhlO30pxegRup5wii5pG/LT1uQoZkvKNes5L6az0UIeNiWYh7biZUhU69q1JfZ6VBczQisrUjH+TysZdayTWkBEF+HHhSQZ4vBPyHb3tS4Q8e/vSTLFWz/Qrf/o9fCHIS51ZNYbNLZeNKOwooTe9ig== 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=CdwRq8DXaCmToOqDtKMZ3IfqiqbSR8hu+W7g41sQA7k=; b=E91HRhRqATKVQV2JtqLeMxr2jpBlcsvwb9DPJjcInvN6WisFs+c7wVho3a4gcijlGhFUX47jAXuy/k5yxQh9mfjDlFzlCOBrhJlgQj045b+K/817QCJ/7sPjbdVnWJ/IM7JUeMOr3KFl0fpsgcaiqWUPDtjTl3hPqNzbk1GMJvu03Dv6T9jDnH3wFP7/7c854mCReACOZbUT2C5BaFV3DgzHRerTqNrquKpUUc7VXfe+tR3bqOlzcuOjX5pJJv4gj94mILMvS++5585kVT8k4yNoQucGgwv61j7Cp9tTBZfssX6uUFFetrYwELpAuWM5qqSkouaZ5ELqWu3xFWxHmg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6704.eurprd03.prod.outlook.com (2603:10a6:102:e2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:46:38 +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:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:39:59 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [9Jg0ksPhqb5489QOCR8KzQCVrpzxfrFA] 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-57-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:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f347b0cf-aa1c-44b6-3cbf-08d98418ba32 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOzptFBBX5RO9Wpd8w8Tcez2FZmb/irV96ZR4CMY/KEzYPnrHj+08Biq3bGUZn9slp3kZ1/M5Ng6U17D1hBuBsZz/x4J6DSfZkGtnEiLgPWZP2jaT6D0VfC3mSsvrBFS8LdfiPjHVY5leKrg928T+URPTakSCP9re3l2ejvI7VTkwNhfrjKt3gUZgt4xGYLSowSEFBykRuu+GydBiXryi833he0iqXRctWruQRmG0M3Ak1tD5kCQbBkxkDKS1Vv8wfxBBb+KWRLrm49wS5A8AKOfhz5lRz/ZDR9YyEvtcxj9PZAdB0a9toiEvmnLawjwHpvbiiig7Tf+dZUNvsudIWuUmEHMf/h94rLX9OR8Ivr5JbnrOPtYGErNflxYBNuwINblX/JWVttoKra3BKGSXZR9poFDxt5CksT+BjumFh7uZYiQQ2GNgJ2nlrO7+6UFTuewUO5ozf6qM64ZNPwihXd1Y0Ai50Es9C+vJK1xAcHj/x0hQrHkpkRPPsXF8D0n/XLIbfDheudd+5DMObMUGm3QxyEj2Y9ech46yJHUkHIMWpsG7YBZckMHfbIypzDghFp62MMvc5eRMdF0lelv22WcUcnJq2M6lb4mmYBuktwueJ46dY/zBS7T2r6vzftph1zNBTlHsNiRp1b+yXN7PGWmm0kYJEeFC+KPA/DHYBelZJ+Uuka7sQV+WGhbh9pfXis6XhQa+gFJh/Av6O6w7VK63KgyJmLABI= X-MS-TrafficTypeDiagnostic: PA4PR03MB6704: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: evzJxlkuD+BFUzKEg64zR4a0WzqzC1xYE9QWTUOI319HrZcsaLKNvN6V/gnE0qRNAiIu0Wex428HvtGEMxd8NinLGMfNXWQ86rvifGzlqQ4FHk1PSKgS+bKJ1lnIj06SAgVQb/k+bxH8ymY3NlsspYrrgIMpV/LolsDnxQhvGuUEpOApauAIm8hr7bLejgf+xM/7VafLQIsfOeXZNpw8OJ0m13VNTWuyKx+QK6srVTfxDyMAUe2y5LaECK23Yb7WxQG9kmh/Jyj9LABG4hQj2l9JREl4nmCPCeCriEmE6W2pt+HlrWGYxr4TQ35JKszbmH71o/HbDne+X9y9cdKqIhZDqMgY5guxgXHOb3wvwyIItGxeGI53OzWNAFUhgNdEUUnJBabeZvE2w454EkshGfXuFVa34MxtlTBLuNwgKrNYSnFIkid3+7QDzYh08jz7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0FE+G6uaH8HXlfNRObPNjojJ6SL3/YqtT7goHq/ArQtFVTiM834axhg51NzwqtmOUBms99OEN3FMXMYPxuWS9BMK5DkcDXBSv6xXmaW1pEo598Yd3AVlKINWD7blb/CqJmNnuF327gxdfDs7sot7gg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f347b0cf-aa1c-44b6-3cbf-08d98418ba32 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:38.9662 (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: PA4PR03MB6704 Subject: [FFmpeg-devel] [PATCH 058/218] avfilter/vf_blackframe: 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: bYjE87vxhRWE Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_blackframe.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c index 29bed4af68..05641c2fea 100644 --- a/libavfilter/vf_blackframe.c +++ b/libavfilter/vf_blackframe.c @@ -46,17 +46,12 @@ typedef struct BlackFrameContext { unsigned int last_keyframe; ///< frame number of the last received key-frame } BlackFrameContext; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NV12, AV_PIX_FMT_NV21, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - #define SET_META(key, format, value) \ snprintf(buf, sizeof(buf), format, value); \ av_dict_set(metadata, key, buf, 0) @@ -134,5 +129,5 @@ const AVFilter ff_vf_blackframe = { .priv_class = &blackframe_class, FILTER_INPUTS(avfilter_vf_blackframe_inputs), FILTER_OUTPUTS(avfilter_vf_blackframe_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), }; From patchwork Thu Sep 30 13:40:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30743 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp694108iob; Thu, 30 Sep 2021 06:55:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+FAGOF9anHnwq6sXiE0CBfJcIouXIRPyyDfdTJSw1i3PH3SsQxFqPfgKmejiU75xbkxTr X-Received: by 2002:a50:da85:: with SMTP id q5mr7244623edj.300.1633010105104; Thu, 30 Sep 2021 06:55:05 -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 dz20si34472edb.629.2021.09.30.06.55.04; Thu, 30 Sep 2021 06:55:05 -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=oEK5TWbM; 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 85A3768AE4B; Thu, 30 Sep 2021 16:46:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064048.outbound.protection.outlook.com [40.92.64.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1E8168A96D for ; Thu, 30 Sep 2021 16:46:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PFiDdKqt5jHoVlAtqpj9xHSR7fj6HlZqzqCqwqtfw4zN2Dkq7OUzw9rSUt6ffnTK+dm9/iDMwm7GUcQlOX+uOGj+5WBpGv2Pjrf6S+o79sKxHkBxuE/jqqeroPFOjHdatYRFR3ejho4CnXIcct/zM/mmxOuARhjAs7G0DzoA5xSWgFetIs6MDaG5ej3PxVX1hWQyfrz3ioB/7UotsK4qiLIyY0/RyhJzPiClDTefM4cGFN3AVHrfNsk8SSnoa7JVVk1rae2Cpe9uL2hGtbkbXweu7JT3Q8R8kJ4nBlVOe2VUa3bj0LFLUB/FtP8UWXsAiYxlFcFU50z494p2OAl+fQ== 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=foD8aUeqivONZLDE26ElV5dNNwBbr6ItR3akRNADbIs=; b=oGEAu8U1J/ZdMZZ8HmyqtgZKRkuxFfrH+7NpFw92b852MHnOq3jdiUuklX9gmCXnmtORJqfLBX2LqqGYVA02Fx8yWBFFYOs4NXDy5lwH4Sso3EB9+uQEwFmn+y294ddlyhX9Jq09Ea2vG8BpqFtPBFc6ZjX0rGzLVhYHETTtK5P2O56ztIJdZ08p+L8BlAJzii5g8lsvslF3g2xXbpX6wSwoGpd+sd2HbJ9xe/5E0cBDs5efOZyJ+WHXFW+oqPaNw4P/Q8jpSteXeoGEWujOTpGfnnTL9005kMfKKSyjiqHspfiIHrt8zxZ65C030iRd63uwxR2dHahNz0YheP3Fhw== 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=foD8aUeqivONZLDE26ElV5dNNwBbr6ItR3akRNADbIs=; b=oEK5TWbMpLoE4axbBmBNaYbcLLeAH06x0wuS2g95C2iEnHv279Q+2kkeCx8Na2MDH9gJIkgPv1UAiqTB9wWiowKZ2wh3CFUJtgmTKy9//YKmepmcrwErxRQGeMNBtBsMBuC4jqRtbSe0baAkLvc/PbrknnhpAbF/utVcTaiGmiSSdQbkdgM9VsHc8iChf1MtP6ZNgQGZtkNB5o8U0vXqzJQOa/Lr6QWGVl225NLS6MD4w8kRz5Xz1KC5bAgNtR4OkTz2zvIBMQjiiaRSCWBHrAuBYHp796P/bPMyqWxki1rs3dfARDM0CPB/Co0QJMN1Vf27pAHOqmjGQSeTzLC58Q== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6704.eurprd03.prod.outlook.com (2603:10a6:102:e2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:46:47 +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:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:00 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Qcigk3DSYIoHJDZI42NhuCjKZQN1nefF] 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-58-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:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8446eaa2-0b1d-4087-d916-08d98418bf44 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymIOARQAbZ9l0m4fLPROwslL2UWFApWYcmp54OhCRto/U9myA9SP3eBJQ6YmP81cClxJTmcOhKRdWhg5o3UkpPKTLhaXo/a4Nn6p1BMj+eRMXSNmEbWwTrK1HGhSGtiXCL/Nl6IfWBsvZ36hTS/Z/BeEaSzgyAlQ74Di1z48zBZ0EqR6EsSLZyAyuhBgQR3G/KChvCk74aF3ydTa/BJXITmHMH2FdT0oT+rabwdo88huqkZcBxLdgM8DcOTpsj2FCT1Ki4n7NtkcHQr2og3XSlSz1hGM1TyJITc6O/oj/x0DhEhpaTE7umdRNXo9I4qw57gNylJBXMquGD47giHvsoXhmaeJnkqizNTSoqyL/sf1TvEuhDooCB282qQt262JKygRgWqh4xKVR+qg5sQjuPBel/63uAnCclhVzgCMa2TBahdpQf4TYl3lhVDmArnUtilWyNodLqkx9ceKHkEtEnKxJddfIuQaku4L7z4tD5wj2NsBICMOS/S/bAV2aBzEJnVg54ELlDPn14w3rtHd9nMpEPaI5CBN3ygAscDuKN+DgQuP9TVNGIPOtgvjabJZa0EN/rP8Q/xOngqaXrCvyBajDE7e2JsUtPGv0uC7wPo3nZkyFGQy3Fj34zYc80evtVeHj0RcQEnqQ3E5WiDEjLyDfnSFvZ5R72SccCSlyr96GZaRNun40Fi41bhJfN2ew/GKplKG7FopzGDjqSe4OZo+Kkr/hBGGnkU= X-MS-TrafficTypeDiagnostic: PA4PR03MB6704: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H3iCCs16QbyvzTwphHISh4QPLZ+ElETiQYnEnEK5Gbbl+vxDBfGa3IyCze0qJctuhmEo6NkTsWtZYTMsKxs8oGSql64GTY0PlWuC4/DdiDGn7Xhr0HX8rFkGpacbn7hm9M3x9xeWzm1VX8aS6l6FituVH298xSQzqQE06qUIWqJKgqlBNcIHnY1z2ZS5+9uQ6yLBrRClYTCo7mHhMjaiY+XuVzksIl8TxcPjh0swWmVaamr6mcMGVplzTn2FfNEN9lgbkggRekkm+13CSN5ddOF/VxqO0qSt8NsutnvJUSfI6OdreUP7KrKVPebMObfaagNzo+J5k1s2MosVwU3weA5yemDc00Dl6tvIf1YBUV88N9GxXugbOpivIhBEm6guJhveSE+ZFlKpFx6g7DSb7TlPnSnfGD3ovxjQxX5Pe0xS8kXWeHVa2RbXqcDqDrdX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NtgCRSFZ7QJ1l7kSKpRISN8aIwjR1P142DYs/7XZtuc+b/1a2dABg/XxBXDQAxzIIZdK4C7zJDKujBQp48uwTry7oButN/9JX17RbdL2SrDNFcjpZVH6nlOzmKj+RGqj3w9PXeGStNSrSdmKhNB5qg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8446eaa2-0b1d-4087-d916-08d98418bf44 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:47.5156 (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: PA4PR03MB6704 Subject: [FFmpeg-devel] [PATCH 059/218] avfilter/vf_codecview: 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: iLgN35nYquv7 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_codecview.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libavfilter/vf_codecview.c b/libavfilter/vf_codecview.c index 4226bab8d8..ae8c104d27 100644 --- a/libavfilter/vf_codecview.c +++ b/libavfilter/vf_codecview.c @@ -78,14 +78,6 @@ static const AVOption codecview_options[] = { AVFILTER_DEFINE_CLASS(codecview); -static int query_formats(AVFilterContext *ctx) -{ - // TODO: we can probably add way more pixel formats without any other - // changes; anything with 8-bit luma in first plane should be working - static const enum AVPixelFormat pix_fmts[] = {AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE}; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int clip_line(int *sx, int *sy, int *ex, int *ey, int maxx) { if(*sx > *ex) @@ -319,7 +311,9 @@ const AVFilter ff_vf_codecview = { .priv_size = sizeof(CodecViewContext), FILTER_INPUTS(codecview_inputs), FILTER_OUTPUTS(codecview_outputs), - FILTER_QUERY_FUNC(query_formats), + // TODO: we can probably add way more pixel formats without any other + // changes; anything with 8-bit luma in first plane should be working + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_YUV420P), .priv_class = &codecview_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; From patchwork Thu Sep 30 13:40:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30747 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp694307iob; Thu, 30 Sep 2021 06:55:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxewG76s+w55MxYI+cOeSKd0nid+1i/GPpurdNjyUyStMxfw+eHskhEkNSFWsJGLsjQj1Ui X-Received: by 2002:a50:8748:: with SMTP id 8mr783111edv.362.1633010116732; Thu, 30 Sep 2021 06:55:16 -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 dp20si4737348ejc.282.2021.09.30.06.55.16; Thu, 30 Sep 2021 06:55:16 -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=JAo9ybmC; 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 C98A868AE5D; Thu, 30 Sep 2021 16:46:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064074.outbound.protection.outlook.com [40.92.64.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 928F1689F3A for ; Thu, 30 Sep 2021 16:46:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QD5V1abJVYvGlgRWwt1HNBaTaTk7eju63GiRmqcv8quGGRH64hvDFL1vJZO/mcGkWCyq7D4wkTwFcqFZcRqXBqSI7aTccGtvHdumCeOHytzIw0FfDiNqstxZf7e/oM8CxvSy1kEmeS64aGO+daSScf2xGMhRRJX6zzuAtAU3JwXI0FMqOmi0DGShwp+A/yOj58BN7rOp6W/KuVFDgUwFG5tsgga4MkoYkw+5+NwKqkto9E+J9oAC8qXrjr0xjdMovX/H9QO8F6nKaKbk+TCRXApGhBomUWGuk2D1jwk87VMA1kxVBQ1GwhtAJvStnNNDph18hpjx6mTVW/kPhra4tQ== 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=dW3tG9UAis0l+3Pb7J09vEv+v74Xd0J0nNWg4b1mtzU=; b=MNcmuV06maUh63zf7VZR8gawwNoGCl5pm2mt2BQpuYcK2I4W1qc2Z0xbWYjQhm480ZC7jh8KYhvk9t2+T0nTjZcAP8U1C3Klk8ZyTBigWXDz6hdUlvTIlvvLEK/loKV/VDLVM2seMKmbAROYLR9W/1/68qi3RP+2Z61KpPt0e0e1JsFqOguBA9h/HeE6hJkVLsB3JZo/P59MF2Oq4vT3dvire9veflFD8rStmcOlKVrq3rDRwF5QjwyP2oD9w1eEmKj9EopBf96+GYh3smJL/zbq1j4FyDgbjHuWQIpQyhGB5TPTyX+8QoBM3YY09cRMRPRL4rmaTMAIJ1ta4ofAuQ== 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=dW3tG9UAis0l+3Pb7J09vEv+v74Xd0J0nNWg4b1mtzU=; b=JAo9ybmCnRpFoxwZerzDfK/OaOejPVavFGRyLH71TtF44xtW8yfHQ0rl2PY6ZcoqgyLMu6tr0LjOcp34y4y/E/LxzljTV2uLTG1qo0AdSXeOzWp+ZsTf36mduNFi82XyWaiB5XJmRNTYE+2nUIvJCfTPXIOYHfa9wmDrOvtgtdfcDKsbjA2EbLsaCdvFoYnHjZrCQDEOzYToxPa7bAFu9nz51xWcnZgpYUuUCxDPeveXLlHJU5MKJa2VoqPNILkevJCka997ZQKw8nS70boQ+UBrUR3PVcSYJvbg8QWqRiQDmWZyQ2sGZ4Ef7z59crnVvbFuhXzKXd6Spug4qVZmxg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6704.eurprd03.prod.outlook.com (2603:10a6:102:e2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:46:51 +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:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:01 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [pyi9znRUC/zkvGiG+Yg/C6kIGiOS6hQL] 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-59-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:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38b017dd-df6f-48f8-baad-08d98418c1a0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymKo9o/g3zytww+bnw7ZKiIdymZJFYD6zFh5KXcGLccYGCyNgmIS5LqvBtI1bToFu4BDPm9HZt4ohojDFDaJXQXfKjMUwyxvumVi9Kp6b1TG2azLJGlKPS1YOomQD7osM5airX1y3ku8kRniOMo2eY011JF+IZphUN1PhgvO7PRP/Zwjc5Hs5+OPA822mV5TGh388MKN6QrlgUQFt1IFx8xRCNkmA24wflx10069Si880DXq7Vi0DZG/gzC3BxAeUkeyWzwCaDbu9Mk8ibajsXy0PJnHeTsDcfdh+ZZ7k0nEpnR4WMI4y7FGGYLBwFKxhenq94MoXORVmBZkJRrV2YfhV3f2Wsv4fJQuN1I3B4U+I6lDDUyCfti9Cpl8+9DaDfxOtkZub7meOGn5rzc4IRZYwqO+q6CLKfgfaHGF1ITeM3U8tzV4hFYQdHe5XiChEZRUrXvBFACVcjgBh5DT3DONhkXKqhc7fGZ73j53mAkzIH+u8XAIET8ttafosxAfzdwT3eRjj/W9FyQ1qnLmX/V/A1RfrWbDIe0C2SlQVHaPkhPnzTvgUYmbogjsZSNCdwE2VpAohq8XGIUPubXoYK2TdRuUVGRNUXG7O4sHxIia5qi6uUoM8MrJ1vJqZFbH07LmBo3Zke8w7wXSjvb3vllyQHpsqAhtBB9RNeYyG+f0ILINQXltYtNO7Y2OqulM/tKG4hdQ7vPmuLxBxl1ErXzxd8mgU5VHsSM= X-MS-TrafficTypeDiagnostic: PA4PR03MB6704: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: in6knNy0zx+vf6CcjBmmxMkkJ0qpQ5x9wS7xTg7EThh2Cmjm/+6Hr7nDEU86mHQmVcHQ0FIPp9rDTb80u9VfF90MtdhpOoH+X+P1txQRhgPla2sG+pQ92N+x2MpbRW6X0Od3172WE3KU+c3OU+Cmq0Lho6lQPd78E4BQ8wSSsCNj2TBapCrVj3zr25CCYvG8mHX9pzH9TQ886BWy6EFDGy+hyWlJaMm0eA+dLnn2Dr1C4sSn8Zf/UzQFMr9qxkZrMS7kVb5Q5TgZJ7T8F5YnHPD41mklQXG+7Fac69GTNn7rnnTahlVtWgiH60pSUWNXj+X2rvZsTutX0fKDPPgF0t72cS9bP6pcaKvk8KHMFDNNjFz0G65Cfj2+35kLzlKUePpeR+bDRF70o8v7fvdJIkkJy6dR9CaUuTdE5loVPyUs9oIbbTKlZTesRy4IcExW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TeW5MdPYONlT/Yet0Nka7uG/9Vi3zR83YIHRrOYK7o0OwzCTVJKr14/M3D+lTz3yLYonRN3Jx5enWJTDHVPsMwA2qRjr+W1r0T8A1M5bcgeIA/39qqOcpT3RB1SsfCyDIpAnPkhv6vq7D/r77Vt6mw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38b017dd-df6f-48f8-baad-08d98418c1a0 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:51.6325 (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: PA4PR03MB6704 Subject: [FFmpeg-devel] [PATCH 060/218] avfilter/vf_colorconstancy: Store format in filter, remove query func 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: iMqYMeX43HkC Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_colorconstancy.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_colorconstancy.c b/libavfilter/vf_colorconstancy.c index 9ccb462d0f..ba6359462e 100644 --- a/libavfilter/vf_colorconstancy.c +++ b/libavfilter/vf_colorconstancy.c @@ -636,18 +636,6 @@ static void chromatic_adaptation(AVFilterContext *ctx, AVFrame *in, AVFrame *out ff_filter_execute(ctx, diagonal_transformation, &td, NULL, nb_jobs); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - // TODO: support more formats - // FIXME: error when saving to .jpg - AV_PIX_FMT_GBRP, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_props(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -755,7 +743,9 @@ const AVFilter ff_vf_greyedge = { .uninit = uninit, FILTER_INPUTS(colorconstancy_inputs), FILTER_OUTPUTS(colorconstancy_outputs), - FILTER_QUERY_FUNC(query_formats), + // TODO: support more formats + // FIXME: error when saving to .jpg + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_GBRP), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:40:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30736 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp694476iob; Thu, 30 Sep 2021 06:55:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsvpE+XByy4YZjwHYUSnyOq28gH7qNUciW32F+HNdmwrLd2V1uLC5yhNuqlzHNlUj0Mq9y X-Received: by 2002:a05:6402:144d:: with SMTP id d13mr2814761edx.223.1633010128280; Thu, 30 Sep 2021 06:55:28 -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 k3si3518153ejk.475.2021.09.30.06.55.27; Thu, 30 Sep 2021 06:55:28 -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=AuDEifK6; 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 EBF0568AE6F; Thu, 30 Sep 2021 16:47:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064074.outbound.protection.outlook.com [40.92.64.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5B0B689F3A for ; Thu, 30 Sep 2021 16:46:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cNhudP5LKin+mymMHv+DxtFV6j8WiEGW96e+p/wkcyfkzip+vGb8AVah5rZ4gKeQBY0eW6sC+h5a1Bbo9952VNYcAItKUzXtegMeJN4l07bnGzQthmdBWT2EFBsmAcIVN5esPVcgZciWZgEVBY87hugRohVsBNPzOpF+nNcwBsjmyZPEWu1SaWMKIOn6gzDmAghtWpvWoe3W/xEgYIF1T+gmriWXwY09MHBviCpH1CE76pEDuiKa/wSSZnQd6qTqf6rRouQtngKsRt+7mYzsUj/FDtQFQPuUwnI60YtXaOG9O6B1zMrAiPFcW+vI4nMZFopIn+q1+EcOZbDLNfVccQ== 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=nWN48eBePahCABnejANCHDGujs1cjuIP881LKTaLk3g=; b=d+Ttm63n/0YYG72LFLEJksEz+AblJNLhic3txjWGxeuuBKGRDbqFe2wnFY5Gr4ThzvdUUofzxJipNHDr4mBWrQzufuEyKTTgFoJyVUVfhSG5LyVzZzvV7y99g6bxmJdqCnuRFmCP/y1qkJKR15GjEKxNOwMFEm5404lpZ+LVyB3HeagBL6xDbkhXjuWKk5BlFfcENzqHKbDEx8jTNoW7BL/WekurVekVacadQvL1ol+5b5vKn6QPbzoSzufXG4ezZL/PDJrWYhsLfzGoQsF+xBhCZhBzGXZVhnblq//KiiLYlaMFF9SGoaWpnKqgZlBUIAqNXWyv5BBH+EsmPzjbBg== 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=nWN48eBePahCABnejANCHDGujs1cjuIP881LKTaLk3g=; b=AuDEifK6GlfMzkoKiqi+m/0j7oRH+IOQwwnfv+ts7qyPPFNgWtxRsrql2FeNL9AqFUeO8F/cEMbSkzeZd5qahmhi2d7RJbidbjmkqB18C6T/WNO2ila2PHg6PaLKv0nabewLbYhcm08HMMvIT4/5XC7RKDBgowFqVtjse5KSwWSAU4of6nDgO/krCffZTi8zbM7T+UaJqUgtFOaWuC82/MBXi8TkQHG3ghcKS0COBVG8SrEOmpnSZ9YZDCIQiAHqMpn/G10Jk9BqZYDRpaPnXZ7aGOM88Ll8OIkBrhwWTq/y8Eq7aPNKV1VJ3zPU4LMSu0Cf2373t9goqSbBZot7DQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6704.eurprd03.prod.outlook.com (2603:10a6:102:e2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:46:56 +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:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:02 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [tpAuEkj2O8tWffyQkNNp2Iz8tONhGLZN] 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-60-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:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38fdf808-4f75-4756-5552-08d98418c461 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOzptFBBX5ROwqJpWn5xi1ixOLZTgQj7/CuU4JS2LyVHe/Lo7D0wcsdqTIuxHHj24O/FXnkWudnw+9H3Bo/JR23Rnq8KSp4ptIxa6zN+/Q5scW8mOqrNXGB/Y4AKCGFwVsXqWUurLifrixECtvjnl3Dq6uDjxzlEsdn00nkv0iEH43wsMclzGjdqKXiVdj3l4Pcw8aR7eGPxqxUK5XBkwJ5+qeYvz32FCY8OIFbyck8ocMQTshGqmEtXNaAiS6HVvx1qeMEeRMBtYlU5Odi7lM3RQvjl/XErFiDznVqXT7dGqSVLD9vq/tPRC9+8FXZYE8ibeHH5zbirfx3dw28dsLwAZQPjSmyzqzk4wnF0LsCWm3ZnAz3gzXAtCTLOYH6jqiycwlxYnf4Buh2F5YXWKQ0hrrRK90NuODjHGBYm89wgk5yrCGHEu2W+wdEhEnjAL/zXzy5+9fqJuAUooOsE08S9iaOfou1PtJwU4S8FOyWbWRrSxvQN3WWmCN7KpO11UdiY+zV15xI3TUsc3A9RLouxbzL3s2zP6TyndKstUl5xAGjDw8I2MQAJr0Uap07EltK/vO9t0jy9LiM/qvKlURPXBrz/LUWKbHs5HNCYttgUX0UDKw/hOsPmFf5r2+eRUYVQMxDxh9egCk8YSdAGtlZsThCb5GJ5zWTRULepo4O+YMB6GzmiqW8+creaOnC/3+HlkDd8YelmyivLCnmZRVO7sVzh3eKXaY= X-MS-TrafficTypeDiagnostic: PA4PR03MB6704: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DwmWZnwTep6hg88qBjKUvWSvrFUDxCIfNZ4uE50wMdK/V3czl1B/W/LKouvhJYysG+qAQa7nZzgpUc3bPdq/vRZ9ogkQ1yM6hBl+Ms1lViJZd3hwtIML4xUuvwOGkF2xQBI0wDzV199F/5gVtDr+3zUdu8KaY0znfxPb7QHfr1oNBzshGK6xzAjfXmQuTB7pNWkVxpu7+9U7mWxvwyxtah0xaquOTaw8dLFNWLXn1k4wpL6PWSgMXgnC9OtmRXpFmtgXDCFjV6MBwH3YFxyT2J1vmyG4c5DiA85716t/7BHKkG2cmuU8phUCKliUWshBAWhM7TxivA6O5Dm/w1IBlrZnQOhNZeMAH3wkrGIVLFSKDstL9zSyfakLvwWGm+qO9AuVVdjuQdmx+lz27xJAQG7Tu0LKQ6kv5YKrIdFYPfOdN/cXgoh1xp0UJMBQOjPl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nscBmJWFZZi2WZo5UGXl2LQ9C4skrJClANRIPr0va1dHWkOjlO39wpfHU9L4nRG6T9MAINLz4n5r0hVm+8jbB+v2OCWBgOUkze9xKRR48zgRbgNNghetK2kO7aGSmKNgU8lT7bBKwFy8KVcwlmXOng== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38fdf808-4f75-4756-5552-08d98418c461 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:56.6753 (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: PA4PR03MB6704 Subject: [FFmpeg-devel] [PATCH 061/218] avfilter/vf_colorkey: Use formats list instead of query func 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: UdZbDHOMx38+ Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_colorkey.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_colorkey.c b/libavfilter/vf_colorkey.c index 93f2ae3ec9..6720be13d6 100644 --- a/libavfilter/vf_colorkey.c +++ b/libavfilter/vf_colorkey.c @@ -159,8 +159,6 @@ static av_cold int config_output(AVFilterLink *outlink) return 0; } -static av_cold int query_formats(AVFilterContext *avctx) -{ static const enum AVPixelFormat pixel_fmts[] = { AV_PIX_FMT_ARGB, AV_PIX_FMT_RGBA, @@ -169,9 +167,6 @@ static av_cold int query_formats(AVFilterContext *avctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(avctx, pixel_fmts); -} - static const AVFilterPad colorkey_inputs[] = { { .name = "default", @@ -211,7 +206,7 @@ const AVFilter ff_vf_colorkey = { .init = init_filter, FILTER_INPUTS(colorkey_inputs), FILTER_OUTPUTS(colorkey_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; @@ -236,7 +231,7 @@ const AVFilter ff_vf_colorhold = { .init = init_filter, FILTER_INPUTS(colorkey_inputs), FILTER_OUTPUTS(colorkey_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; From patchwork Thu Sep 30 13:40:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30744 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp694643iob; Thu, 30 Sep 2021 06:55:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7QEX2mfueZq48vbLOn7+aJb9qZpUEOrdC2KQlL1ELyo1C22JwFR7f3/2bRD2uffbJOiNR X-Received: by 2002:a17:906:2b07:: with SMTP id a7mr7333427ejg.284.1633010141345; Thu, 30 Sep 2021 06:55:41 -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 18si3939093ejy.624.2021.09.30.06.55.41; Thu, 30 Sep 2021 06:55:41 -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=pJO62aXs; 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 0393868AE72; Thu, 30 Sep 2021 16:47:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064022.outbound.protection.outlook.com [40.92.64.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8502968AE62 for ; Thu, 30 Sep 2021 16:46:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ajJYqocfrEKo3hA11fblQlRxj7wsQ84SX3RuS6Okbtl92QMX6QT02/hvz0EH785zYE1a0ajTulC8IPhhEmvGye9AcCiGEC2KkPpAnmkS3fPtdcptUOltEceoGcXG+63D/sgy/AQcn6DJZZTVD9EtcCvlEXcOCHYyBgdf85Yk7U3rOKsuDXBJVsOzO8GIKYvperfjg+MUyngeZy5713bMjAOpUq/81dEaRbxfmflcCtSQCt6DUm5vZA2s/2fnG/I4TD1v0DcXm7A7D/sd/EZLkwDVXvwCCBLijbY2wREpjMCWSwxh3hGGeL7EtUWV4PB38GDCEaKfZXEo58FcWEIruQ== 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=Mj7o7cnNmM8qeudQBI35gAB8VriQySqyH+uqtvzs/fM=; b=YkTsXdKlfx0hUeioNsJvVcgQ8yqdq85bltTaM0R+CrzTVZjLLqg5/mA80wpUDNrLFCy2KZ+xAN25USHY50koZ3ZColUC1VUPrtAWiRAmUsv54LHJfteuogckShoad3w58dQ90jJZS2bfG7zE5Dcm3Ex95c3dJn+LbjwInvj6lTJ3zkyKH+3o5fOmhqlY3S1gWr7k6iZJmpdIrXEQxZqQcpQpxcOdkF0nO1LPhzOvvrVMJL/0pAmfh+qgxbYEoSO7adpkEyOzxIbLj53tetRBW22gnqXcLOUiaVi2vPYvOGIksy540nDhOTvJHZ/6QjRlf4u2f2S9vDdwviSp731VBQ== 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=Mj7o7cnNmM8qeudQBI35gAB8VriQySqyH+uqtvzs/fM=; b=pJO62aXsbvxszm22Ixu1px1CMmimY44RQO602kUPMRqY6765uJmdUjnQw5OML5lz8tUUgdVxXvRchQoWQ+3a032V0q/KzpM1zRcsnaqd5e5b7ix2/GUFjR5B0rPmKl8uopPCEuaeH1lz7q3brda+ggm480QaKMd3jrHjU0xuUP59RrL86A4Dxaydu3ZZYnPwMd5WjlyCoZqj+9/rbhi+bMxEivuOe283bsAzG2NcwouunMmdIFDeJetFIgVdcH6/fpywzyJNtuWL9XVyKl9gXcKJEpIUgLLkIhIYoM93hKuUdyDnIWrD0XNJDu2HdesxAMeiiznqLU5Aqg8fE1sZOA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6704.eurprd03.prod.outlook.com (2603:10a6:102:e2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:46:58 +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:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:03 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [/+HQermtdh9WBmNitqDpnkFNLuCRTMiX] 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-61-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:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 02970d84-01ed-4e5d-f583-08d98418c5f6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOzptFBBX5RO7cy0RxZGfynQPPTeiKgaPJeT1qFnU9B2f4eO5ZhTV7Izg42u9mjUDGbzGB0/MIBMDkyioQ7k8+HuozLwW68u/9KC8e2G91KUBQlF8wil438or3bX+VOno/1HOOzVSuOf4J8CAVqKZK8ljxmVBEI3cjlCDA50YznKIZBzIWMIyC5NqQYahOjbbXSgcLi1iAz8Qwm0uaZxW5Suwm2sgz/xGIg9tCKr42YlXxkQDwWDE/JOhsJ86K/Y334xUqqUbyeF0jxDqolEcYPz8k/HKZ02Qdo5zzOpmtjc0xu7z55Bsq2ShYWDl4wa0plJNhpmFLbVg2ezApweeJGCUTOFhybcsyhO6KDbBO4v6y33xSl/ydP4vU3biTjmLR7uk/wV/Fuo9mrtDczmFj9sSiWpwg0HRSyfxz6/90s4FaNNFiqSiTcGcvCXoEntVYY0uBxYCVHRtUWb842gMrCBjozVJpOQW0JdQpLEcrG+xKFCGWz5j0so/Ea7brhMX9HgTIET/ghZeUqPsQyz0I/CozG+qfKa3V6N8xTYBql/afmv+IFvjiyTi9g5X+GwxvywTkWf5AA9MQl4e4v/r2oMsYMmKK0aABQJJWC8GiPENmFhQQKwQD8zEISo2TyXmKqbmY4IzraQhRcGyEiAl8+z1Q9yU9flL8C60pTNy/YpkBvo06PpUXx8DY8vdCh3yJNzysgkRo5RqfPlqZjKomZDNZIODjvRdA= X-MS-TrafficTypeDiagnostic: PA4PR03MB6704: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KGXabQUXwVNGv9T0gLbIsgPLs0D8/UrNJWF8MnWHo9HYrMsa5oVBfmO+rF6DFyCcVDEsRmtI5dMOk3n5jarLwvs0Z8zmHNGFEc0HOJyWBheH8Phlpyq8/7HsGWhyXeaxbHnJSV/mduxhI8DwYDVaAqBS0CDTwY5RVE6KS8JFA0Y9HHoK+6MSJmab17EkUF4bdU79aCy851pKMulTWE17AAPB2o8Qs//WHHw015DtYD2DKLYPI2NX4aYNwRov0TAx+LsSfmwIN9W1wjLHqjHbVdamCT0U/efBDIWusWH+zCh7liYZ+C/FNwnCCbDqgtujEqTlT7g7/Z+nfpm8o4MYJqK6gRM6n8OubgsRHxVGs/DyyTlw5bFSS2gBoaBpDeRORAWiaT13xY8kQvelOK2Z5BRxAudjYG+noAcGj8r/qhVdZTmC7j6U5WheH3/fj9oZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xozGQmsT603zgKULF2x2ED3Q4PyPQ/GNmjOQaDrHI1dmSvNR8JM9fFT5QPJDfEUokCiUYRIx03GpvpfkFRfaoYrQwAx91tAOl9f6slrdEjD2sS1MIrziBGDEmxoUJ49TCES+BNB9bH0yrTf+Zf/X7w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02970d84-01ed-4e5d-f583-08d98418c5f6 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:58.7004 (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: PA4PR03MB6704 Subject: [FFmpeg-devel] [PATCH 062/218] avfilter/vf_colorlevels: 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: wOcSWzfssOIN Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_colorlevels.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/libavfilter/vf_colorlevels.c b/libavfilter/vf_colorlevels.c index 552b701a2d..c089740b0a 100644 --- a/libavfilter/vf_colorlevels.c +++ b/libavfilter/vf_colorlevels.c @@ -84,22 +84,6 @@ static const AVOption colorlevels_options[] = { AVFILTER_DEFINE_CLASS(colorlevels); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_0RGB, AV_PIX_FMT_0BGR, - AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, - AV_PIX_FMT_RGB0, AV_PIX_FMT_BGR0, - AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, - AV_PIX_FMT_RGB48, AV_PIX_FMT_BGR48, - AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64, - AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - typedef struct ThreadData { const uint8_t *srcrow; uint8_t *dstrow; @@ -388,7 +372,13 @@ const AVFilter ff_vf_colorlevels = { .priv_class = &colorlevels_class, FILTER_INPUTS(colorlevels_inputs), FILTER_OUTPUTS(colorlevels_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS(AV_PIX_FMT_0RGB, AV_PIX_FMT_0BGR, + AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, + AV_PIX_FMT_RGB0, AV_PIX_FMT_BGR0, + AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, + AV_PIX_FMT_RGB48, AV_PIX_FMT_BGR48, + AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64, + AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; From patchwork Thu Sep 30 13:40:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30750 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp694902iob; Thu, 30 Sep 2021 06:55:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOXhu8veVQQhGUC1RAwREd9mokvExlYGFd5RKR93KG+keZMFtjSPjO7CB42OpnvfvIw/eh X-Received: by 2002:a17:906:8a6e:: with SMTP id hy14mr7006201ejc.366.1633010155394; Thu, 30 Sep 2021 06:55:55 -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 hx14si928587ejc.326.2021.09.30.06.55.54; Thu, 30 Sep 2021 06:55:55 -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=dF7ZUzbu; 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 12C8A68AE7E; Thu, 30 Sep 2021 16:47:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064084.outbound.protection.outlook.com [40.92.64.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC69368A9CA for ; Thu, 30 Sep 2021 16:47:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RRT69B+YoQTSNNrmI+cLUbaNBrhnTL2X1ROs/IrXPZ77mQ+h9YxV1sHeJ2WGYXZvpfDCYsCgEfhaMmNukVuMyXRsb+Ns83TlVbVrbLX55DJrejWZugnoFBCnGCFSFmxg1kDnMz2d2A5Ik8OKdBuJte06Sl/vkozkx/Pvt5pHnCroGHEuvUyEfkoR2wcWmTcv8Yfz4iFLS5+Lo7Pu70Q8RZ3EbVTGn9CTFvh3rwyJonTyJI+nyHUQIMtzc6sPo07qB1Or+8jE3n9nt4BvvLj3PB2uvZ/AxZLyRU4552VMoJiPYTmKEuf3aYz8GgtURm6eTNxBuTatNJ6QTnze4hKpnA== 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=shnq5dGVWyKws0UyOmGhnuiTmhGyNOEv1vZaJyJjH/o=; b=HKrP42bWPfFw1C4RqOUZXlzzVkhi3bLCHv9EOQ4i4vSof+CJL8L2jrAQTIOdBELaSiuZH/ZjeocV2Ccv6yW2siejVt86G9R8ubH9cZr+MWXr1D7AnFg22MVFxy1klzmZV7kMwDe+ihL6rZ2d/hbU9aGPczA2HYsHWcUIZKVTtWQndNXeSYmTVqyKIZHSH2iDkNQI2sz+9Z0mhRyRCrv4/fcNmgcxaIzUo8e45Twb3HD3G8Pvzbv+qH6c9CzVksIL+JQyagpERgzghGCNOro8dVbEHfkkxTiJXG2AxhBUDrvrDeYduY7hC1e6VRCXgwj0IeHgnyv/PaQ62+irVyZTEA== 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=shnq5dGVWyKws0UyOmGhnuiTmhGyNOEv1vZaJyJjH/o=; b=dF7ZUzbuCMfTsi9z5Bz1r6556gVo95tEfbhUaEgIcQ60hr12Ud2YLkK3BpZdqtQtKQeDS91ALdKz+J0n+QTAUWIu4kY5mtXGsahML0YshjdqR8FkP2Ve2SBkQmaLMD+3DhzboFxqzKvqNY9LKn2x0m+0Kqv9jm17foUUeX7cNqDePRhUeDjuhoelrVLzvFg4/lXaq3FN4gtUhyOhFuyda03Aq09p0sJuVPnq+tC9IKoJUNebivm7iqolJj3VaeoXvcIkQ91VF79L8T1lZwMD53HpTaGRgLQNj9oRon1SL99XPkeKtVOXR9lg3bNAfejps7hloSh3RwhEgEAxk1xIZw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6704.eurprd03.prod.outlook.com (2603:10a6:102:e2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:47:09 +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:47:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:04 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [qyZ0BMw19EcM1bERgbv2mIctgp0C4nSo] 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-62-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:47:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4a5e143-8167-4899-45a6-08d98418cca5 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOb9dbQKGMX4cGZYJ6l6oXCkoa6kj8M6HWgt497DxO4Tuc5O0jMmyWEXMDZkfFIkdy/6Ic7j7osdP2kRrFDtfqj7uKBmzKRGT2yBBJ7An1+uoaqGU5iiUy0J29TPNquqBnL+9e+wYWoTjXJt07h1OT3Ay5yZ2fTJe8S+UZtXWYrirsxvIazKerZteik1eToC1FiuxIWx7EFocVrhcxwFWQkcNZ9Lxh7FxhjKRFPXYr2gDxO1K9yCfGNLWduzuARsnAb5FzDuj5R3EhlZCubSPQGly5KfpjVm/5zHtxBPfL6sia2VxIGkcqC5OI8321NEF5JMVOQPmOD4WP5gH/zH0R9ALx1QZ+9HpyfNH7tYa7FwlmeAXidmVUdX/owvlrm+rdfj/DqJHR/xfSMWZShdbiaNj5pDpYbY7RNJ/2bTT42WnJVildFlKkODOwCF10NCb0DnygWPtjGO4gZKMbx5TaDE71IZXVQrUjY9bEtPi3NjWwYpngB31Xm3OGDiedI1wyqTJ1dAGcjmsfPDdyXY/919+fMI/mwo8RxGRiFpIJBw3ZoU7HXtOhXLcuH+FnpD7Ed2c/TpE5GuTPfQg67LnE09WyiBhFvfr7gLOJ+BVjtEPaeiyA4B3Y2xt1w/WKJSmE2UnYWLliATvF57J81oq7CzAPqB+O1WBoFj47k7410HmGx1InwK7BWYs659xeejOegsecyBIlYJbE8Mw7FxVCaqnh4UFXKsD8= X-MS-TrafficTypeDiagnostic: PA4PR03MB6704: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EjyXqR6H92WuD/f81yKikB7e85TP8ZIv0gkiTxkEKnletwndhTELly2++GpfWjNA9Z7bC5WUbS7RjYR5/zCs+PnojpkRBva5XYpI7eBtvVm8/lOt+uTAtjJz5eq5WfSgYsOB8ZxoOLgFK3ZXZoDTwSktZTDqOazuHVdDGHsHDgioxEe0hi9tnmAKQ8NiMebI7wPs37u8w9/SVT4ZfxCJY8ABjxxJTBuhMFJJ6U/ASs5BaSdaC8TDPggY0aE6emn3StsluydFHFy7EZfgVIOD5Z0VckYXNmIqqXA/yaWtepedGOC7ABHpl6H4T9xyMeJT50LIVtkvXu/QeZKCrSqsQHUP6IVXmxcKND7cTNlvlirpv7rnfznhrpg/2qXlT7X1NYxZOq8o7ptN/85aWkFJ7K7zSNjUjzVdXORrF3Dxalp161EcWURW6xUUBJYT6k3P X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TKUokWpSpKTkE0ehq3JXc0bMkDIffnzq1RrpW/UTUp6u6xCehshJn0yXlvyAs3C+BRRU5Z4XIrKsLYkGeO490Zam5cCzsCZd3kKQt5tAuxhMRD7uR68gA84l9IUbFYaXGFPPZuTvxvdjLshRjx9FdA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4a5e143-8167-4899-45a6-08d98418cca5 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:47:09.9281 (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: PA4PR03MB6704 Subject: [FFmpeg-devel] [PATCH 063/218] avfilter/vf_colormatrix: 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: 0uhXD+RzXteg Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_colormatrix.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_colormatrix.c b/libavfilter/vf_colormatrix.c index 73bc0e9cf0..bee80c69cc 100644 --- a/libavfilter/vf_colormatrix.c +++ b/libavfilter/vf_colormatrix.c @@ -404,18 +404,6 @@ static int config_input(AVFilterLink *inlink) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_YUV444P, - AV_PIX_FMT_YUV422P, - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_UYVY422, - AV_PIX_FMT_NONE - }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int filter_frame(AVFilterLink *link, AVFrame *in) { AVFilterContext *ctx = link->dst; @@ -509,7 +497,10 @@ const AVFilter ff_vf_colormatrix = { .init = init, FILTER_INPUTS(colormatrix_inputs), FILTER_OUTPUTS(colormatrix_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS(AV_PIX_FMT_YUV444P, + AV_PIX_FMT_YUV422P, + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_UYVY422), .priv_class = &colormatrix_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:40:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30757 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp695118iob; Thu, 30 Sep 2021 06:56:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbD8Ch1IU+EwanXiZsET5oiysqOjNRdM6GKyGPQ4CfoYBw0FSuZZcupvM4xNkdABb207ji X-Received: by 2002:a17:906:4482:: with SMTP id y2mr6865517ejo.484.1633010169475; Thu, 30 Sep 2021 06:56:09 -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 k11si2790436ejk.702.2021.09.30.06.56.09; Thu, 30 Sep 2021 06:56:09 -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=J69nYRke; 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 01442689FB4; Thu, 30 Sep 2021 16:47:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075051.outbound.protection.outlook.com [40.92.75.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07EA368A9CA for ; Thu, 30 Sep 2021 16:47:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A64ajT3RYeHHVopMHhPe9NG+f0aIkou7zBGJJJksQ84oB2sT0iwMVVzhZcmtRmx6epPvt88vppRwrW2AFmtib6U+PJr146tn2TrATUbm9yASqE13p1dMDvKhpqWsjw9ldO6192zKRUNKRrj/Qn37WXTtug91svtV8kaI6C8b+ijw+1KizmiNKFDtXQWilZE0UklTWpt4oVjoIDnL4L7zoqV7R6d/IKLUiKmVGLHKMdxTxIKeH3nXbfsHqFd2scmG/cK0yG7lQ0NSMauqnB3KWsQEmrhHsKd8cfHvmbnpgWcGBl0oRBZKCV4r18Aew6T7DgWg6e/+uXqApusjooeK9A== 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=PN9ruyU+xi7JrwjdsHqRLtofH5rpwQrjavOF6/Qy0/E=; b=TBsvFTV+j5fyeS4ABEdXBXtvPLwBz/gv+Edbt+tbejC3Jqu5YS52Q/jwVDbJM4KsaSwOVXATBHAwvtohilbkHTcxzs0JpFTUUvORouOPWiLzjzFrJ04PrhfHUl6/ozlwRK4OL+sSg1iUbml8z/SWK7u2Upys+zeNaGyk5cQzdpr4CZUjngo1KDRRkh67FpNDq716dGfRFfX6djiPw+JElvCSM7sR3zG758jVwS4zyPX/mtZIxIDtVMqOCZzYEKoeRaGZkw4As/j1R8j8p43zFyZxXHqDdlaS/ZgXcmKZ08YYgRSRPmq+6VU5Fm9TnN+yIy1MUkzw1pKw6W4um1HPqA== 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=PN9ruyU+xi7JrwjdsHqRLtofH5rpwQrjavOF6/Qy0/E=; b=J69nYRkeqeOZll6pz4tMZUrBjAlyicmwFrSjFxrErko/10cryONeNLC5kkTH29ISNu6Nwz0GO3uBr4HgaI3DkNG/WL59sLE89XYMY25XXkYF4DkPWdDOE49AzS6m/mEiYtwieqoTcz9o7594CGp9OzkJ/OlQLDWO+3J5XALo3UGOFnO2ZwACkPb9uLKBaF4McfJ/OFAO+p1e5mMCiegAcbVZqXyUVp8/guXHmrSYOoajZCfnFcdpVVylwap/dDZVMLlsoVUH/k2mWqqtyGmfJUzCBY1MlNMUaGcUkOdb4QYjSYuh6wkVPwubAxsA7Oq0GXE7nl24b6YI45eJ1Kmp7w== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7071.eurprd03.prod.outlook.com (2603:10a6:102:ed::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:47:12 +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:47:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:05 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [nGX8XwalcW8P3BkHGLRh5gMeqcIt51Pv] 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-63-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:47:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6d5b97b1-f72a-4ca5-674c-08d98418cddc X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0bPq8Fe5HKsw18diqdTey+yhBIDY2kfHQfQWLh9ScBddx3ixeiES+CDDwevHlYfYKGJmmPGstpzjcKsPs0nLhRWxixBipx1HooOcb96PyM9wMkDYJEU7ebGzQ5nqCRadASQaEjOAVbj2EfF6uAmopLNKmyCadokxRdsOyUtcsfTVBvH0HoffaHqQwiuM586+grw9FHmf7NsX6rr9fHXw1WKUPOraXnH1j4yKh0iOr54dJmPgyKTROGjZIIvkkxCwt6boFh8dBNPpAsfkzqeF40GdfvxRLf5O6fQQrfXgRWp3eEdQJ9AC5QqFfmXlS/m30sC0HCy+L1szJM8F9yTZVPAucwfqUhdLbAGd9mtDgCPvx0+IWKmmBhrwW6CG3fzajZUVdwYpDP6yyY1GLWiZ0LSnON+D40bfLoSuJ39iQTLT4qPETuMCVZS5aPZJwt5F57XECVuLL39aM8WbMmdNOcuWMBaH7QeVWiEMSnXVjhT4mMqe087SwaYFqQEODx1TdnnOFTiR8ql5DfcmgQQDFw6s/NJBfS/dxbCSLiWJQIl3Ia2KaTEZZa2tAQgm0vQmp4Ocu0ycf50UYBsB/kVIafcLuuZTxMLPJXyH2rfzUDCGynmr4KRyuEan9NUafGSNSXWP2VrXxgrej3FlyDh58Y6/T8VmZdheMC8XJuaDrrcjF9wOxAlCogIA5QE0fF4twM= X-MS-TrafficTypeDiagnostic: PA4PR03MB7071: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nnCn10UA2/p/ARr+mJBu+N479wkSvx3Xw9yrlObTU52ZYRmSNjGlt9qlzJoahDbkuHKRd3iOeewAp5fHN7N+ZRBYJZM+kPVYHzBTY7oik6dUUJs79vEi+Okq76zahlQSyg96PK5PwnZtjuIn0EPWarZ7KyokvteqGkYgZZl96TLSYCpgoKjwCgRbYIGqlQa2j2swJnuJJIvQcIbW4HDZSOiqVqFnaZOtARZV80MIjO9GinZKBqNAEe7G2lIubOjxEyx9eASxdI3cTT1Jump6VFbC+flf4gZvnjPRwF8nrwkAmQk8769C+N/x5Hy/reHvkDRPiKjJoarBm21GKb8GxyU7k19GWLip2ZkthAU9oTr0JKxb/nvayDTeFZbDpa/e02C0U1hs1bfBtYk3WdPTc1hd+Dz1T+1NGXEOhb5rCEQ8+w1uM/XH81gkQNNjPfU7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yahv0Vsx7oopc6JSBjuZW2N1IyZjTqyJmgVu9mnKk5qj0T3zvSQ2zFugcWnRWMZrEadKAJcTdCuFTgW9JxsjzrfLdujXQ9KLcFJYk/WC5gQ4OZL1BCdkfHp2LYcjAWQkCaW46/2wbLnom2RqMmyD8A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d5b97b1-f72a-4ca5-674c-08d98418cddc 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:47:11.9691 (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: PA4PR03MB7071 Subject: [FFmpeg-devel] [PATCH 064/218] avfilter/vf_coreimage: 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: omGW1vfg3eRn Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_coreimage.m | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_coreimage.m b/libavfilter/vf_coreimage.m index 4e1f89ee71..24f84a5793 100644 --- a/libavfilter/vf_coreimage.m +++ b/libavfilter/vf_coreimage.m @@ -135,15 +135,10 @@ static void list_filters(CoreImageContext *ctx) } } -static int query_formats(AVFilterContext *fctx) -{ - static const enum AVPixelFormat inout_fmts_rgb[] = { - AV_PIX_FMT_ARGB, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(fctx, inout_fmts_rgb); -} +static const enum AVPixelFormat inout_fmts_rgb[] = { + AV_PIX_FMT_ARGB, + AV_PIX_FMT_NONE +}; static int apply_filter(CoreImageContext *ctx, AVFilterLink *link, AVFrame *frame) { @@ -629,7 +624,7 @@ const AVFilter ff_vf_coreimage = { .priv_class = &coreimage_class, FILTER_INPUTS(vf_coreimage_inputs), FILTER_OUTPUTS(vf_coreimage_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_ARGB), }; // definitions for coreimagesrc video source @@ -650,5 +645,5 @@ const AVFilter ff_vsrc_coreimagesrc = { .priv_class = &coreimagesrc_class, .inputs = NULL, FILTER_OUTPUTS(vsrc_coreimagesrc_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_ARGB), }; From patchwork Thu Sep 30 13:40:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30729 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp695301iob; Thu, 30 Sep 2021 06:56:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwD2oCUmhNg+I4Gk+3rKABuVSs92RpxCq5m3Jq+jfAfTIzXq4ze3aQ22flTLgbdXJzDpy1y X-Received: by 2002:a17:907:e91:: with SMTP id ho17mr7042158ejc.287.1633010183357; Thu, 30 Sep 2021 06:56:23 -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 x20si3546407edi.199.2021.09.30.06.56.22; Thu, 30 Sep 2021 06:56:23 -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=PWyM5WV2; 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 5CA0368AE99; Thu, 30 Sep 2021 16:47:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073093.outbound.protection.outlook.com [40.92.73.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44C7268AE6D for ; Thu, 30 Sep 2021 16:47:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ckbLlaNkFWGvlWswjggcmW+kcHAXbk1DMOgTr2Mstw70zfUaV1vIXen4qIOBeaqZ2gXGdKsPIiztYSkQhqxu/CDfDk4nf9Re3PKmblWuGzQ7TSP0CUolvm1xWkzaTP4bID3QBKM2v+btOjjbzVoxn/JNV6QjB2kysOB7T3cwnsc+9UaszfFvDfFc3TvZskzNj0DaI/k/tOLnmL4m8XtOBy/jq2Y9DYdBCIWS8+hAHxlXSIFRjafZaI0G5FdyaLQS4tfH+i4dd+pO7dcXhYU3Lu/8cxpaTiWlZ3sbgiKonbHlpC6mjilA2wluMIhJ7R4G5k4Ak6s98RiB9oHbsVxQOA== 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=S9+H2O/sPtBrnClD9fMw/GBTuTqFEmFPnLPwXiDtZs8=; b=dihyYxH0N//8VXv8nhS//wrCRT3AMqPci4tTS9RK9kzlInq5yKXOV7TuDkMAdKJCtTci6R4XExJh8VPYSLXm3hD0nh8R3Lzcn8psjTbEkNRlcSJw8aKMDVKRPligA3RZj5yb/Cs6jgMLwzKtURAJjOCeg8Q0wHa8GvSqF3n1UhfHTr3lk5egO4Kdsp5drDsYeO+1ZK6N7ic4pwOnRLNnLgcetQINQpkZOLWRXzmhF04RPgVfTWyREkH1v7iRX/ZXgCaR1dCnn5hddfMrW5re45nRgLLnYugm7eaNKHSK6Ntqer+TSR1A04PPn2h6TuiIifEWsn1XTiga8urdI1HTpw== 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=S9+H2O/sPtBrnClD9fMw/GBTuTqFEmFPnLPwXiDtZs8=; b=PWyM5WV26a0/irYV/cZK5wQEK4ddHv/WzJImuXPf1WTJmC0snxowZMLRoi9/W40eGwc7sKkcrc77S3ajaHL9gsaW2oNZbr2R8GqXui5aQ793wnHKlSHIyjj2rKg1V0GkGPefLqG9GoP2PhlRT9OkA9Ab2qaBh/9GWGaik0draibyCIjTs9T65C0DFPfVoReiD9/50RlJjLxYLgfJXgNCI32qs9FRU2YP0tnlfNLzaSZsEOk4NQst32j9WdByIBdLbyA2VvbsR9Yu9AVMmoWcZ/YPI7ZAW6eEEYDT4eCHZGxMGHmudBeILW949eWf0pdDWShE+knXdsT5X9WD1kKEgw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7071.eurprd03.prod.outlook.com (2603:10a6:102:ed::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:47:19 +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:47:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:06 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [A/PmmGeBiSOhR2xwC4fnGTksVCnLINSs] 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-64-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:47:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 50e4fe2a-c0d0-42b4-8653-08d98418d1fe X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2l6PU0nupgTTc5B7RYPvKX4VpWrLJbgAAR2D47Ey/WU8ad31k3pbPMX2alKxRPlSMIW10T76eztkadDHArV2TPm3xhd9cmpnsuSPXuFDAJAnoevVBRdP1I8Rp9ssvgVVAHNARd22M5PS0U434mfVW7YEmCSwRk80+jcVQidQIMktwcEl3s75BVunU9trvqfWliCtMn8pOfMiLPNsPJomvOrIonkhn9GQnBgLbmxOu/zeRop/l6yLuwXlm2I4pU9RaL15L6rgQumvUFDYWbLn6WWOrcKf98eeuzcmv3N25Q/UdTqzdnyJCSEDBqQHxzL/XEDgFxLK7uq6H0tLJ0sjw4fxHpflkCIRPx7W6HzYDCU32B5ljxDay6l8ciopYr43D40Avo5+jauvzRMWv5InKOh7gQimHsVTfpfTro4hSuCPIkizT02PaLh+WZ1rGOa6Bdotk17V5YzEqvue8LI3T1rkPYRgkbzGFKirc3ieZI5dA6oP71udJJ4PoXPNJhJ33jM7BrPInuB3t5f2Nu+05u4+TsR2dGMWVDGhxOnT0K9GGFEmRyNLJLkY0J4BuRkaV2qoqvyuVm7QFEm+2rmrTLgkCUZIMo99LUQ7TqRc7Di1asRxwED2/idVbiJWUjKEJ3Ty7JSADlRn2KxRryMerEBzl292ZCVH1HrGh5KRgAo6aKViUL0fNeF2eSQ/LzHum/2vxVSBuzajy7tubnm/8UmMb0QQKLqF/O1flAFKx0Wms= X-MS-TrafficTypeDiagnostic: PA4PR03MB7071: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aNxeM+YXRQBalOMseJh+J0KalLHQZoPcia2cPmhLSuq/b30uuSQeHa0oGZ21+kg3MH9hJw8TQ9SrFqJtA24cPANOmmjZy8QiraZATTgehwR+yBau1l/RH2+NGgaHMLqfBSlJ2xOlvyMk0vBqRGXw8LOBCxCoSaZb/3MAUxp3EHAJnWO8XCkQaUVtmS1vrGgPyxbP4lCEsavZr/ge6CDdqHiuWU9TXuTaBXDAJmF+Yu/8JBPlQHhlPaMFLrsxdhlewLC0CD3jaUExCF6xNVwCyrhSgRZkAYc2JnvqCGDkzy+WAzvT1T4fIPkOJDg/m+ALq8whMqJ7kQU253I8uIQEpc43PEmRWgA9FTFd07Y57J9DsGsUPngVeOg+GRIwaRQRqMZmli8TS1Umdna6qUWeiDquUwgODvkxv/K1SCJFxmk+LcfpSktf66nOW7yHu8wr X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x07W349ZWexNDHWInHhHpyLJfqtp6vy3vrOX1WT5OZwTHZioJvMoGbPxdgIiXh9fkYmgyZCDPkfL2sDqMTbbzCM6RF4B+/U1huJAucLyMTagrxoA2U8DxJT8opOI2UnQFMWUHYgD+NgIDLlkmeR+TQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50e4fe2a-c0d0-42b4-8653-08d98418d1fe 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:47:19.0241 (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: PA4PR03MB7071 Subject: [FFmpeg-devel] [PATCH 065/218] avfilter/vf_cover_rect: 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: DyEQQMVEisSg Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_cover_rect.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/libavfilter/vf_cover_rect.c b/libavfilter/vf_cover_rect.c index 90e19ea8a6..01c9f2abbb 100644 --- a/libavfilter/vf_cover_rect.c +++ b/libavfilter/vf_cover_rect.c @@ -54,17 +54,6 @@ static const AVOption cover_rect_options[] = { AVFILTER_DEFINE_CLASS(cover_rect); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_YUVJ420P, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_input(AVFilterLink *inlink) { return 0; @@ -253,6 +242,6 @@ const AVFilter ff_vf_cover_rect = { .uninit = uninit, FILTER_INPUTS(cover_rect_inputs), FILTER_OUTPUTS(cover_rect_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS(AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P), .priv_class = &cover_rect_class, }; From patchwork Thu Sep 30 13:40:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30751 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp695528iob; Thu, 30 Sep 2021 06:56:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUmsu61o/300wzauZEbIgLgzqr9FcUTjW3duCrwjVmZL/0AmHqxuYKiRyGVX9sbZHMRkZO X-Received: by 2002:a50:a2a5:: with SMTP id 34mr7367013edm.150.1633010199244; Thu, 30 Sep 2021 06:56:39 -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 y1si3578705ejk.130.2021.09.30.06.56.38; Thu, 30 Sep 2021 06:56:39 -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=SWnzuY7Y; 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 8AD1C68AD3D; Thu, 30 Sep 2021 16:47:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073014.outbound.protection.outlook.com [40.92.73.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E43B68AD3D for ; Thu, 30 Sep 2021 16:47:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z8A+nRg0TeFR/09BogbS5EX43ap4VZTDpk3uqo0qiIgMWtDsYU1PwAscCR5s5b5cEPAFEY3Nvf4NHs1DHnFeEuAfPRMUf4PaqGIoeYdpk482B0CQcxDdOzpJg413llqKl984HrhQUKFVCvmAB6bBKG5I9HwPz1JpE7/EIjCN6K/AkbClFTpgOEJZX2hEiXgVqM9O5zDSiY7ErgmUs+LQzLm65C+v3Fch+aSHSMv2HrjjSa1fC/tzpw94Ac4eGEAr/mf1/UJcXpoCJ+iMTu+jOwEOtXsaIUipM9PziFmPgJyVq1xdsZM/N4yCJRuemmPYCJtzQfFJvn+W9IOGjGFMIQ== 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=dkwZcNcDRDzW4Kg0iPulVZrfup3QPqr9KcKhglXQStI=; b=aarF7ORpeOU3TnGpmUjwoSUiu2gU2iHIgldfIZ9k4mWC88G48DwNaJiQVZ3/kUgCIXNj44xiU+GFMtSZff0I4QUvVjTeh9ayOroHGTN4oWnhhGMEODAWMFota9U6HRlzmFLNLIAAuxwkwn2aCWkkZgvBaUG9EzNFa5avKhEKxJ6t9vL0R5J6f1IHf1doXzfuaLA1NlL0Tis4oq9k2/rrzR5te4bzvP5Nx4UTqbvx1ZXAH7cY1Zl6XS2c6rkV7kI4qyd7fd6NwJWnWNC6n8J8CPYFygXye8vEttuMuGKoyruB1uWVwgBLUfg0s0dDISY+nQa3YE8Ivundb7LCbp3lMA== 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=dkwZcNcDRDzW4Kg0iPulVZrfup3QPqr9KcKhglXQStI=; b=SWnzuY7Yv7v27V+icU51bUV/6BH8YmKUPZQAl2+uBA6OPFLq+FIhsczdDadYUupWyhvmixdIFGsiI3FM54T2yloEGQCxOIPcHtgLevX0mY0mbmUdV1Ef+bCt0JaOHm5R7XTm4MG4zVxqVjP2u5+aKUvACv5JUJMYd2ns5nccNA5i/v7GG8I+9MM7Rc7ggpDq6wrwKzlbYA/9ukT02+Ko/JAR0x2ixjGibgWVOhO5A9ExevyGxv0j6mW06IiO9q7Azu2xdfahs1v5xXGCvhviGImq0fXPijBnvMxB86jJxI9dh+VSsme8KcQ/tg9B0mJoscwmPcpQe8XzG0Xafhet5Q== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7071.eurprd03.prod.outlook.com (2603:10a6:102:ed::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:47:23 +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:47:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:07 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [oTZk7JGn9IhlLOhhZLxHRjtwOXC0KUHt] 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-65-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:47:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 003ee120-c0b4-4421-4ea5-08d98418d46e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOb9dbQKGMX4drG6cE9uaLQiuC0agA8pi5+QJF9/fM8naa/a98ph6j6FShKFM523JhEP+1S5KDcXJXxwLXBVsLgksQjo+kkOrNyaL50p2cBo+1qumpVOllr7b9tJla/r6d8MEK5t6/z0ge0yeW+57dCqwo3SfAiMhc3KpI89sKJNGvwWT78PR3pXQSbh426QEBgW56FKrFaeXCu0WXI12I21dpAhd2H56zt8oqsGbFmDgyLVN0Fw1aqUgbGfzEGVnrqYte4lN2gCO0ItbDAH7X2eZArWv288j9PG7S/6ceQ1+ykitdwKNyV1UlZpD7aiIrZbhAtLSmWy218z+8W93eMBHg6HTXh/GzWTGyfcnOExt0f8P09W6/ckzy3pQ1SkP5tl8D+9OtCjR8pjhoIiPuMww6Yp0uFZpLcCliKkMiIFFzWRhuZlx8iBi8dxhPqexRIf6W09kFZl6GPrY/MYfHGdglDgd3hP3jnFHNDo7S6wpheY4atfljXjvS3ztchXie6x1O1fvJiOe8W8u7tdjBzMSmVaxsKoBLt3VRGVqAYXtJ0dLk7v94Hk7eutcfowj/gsAddvOcMbgNqI0WSb+jLTb9o9TqJtqoMW4wDHQqsd5bDmFGoHvTX7tI+xSN0+RriV6/Dvj1hHF7omqVaRz/v98S7MDTxR70n79uZte7N53X5ZPBtweKT1EsUf0JMhGbuzgG9Hq/1Q5G4odOXsaiTc/nHP15cWZY= X-MS-TrafficTypeDiagnostic: PA4PR03MB7071: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fzv03M4S34iPpDWYdI03Pt77EJkNoy/lhgZfCIljemAovfi9qejXFMCREX87J50Z6M5V4n4HfSp/RzDTW6kbD/0K8dfxvgfB4JZJFrNbTPIcFdR/5NszBq5HJEs0CaOzsj7OxEmar3RTzdILv2dBHNTxtCl31MuHA+HvulsPk4LRvcF2HqgNuhqcSOfWS88osJKvvjp6WwIvSiNq2eN+HBZ8ohzyF3iC48o+H23tUrNHG//BzuOf1QmruK+bw+gZtYlLxkzsxb+7tm5ovgNLULAtRZ3HJK587qjicOE97PO+rgbgJZELe1zjeSkVm0ebeTykfg4VY8AP3raus9KZHKz4ZNWHIjkp1N62rc2ve+7dibEFKaficdAIlXj/7oDe3fWSv7csKVFw4tdAxDrpZTKpIzw2dkLm5CPokZoAzeISVH+Qjv25wvnIAkCbHikt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VeO6YEBG4FWeiWD8aUn1V44qiyCPShvZ6vuzYwE2LMUtfCT5lacFmZOonD6dIyDGRemtsY9m8hRtow5vMDlKjAw/sqHUxmrT3t6ENifZymVuHRT8sqEYly2+xhgmGZxYxKyzhSVNlYOUF00qMoAToQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 003ee120-c0b4-4421-4ea5-08d98418d46e 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:47:23.0673 (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: PA4PR03MB7071 Subject: [FFmpeg-devel] [PATCH 066/218] avfilter/vf_curves: 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: cMSik7F1t9xV Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_curves.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/libavfilter/vf_curves.c b/libavfilter/vf_curves.c index 4aeb9e36ae..22a1f8aa70 100644 --- a/libavfilter/vf_curves.c +++ b/libavfilter/vf_curves.c @@ -513,27 +513,6 @@ static av_cold int curves_init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, - AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, - AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, - AV_PIX_FMT_0RGB, AV_PIX_FMT_0BGR, - AV_PIX_FMT_RGB0, AV_PIX_FMT_BGR0, - AV_PIX_FMT_RGB48, AV_PIX_FMT_BGR48, - AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64, - AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, - AV_PIX_FMT_GBRP9, - AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRAP10, - AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRAP12, - AV_PIX_FMT_GBRP14, - AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP16, - AV_PIX_FMT_NONE - }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int filter_slice_packed(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { int x, y; @@ -817,7 +796,19 @@ const AVFilter ff_vf_curves = { .uninit = curves_uninit, FILTER_INPUTS(curves_inputs), FILTER_OUTPUTS(curves_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS(AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, + AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, + AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, + AV_PIX_FMT_0RGB, AV_PIX_FMT_0BGR, + AV_PIX_FMT_RGB0, AV_PIX_FMT_BGR0, + AV_PIX_FMT_RGB48, AV_PIX_FMT_BGR48, + AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64, + AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, + AV_PIX_FMT_GBRP9, + AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRAP10, + AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRAP12, + AV_PIX_FMT_GBRP14, + AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP16), .priv_class = &curves_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, From patchwork Thu Sep 30 13:40:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30728 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp695678iob; Thu, 30 Sep 2021 06:56:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwAJD9IiuCLVju7dGVAhfO6P5sdhsG793GdB8SA+PVRJnhIziP3o5ZgvOZJYKkku1EaF1Y3 X-Received: by 2002:a50:dac4:: with SMTP id s4mr7064026edj.374.1633010209758; Thu, 30 Sep 2021 06:56:49 -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 l11si3489858eje.503.2021.09.30.06.56.49; Thu, 30 Sep 2021 06:56:49 -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=mt+iQhuy; 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 84F5C68AE95; Thu, 30 Sep 2021 16:47:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073014.outbound.protection.outlook.com [40.92.73.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78D4C68AD3D for ; Thu, 30 Sep 2021 16:47:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jjcF+k880De2yju/P83VKjynEKYTpQPQLqDokcA5CFN748Np9t6hLhOOKidREuWaKuAQSn9pZcgnPpcbEXJAqk8u+fgSPRw5RJk8A275zRtvpfUJvmnEF2GcQGloVgZOJiGHz9fANrtOf1MQbCV89mOp3F9GgCajeNJsaicVJmwNAs6YM+e5thuoRoY5ZDF3D8mh0JGvEMuYm1PTzXn0Rsbdwpkpyodz12wUC+VctV3nDsatNMabYAUGg3jHx+7pmRXy0WW6LdDovEkrPX0pEg4ilw32+tyFZXucnDB8Qy6b+9Not/uKCpwLqfSBQYIhi9VPCIMEbBiggCFZ5kob+g== 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=5uS3O1JcCapji4VTpGwbwS9k0txn/aex+8zILbRpE0Q=; b=L0PNoLKwlDLkYg0RTQzV+OWBL6DiC+JFi/xWAzyTbLltkVnelKJKnPiHlUzIea0pfuYqYP1KvVp2nkTlFSS59WAs4Ej/PI1x1SPPUIgWZDZ/S1QU/6N7NN7hcdbhVIiadBpou4BUjIeFB2ITNI4hk8tXZOg0nQ5qa6x3FQNkwtdNaTt00flIAW1qNTFV7WVbVC0mmc7H5SeE6uTabgQNyJ1DbHPA3t5cqkhjurh3Z2748++BIbp6EUWGzS9LmJwnCtjLqZSzbMZfkjqSki0jSyAHxWvGNOk7KTX2UKKM4sjHhB3e3Z7LhgfHu/1ukWlNu2Mrod0ZQE8QtMzdm0QqNA== 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=5uS3O1JcCapji4VTpGwbwS9k0txn/aex+8zILbRpE0Q=; b=mt+iQhuy4S/021FcEYw8/4rWesPZaO/F+H3GGnY+7iI4pZp+CksPpLinQ83kEYJCuhQBQdhpVDG2qpahMu+L07/5YEUAk9IEB5jDI1w9aCzxgXPjdbU0Vi7Zn01bLq+9NB0pZAEarMSmdbIolUEo5m+sHcUsY4Ls6Ulfao9Yv5OLncvZiqeXgSMUzrGl3zv1zuI58wOIltTg2x32TnY4mv6hlvM14wFXvP/SP3Tj/OMtzbY6m4cpPZkRcr4icbzuiF4NXbpHRsWFYSVTw03ZsgWRc9BwpaqWkJXxtHVXTWJeDSlAqKXsYZhpwsMCuCGMJiE7yNCSuYo8rfZz4/W2hQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7071.eurprd03.prod.outlook.com (2603:10a6:102:ed::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:47:26 +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:47:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:08 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [dtanLHvXbRa7+va8wIoZBLAU/u92XM4W] 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-66-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:47:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5df74831-79b5-42c4-12b1-08d98418d666 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymIOARQAbZ9l0m4fLPROwslL2UWFApWYcmp54OhCRto/U9myA9SP3eBJQ6YmP81cClwIxOtlicwTInjiXA8pAiQZZpCJKp3zbVvgINKe5MaG/6Zxz14gfxrms04AtB/fk0Y3jttXa68Adjt61CRPjcyitdLmAXzZSNQCYkNUOlxeUaI+eK+gYfDpmMpTpvl4D09QL2vwetr9iwrbIJJn0zjNZExN8jWWj/bLwm0qI1y2VpxEnZoSDF3Dq62qbU2nc+wKbimDaAQAHDeRvYR5Z11TUviBWhSKoRsfToMenuN0igiNttagJ5NQxFITrKNm510xiqkuJzVoPPxpYilKt59X95+39lyqy+KITfHRUS/fFTDg0If8oxQUqM2fmIErYhbUht7PUlMSOpNe36sZBdWhVk5aXwwPwP1qJ7jOG+sn1aR2rbQ2FsxJxJYf317bH0+I7dkA7zQ0TH+an04lc/uom19NRsN2pEu7YPP309guw/jceiaUHzIDJJIbklH/7Ww+SuueH/aqyyo/+Ab4GmF4mHWG6nHx0b7aSSWkef5pBmc/Ap3w30jwD1dvBsbffJnn+dBqeoW1YxW41cPTn7CkqqtZi7R3OjfacRRLX6mPfwRrbvA2T2UTOfoEx2azhPN0CVlqlHKAx8Z5yRUijbwEoJHfz0HuF1+L2fugpQHwbTSCt1W3OEDf5nZ9KHBNaIt3m7Olb7t9hj3Y2xRG3D21WUAaCJOvcsQ= X-MS-TrafficTypeDiagnostic: PA4PR03MB7071: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n9dodHdgxzoZbeGAwo/UggKsjMcgO5mgszpbrm0QmO3btDU4tHoDLyaMPjFNlM5wpHKpAFPNgaYtCW4O+x+74a3JY/ADn+anTqjm/sXzdVtpU2P86oS4vnFI/CE86U/z/g1GXJNg2WHMhb+fXvx773VEoZtEbKt5lxdIVaDO0sKQJEw/jiW3eMmdUlZ4DUuoW6uiq2Qq3WxtHSBhL0fNnO0TOsCP/87GyazUOpHvL2vHod4BAUeO35wsYP/5Y6plNIsqPSOXNTpJtGhz/PTkK/phzZ44oYoesHhgm4h/QIR1x4NRuUsgqDHv0Deanmfe99+9DnH5TtybG6RfsfyouloVaPgn0tDxgkomiMCCuRoNmkkZwlf66jhtqHvskhr7qfZZfYoXjEs/rl5E24amv8Xd39sQQI1LTx27LK02AYjT9Mxeb47ydXIrJdzGVq+j X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gVMELrVf0NLxDd3uSndsvFvx5VzpxXw2yPNs5Y/k7/AVWDlMGkjUmaf4esDiuNrF/IsSlxHth4x8I68m5ZR240joSTd2jnSRFYtf5hIreV/D8vvPc0Qk1M7rk/WOLhTaCJQIxdAL0XSKMA1mdvruKA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5df74831-79b5-42c4-12b1-08d98418d666 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:47:26.2871 (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: PA4PR03MB7071 Subject: [FFmpeg-devel] [PATCH 067/218] avfilter/vf_derain: 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: xAfpfoHYKYqy Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_derain.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libavfilter/vf_derain.c b/libavfilter/vf_derain.c index 2950527f69..0eb7da18da 100644 --- a/libavfilter/vf_derain.c +++ b/libavfilter/vf_derain.c @@ -56,16 +56,6 @@ static const AVOption derain_options[] = { AVFILTER_DEFINE_CLASS(derain); -static int query_formats(AVFilterContext *ctx) -{ - const enum AVPixelFormat pixel_fmts[] = { - AV_PIX_FMT_RGB24, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(ctx, pixel_fmts); -} - static int filter_frame(AVFilterLink *inlink, AVFrame *in) { DNNAsyncStatusType async_state = 0; @@ -136,7 +126,7 @@ const AVFilter ff_vf_derain = { .uninit = uninit, FILTER_INPUTS(derain_inputs), FILTER_OUTPUTS(derain_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_RGB24), .priv_class = &derain_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; From patchwork Thu Sep 30 13:40:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30723 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp695837iob; Thu, 30 Sep 2021 06:57:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyf7Dnc6XSC78cZSMXsj5EbhsFiylITN67LqobG009ysisnF2BbwDaFkisOcJmeDabz9/Mf X-Received: by 2002:a17:906:2b84:: with SMTP id m4mr6950676ejg.179.1633010220695; Thu, 30 Sep 2021 06:57:00 -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 r24si3444163edi.292.2021.09.30.06.57.00; Thu, 30 Sep 2021 06:57:00 -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=mMLvInjE; 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 97F8368AEA3; Thu, 30 Sep 2021 16:47:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2069.outbound.protection.outlook.com [40.92.90.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51D3368A874 for ; Thu, 30 Sep 2021 16:47:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lMdJL/bl54K/aZ1uYCYF7w4g4aGglTWxW5Ws+NXu1sN7Ua1GOt3BOHNT/icSLyttbow0PecgrUlN5PHw5LxSftGfoP47OhUiXVkLd3rN7ylDbyAeGEvCkxfq/zlnNDJ5SvmxlJVoL0KryjYPvc0RXr8Vw0p41pSJPDOLz0SgeyJbuT/QL9qSKVMNZDyLU2zQxbA2c+5uKIqxHUnJJkuURMe2CUQH2Kzr8TKrj6h3U7yK2EKnuux9lO+UV2R6d6Su6VongApwSv2JTL9TO+wOSEnelndYQJciTyR2gbHYvjmMCJCdAtrMw6ENeXoGK6UazWG+lrjHe1pVtLK1PNwmtQ== 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=5CIhQS157pIl9yWYFSibTP+qjCglmZjNqzSHHYRL3jo=; b=Uo9CJFEoSxE8l0JMOTLJBoqiVA9UEP8gghZaK5kkx/ig29/pqZTtU1RQk9givfwRsAa4pkAMhYJVVCgIgUq4XsFkLYiqeT5ew053LT+ECmt+Hkd6WFekzAtl4a8wd4vp5/YLjuzc5jbIkbCYelp6/sLeTaczBAOXWw/d8Uyhf8R7fSi++6vVqpon1YJf63Ohx6BICfuNEYpCEA46/2JlMMyYrl6UZADAaDfoC6fOSX410iHh2qn5wzlxcspseSgwld80W8fOAdGWWZfGPRW2JutH1xd2ocWT7GQWT7tApHQbZFLHUoaw8Qu38o7392Oex/j4EM5zB7Ec1pmJ9ms8Sw== 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=5CIhQS157pIl9yWYFSibTP+qjCglmZjNqzSHHYRL3jo=; b=mMLvInjEi9HzKwdtYgEUrxwgT2U1i6kRJlYDXPFTU3hC87Ajko31sGzXLpIlwtfM8b3hPRmrQTVFaB4GC1mQCBPEDlTE9rn6+2PxZe6/sKygVM1I7u5kM+Oes5IEaN/uUDI+DXff3XPJ7DIHqtioKtQl15+ZIj2LSCsY+71UwRG8Llt12LGuXIr89+CAUUTR2E7ZC7IfNathi5mjqf47U2nGbSil5+v6dQmdDfXrctifobI38Kb8Tkv1UnwxuaeZ9UsIh3rxyj14UFVzHDvQTmapdvGp6ufVc5CN9hySfPjyw7Q/C+YQaigP3IGkqcBSpAV7HnsF2fu7dCpb041L+A== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5161.eurprd03.prod.outlook.com (2603:10a6:101:1b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:47:39 +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:47:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:09 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [+ktA5QYT2GDTBfKzV4T65abeKSrOn5cv] 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-67-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:47:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27dfaa36-d35c-4fa4-167c-08d98418de55 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOb9dbQKGMX4cWJbLJWCQVUuPh6b6cOQUQF3M3rVPR3tgAigQR1oBGSMgz2lSD8w4iGyiTH1C+VffqbjAjjxG7vSzZg6oORUJ76oruUEAfGjugfeaCvKVWSfHq9vK7RiMRiAKKxzKngwnl5ztzvHt9OWUny+8n5ppBctbC4WY9BRYTnnFZ4/cZjC32FoYhiKbyHCwMkWBHYMi5EpJAIiisWjWLKsQvo64Xt0cJde3IjaUvfeTqlG4j9YC9pwLWBkUfBogRoEfobYkVZJi/nyT8h5Xvh1Lovq1wW04RCp/ieTmR0kgdYlj6akKDcRFAggOG8+3GmUB/cxsyuVYVRzqRl6ZbdtGFRRqZBSvWFGOsjDEzYtqwGTVgj/nJEp+/EuOy7n4HG8iOcaeJkoZZ8En2z3gJTGIyNIvoSba/gXU5LEzb7QZv2EWlICc+P6DKec3HSL4aervj9vhQCZ12jCfOfp3WLk7tW95xqEcQFel3v5c/qde4Wm90ZdkuLeB2EH7GYFm4T8ENXoiAP6bq6wjDox5YEnNdRkSlqkiII8K+uRkZePTYkIDqiktEdm1TAtO3OyeR+CztVTVkkQmWp7rviGVKXrSh+yLR4GtIP7ev4cq78ZsA9L2SNDgNhfBbfRrp0zr4vJApLNvn9QNL+TK9OgjlRFo4Hcg1R7skEqC3XDy53GxrpBOYPfuzrRXNOmh0CT1RCKmrivi6xBOfxn3mdw7cfbzgxhao= X-MS-TrafficTypeDiagnostic: PR2PR03MB5161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YlcsnmskHHfyAyGrbEpFKNasbvnnLnlS3nu477yqoxaKw2HX2fKI2VdgKlilq8Ij7j0myniM6HC/8aXkrBniS7hnSdQxOhnsoGZPX2ust/PZBy0hQHWIEUF7SWmnU81oo/MSmREED3hqtfnFqqkwfpUUrDDiNuhC3MdpYhS8AoN9XK/yqgpauudD/B756HhO3KlzDmWlcbUj+ruMQgg8LqvgcqOZPfZjL+yJqgQjKhjb4o7EEHEqTPvBGZSvpZbv4Cm9iis4zK/MihlJEMfK/a2L0zuL3C1ZTwyTxBFr3k8RCtJoQ5CQ/rJhIsx1gcJzu2u/AOWBlL16n3pB/zRG1+sED8yZZb1SjPOStmOr4S8HSfkOV6j5y3reb1tKTCMcL2g0Q/Z/UbFEmdv+gMLisj1STjyqXQb6KWi8jFm3NLD5AG11hztEVFbZv7xlNwYk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ylXAe9NJ0qFd4kinovhprWd4vXzKqgJFCGLdoMDMEPa0pm/FQYiX/u+adkMHITwmBPejSe5WWLFRl41ZEx7kJwo+cf9YkPPzT2OG17HBmjaTklIsZBIDIoslRsi5C5QLeNlys6jqyj2ngyMqBDEqyA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27dfaa36-d35c-4fa4-167c-08d98418de55 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:47:39.7619 (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: PR2PR03MB5161 Subject: [FFmpeg-devel] [PATCH 068/218] avfilter/vf_exposure: 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: sgQJo22vhxU0 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_exposure.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libavfilter/vf_exposure.c b/libavfilter/vf_exposure.c index 6443eb77f1..108fba7930 100644 --- a/libavfilter/vf_exposure.c +++ b/libavfilter/vf_exposure.c @@ -75,16 +75,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) return ff_filter_frame(ctx->outputs[0], frame); } -static av_cold int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pixel_fmts[] = { - AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(ctx, pixel_fmts); -} - static av_cold int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -130,7 +120,7 @@ const AVFilter ff_vf_exposure = { .priv_class = &exposure_class, FILTER_INPUTS(exposure_inputs), FILTER_OUTPUTS(exposure_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS(AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; From patchwork Thu Sep 30 13:40:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30760 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp695957iob; Thu, 30 Sep 2021 06:57:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIfL3hStiFBhdpVuUBnNGHrSsKWOiPQJX/Kwk2hb75ZPeC6dXQjf02CwHL3x0nDGJO9S6g X-Received: by 2002:a50:dace:: with SMTP id s14mr7324677edj.369.1633010231503; Thu, 30 Sep 2021 06:57:11 -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 v8si3181394ejv.118.2021.09.30.06.57.11; Thu, 30 Sep 2021 06:57:11 -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=mXsWQPac; 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 9FEFA6898A6; Thu, 30 Sep 2021 16:47:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2049.outbound.protection.outlook.com [40.92.90.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3AD7A68A874 for ; Thu, 30 Sep 2021 16:47:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JvWZ1bwennYOfAZLM+fwKW/Ei4oIJjQ3xAACk8grzqtxcWXCGGrqMqaHFZUYzKB071qe6N+Ubh/+7gXFXOprGrVqrCwvawowvH2p1pExnYOxpfVnmxXHZuE9r4NYi32+spyVBBCbCqWo1BGfS5hkCPc5mBhWl8NtH837T//l+6YpGhkYYOrfkm78mRH3KUqRB37MLeoEL2FyikoTPLV5Z5j80HsMesm6auIqqdA91RWkLSE8Lg/oOoQK0UdtHGMZExUDagL0DqbiI3XGmtqzJpMvcNkrPb1iDASSqUaDirN+12CYJEcDazRA2ZlVmyALox3vuH4R1G+9kfu4zZpCUQ== 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=qOVDNN4r4IhZ1M7VgOwLpCKUPBLja2zVxEXMPp8beiQ=; b=YseSPgQKBy9N38x9UgdDDTXxDtXQZc1oQNDGkOe1ckCdhTwg+QhLCtY9ZDaRVTDeKH/cOR8eJgwt4BbncaVT7LXsEkB3wXH3iR9O/lpv7i5jb6W1jp5U6cib8/SQ7kmHJgrRZFk6HapVaCwUefwUOblMcozQK9DqgNkg7Gc4YU/DLi0FpJiYifA3FrnrmS+Li/yGLv6H2qwgfjV1/zUxczRf3SWZkqBuVF0iFSaO814mHcwH8jtEYxZbOULnC8XZ5c/MkuWww7DwaqTNc7dIi9dCCJR13AzRz6OwMzSGHCGXgaw2NpIGnzSRNA+M7EcJ2jZgXZHGMUna2dydfcxJEw== 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=qOVDNN4r4IhZ1M7VgOwLpCKUPBLja2zVxEXMPp8beiQ=; b=mXsWQPacKp1tJfMAl3y8KX3o1j6hSXiNJkp8kYIVHoad7Mk7ClirDXNf4iVuCitsM3FzeYapWd15uci746281mOU5KT2cdbGrm2CJ8lX2IupM7BKH1GmX5DcSh+4gk9PIbdxSreqNULYtNxmnEqA172T/xAhNwNq0waWl3T/ZEULr2QBb6O8opYK9bzCGNzffwRmyRgKvrVjuyZ/zFLaHISR2Pm6T64yrbORGp01siBpcPlQUviQiT/Vr0MQo3ge8+sSSWFz2U9TztzQ1bKY9153Z54gldroSJmBvzDIS4PGCJg4ZiEEVp42A2wbFrMBV2rEGlGT/PPIDrHOvBMmqw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5161.eurprd03.prod.outlook.com (2603:10a6:101:1b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:47:41 +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:47:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:10 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [iNNpGGF7fDkwvhgJN0ry3Z345OzHU0jF] 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-68-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:47:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 74932ac2-c194-4976-bb67-08d98418df5d X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Nb5Miu81Qk7FLh5A7Hw3TvekxNzuvZ5Zo7+/ZBVHmdb433/LktYAqy0WNw2gzFuzzS9feWJRq80MNUwquYmR1eMlNSr9xnuq0sXMvMELF1KGDWV7CQ5IJDEVJduwfiIYmMJ2BLSzVOwLqDdOsagaT3E/wT8M5ybh7nIclwjxmRalRi4Vi1fTLbmBzS/kWSrznEKQCfhxc8fjHOaL+Ewa5B7GelYZQkHBr4kHqqlErhs90rDRkMX6yiw6s+1bLU4M6uNyKoprTel0KoaOT+HvM+HduiJfRtKn26lgfTmCh6l2cDWSEiP+zEZGORWrjp2yEdfmIEtE5yjD7dkdfWbCI/wyLsll5SqFCxGdcnnAqqI+G9iKhE9bH0DHziA1N7tHpx3OLw6djNvYIDJ9SLCe1/a4Fk7ygy42eCaKUPqVLjqYsjDb7eUkhk7XO3Io0uPk9mGK31kCUqokS6yldu3RGUiFfmH0FWyjasNwYY1KEgXo3HTBOzU1aVWWI7ayuuPHjYuuBw53FSu0LypFkLCq8BNm2eZYnR4C+54NBACxe3+WDLPeRNd4JwsC3L8u1Vq6CjGqDlIHMthifMm/ip5QjR3/lCZQ6TIlPnUyNaA5KYDt9tQF5WuxiyNxRIQPMx7ICA1r2T9K4s3IMZJwWM+jiL7gppJZtyNVh23oDFyMQlyu4KE/Jk91PDddnb+hmrTFv8= X-MS-TrafficTypeDiagnostic: PR2PR03MB5161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q6bzeRZvzkLISoB1v3AEu8rdYFLO1zfYxfXknuzRpCIcYKtNwLpek//AIkVxqHJISQzcyoC1pVgm01i/pw9qbWe4e484SwZ7hceEx+n3ZyedeqlC1PCgNzp730F0bXqIr6dPT9xmlXkTryFVLEoT071Jt9krmX0lsPtcEuOCEdeuG9zxdwxqqzaMp4aHM+/JGHi/okfngknXvsql93ZfiNFwX1aer0oWlnE8X2rdhqmoZQH9Gf5RK4vG7cElYHbU9Qmdoc51L6/VJTCkEzGYTqL0G1oMEHh11O6pmBVL5CjanLgm2wTHw40KF3EeDf0JRtFkj0DZzPa5eJlHj/M/0/1gTE3v6Y4FMGOnEjRo+dig3IlOGenruW2qC438P40A2X0+ESU7XcA5AM7DhQBknnUXUXHpkfLJoWQFBAa2Q8dJpXfllsIG2j5+jOWBlra/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xFr/OPdvCjLseZd/e6OKWhiV9wr3LN5Lo8omdNd1btsPpQwhBKoQqxM6Mp1fACOgZjTFwv+PB6/ZHFPAkQQ0yknDgALdIk+C7Vzws1FoD5DfUMhtaHaDJsNg7LMLxSt5A+88/yf9LwkuW43aLKOUfQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74932ac2-c194-4976-bb67-08d98418df5d 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:47:41.3459 (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: PR2PR03MB5161 Subject: [FFmpeg-devel] [PATCH 069/218] avfilter/vf_framepack: 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: G4kyXZu8Bb4S Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_framepack.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/vf_framepack.c b/libavfilter/vf_framepack.c index eb6fb70ae7..f30909ccff 100644 --- a/libavfilter/vf_framepack.c +++ b/libavfilter/vf_framepack.c @@ -79,12 +79,6 @@ static const enum AVPixelFormat formats_supported[] = { AV_PIX_FMT_NONE }; -static int query_formats(AVFilterContext *ctx) -{ - // this will ensure that formats are the same on all pads - return ff_set_common_formats_from_list(ctx, formats_supported); -} - static av_cold void framepack_uninit(AVFilterContext *ctx) { FramepackContext *s = ctx->priv; @@ -471,7 +465,7 @@ const AVFilter ff_vf_framepack = { .priv_class = &framepack_class, FILTER_INPUTS(framepack_inputs), FILTER_OUTPUTS(framepack_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(formats_supported), .activate = activate, .uninit = framepack_uninit, }; From patchwork Thu Sep 30 13:40:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30752 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp696142iob; Thu, 30 Sep 2021 06:57:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydMgit5VqeT9UKXFRGb0GiyZTG/q4SPbWJ8LM0varLYgdAFXHDGwipC0To5mrOvC4dRxl2 X-Received: by 2002:a05:6402:1c0e:: with SMTP id ck14mr7484882edb.377.1633010244100; Thu, 30 Sep 2021 06:57:24 -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 q15si2808512edc.177.2021.09.30.06.57.23; Thu, 30 Sep 2021 06:57:24 -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="WgsWf/Y1"; 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 67F9368AEC4; Thu, 30 Sep 2021 16:47:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2049.outbound.protection.outlook.com [40.92.90.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BBF768A9FC for ; Thu, 30 Sep 2021 16:47:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hFKojPW3Oomqf/iJfQmFBvk5WdIws572ryLiZJgQ6gQCRrZRutZVs+NYVdnygcgZQCPRmRSeYHuQZQ6JLz8sPTbKcDeTBdcPAyXYSI5aS6PPZ6xM0Ex8G8GcppvUCJf4KxN0oLY3m7IiW8XS/IkXpk3woWUlEklLpz1G1a38p+W36ng7+XTj/WRAbUvMjCUz2mytuoiOhmUy6DFjYNFbguJ74zHXDejMtmjHCPW4TJKVJDW7Ti3uE92ZzaFXZlvJdJI5B9ENPeUiZ7k85XQUKDUI3zjs2mytn8QfwbBSmIWWNOfC6HQkUkXQbQbMFcN3Z/vX4L3JPQAMhBdxMutYyg== 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=JFl2JwaPD9NzofFHdDBfXlRPjQC8fPYaFIFDHn+++RU=; b=R8MJISs//GhT+6td8Yt1hp6mb6IGRiZ4Ff+ODuWcPza0y4kj+s3iOwgQ+XEk2Ml62ICaLZ7Ad/HLBBLA6adjPEsdeeAgIslZd5vWjyc0rwi96ehxxIEtcBQjjzHb9SxhFW2tEhZr9MKipKmxZWf5Tx0SvlBBuoYPjgxrMx29Qs2kV07v33lq8vlcuEUzZS7wArc9lO6RKjWwzBvX456JKVu3w4GlP2fBrqQ1jNj4Enhb4aayIjlWVJCD8SdXEmzzTTxzrIxnTrycOddjKq3I/iPgqnvBln7/xYvk/wUo0KW+gtTzZd3dVobIiznT3ZrEoPQWe5++SPXhFEEuF4z89A== 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=JFl2JwaPD9NzofFHdDBfXlRPjQC8fPYaFIFDHn+++RU=; b=WgsWf/Y1c2fl9MdqsPq9KCVYiqwQRsvqbAdy7N5Bgx58exeIbFQ+LFYerbPc632CWPGOC3q2Eu0uhF29Zg1ODyWeYAOR9czGfm57fRC9uWnuzFYb7dNjTkUGMa0SrB6XCRKw9lklGogWJyon+UeMoFccZswLc4jjXXox+Wa7/RudUuBQB6heseriFnjurdNbTAagBl0xHm+gG4vgI0hgpiL9k/4RRCaSkNYKvdX+/KEZQIuEGaH6JuWm/w4GtWIx6jJyfnSQ+oLNyn4u0HIKy51cc5kMDB5JwyvIm2ISVBlQprRaQoaW1ByiJ6B2pzaJAGDAgtYkPVf3ztmGG745HA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5161.eurprd03.prod.outlook.com (2603:10a6:101:1b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:47:43 +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:47:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:11 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [EIsDN8pHWALDeOcqmmCW1NQ41miPIWxn] 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-69-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:47:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 307f5f22-538c-4624-71c6-08d98418e0e6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2l2+3H3DBlVYxbmAXhegqXhzc2m1wDklZUFF9U8+Q6CFtkNWsGNpjjcQ0NuVFZJvsk0CX1+S5aNrOEx6zifhXg+PejO6sdqvK1zge9MU8Xs2ZD80tFo55pZ++GS3R1U+Xy9hbTah4TCE/xBdiSvqaJZ8oUJtMcKfu0yQJV/AjurK+6dzpKEsAqcVNGKtdC06mNxLMhdB0av3jc4aCo+SPIz8CQhj/r/TpKJ/0tT+XFaWehE/iMq5/bSGnTtVBCjCrCRXwngYNpiVhutn0/9FruXUF1PyA8DY/XyTrVFF3cl9l8PQrQKNRJewn5iSZ+eEnLzmit/XIb2hgBsJpm0Nd360cOFveggn93aVYu7/zMaA5KvcmfGRqUXZhDz0+Y9p6R0370NBBoiTtUx34mDLmdgowmbE6jfZBve2H8wVfntJYsL5UXoHV6Y28dD8Vj7jK36GdesocqzmVek7BcKxoEF6Npir6G+3FofcJ9biCp8Fp6i7kE4FCoqnMhaYD9OU9bDQ6WyNJzMyKpulnTUOd3ankS5Qucz1mjpSD2jUTVYJnQpC0hA12xtngwDWed5MED46G5fcdf4lo+q0hthCHzC8fyy+SiV7sxqmw/FqPXMbfGJ+2MRr9LuDwvzAy+6E7yd9RmGbnwoDxxn6p8IE3mribtzQuDeK1eaRFlmGmBol/77Zlw6VuhBqDljbTuvNaRCmQI6EJGdqOIcEuSMREsbxndDBWUmTspEXLYPukBRDg= X-MS-TrafficTypeDiagnostic: PR2PR03MB5161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j4iJqTk35y+gmqBafjcN/dom2Hqhzc4SPtBitnSqn8pPv3xQLQlTgGclu/bKF5UgWbh08bSZA7HUy1JMiR9kL/WOb6LA0y3SgtxjOpfEPN9Bg8sHA5cmGaaOtpUxelTLP3CakILp0ucvXIGqGpL4bMnEWPQbjoHXYh2zpQEoLijCHYzL6PVQGsByy5xlcGmWITgukX4qiLTfcslJ/3VUmkYR8sfo3NXRpdKvz5bgkEBwsP6E0IYK9nTPZYXqhOsGR4ZIAqTfdkmqtzDk5/tOsMFiHt3e/if6ndGtefKi/1En7Rz0dphHY/A8pMNZdwd/7FimT3fWs/O6fLBx2IgP5CTRUj/wAKMFFnV3e8wGoKmnGDzf4051hFwRRx2t9yDuU38DW5h1pC5OC+n52SmWj9dVf/WpyGNWHdUkfvk364X5PoYotN9U0EMHHAZYJ57R X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YQsA9fnXPQOnfXik/BKTgvWn+yphJEnjzPFEJVHYKWUMCFnSEk6Dkv4pxB06TUJBVDr/CIHFnQCAyyRYFHZT1GeALbHO67P8So/tqWeoEmF3vg6CctttNzINGQ1x+fLCGNOHVNmHxl6hVLmw568VHg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 307f5f22-538c-4624-71c6-08d98418e0e6 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:47:43.9156 (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: PR2PR03MB5161 Subject: [FFmpeg-devel] [PATCH 070/218] avfilter/vf_hqx: 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: A93vJByWoeZd Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_hqx.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/vf_hqx.c b/libavfilter/vf_hqx.c index 7f4dc7af37..bc70d984e9 100644 --- a/libavfilter/vf_hqx.c +++ b/libavfilter/vf_hqx.c @@ -461,12 +461,6 @@ HQX_FUNC(2) HQX_FUNC(3) HQX_FUNC(4) -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = {AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE}; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -556,7 +550,7 @@ const AVFilter ff_vf_hqx = { .init = init, FILTER_INPUTS(hqx_inputs), FILTER_OUTPUTS(hqx_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_RGB32), .priv_class = &hqx_class, .flags = AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:40:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30722 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp696331iob; Thu, 30 Sep 2021 06:57:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOlpShPjjJRBDyP5Qn08K4NBqdEV3pgrP0zvk3/ocX33kzMvgn3dFj+ebnqq3dmfraWmtM X-Received: by 2002:a17:907:1df1:: with SMTP id og49mr6910805ejc.35.1633010256953; Thu, 30 Sep 2021 06:57:36 -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 ds7si6671578ejc.6.2021.09.30.06.57.35; Thu, 30 Sep 2021 06:57:36 -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=TeN6VzHe; 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 5663E68AEB5; Thu, 30 Sep 2021 16:47:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2049.outbound.protection.outlook.com [40.92.90.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 803CE68A874 for ; Thu, 30 Sep 2021 16:47:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UmeJ4wsW00/CY267Ius4If4DCnulv8RhHn/64SSIkwOTg6PFp6cgzwAVFAYWnrmyO1xC6N/bh5Nfce3LebcRyu3bjR3VISsrkEWEuXoBhbd0yrGUwKxmGGRdlRBi6ADxgDXRuhuWf7NlHgI6uHSttsh+K9E7NgFthWFgs2UwtryL+mQQfcThrM/Yx6lT2yO6QwE18QW5I5Cqz46PHBzIhqU21pI39IwILO2KB170aap2SC8hPoViyXbxQUlQTfYvz/0mV6r+nndgaGSaT/NK4vcmgse3Q75N7SM61vBazVi5KwSKHCVQmkPiOuO48PAHOxNM03EgAgtwvh8gH/AztA== 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=MqMnRwCNVXgKAUtk2MVNZVtH6mTjcxJlvplm0sUeQvE=; b=lcoPy43A5ilMaJE/jne2DuieWmqO3J62Echcqx9b12J/LA3C+DAT54xopXEDs9dDNsaHhLHJ6t3fpd/ZWAr1flyRXCBd4jhWrqUytD9RNFa9hSmgzMq5mGm+PTsakkX5xKW4ub0BzXWoUCnWgFPn3xZl38fEcGUbtwXPjJvRqencmvUUYhx+kF9680LmpqSiCnpWw+EK9hJeowJT4VlU1PWsAZeirYse42o8khFoOJg6+9GvXlWetBu3hQV+7NrB3yBeONzLoepslqc1OWw7RhR7G/gakNXzpmMoM8zx8fVQkZZ1UJ5tI9HP+qVUlqF3fNgd4doWNjj+ksy0m/nvkA== 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=MqMnRwCNVXgKAUtk2MVNZVtH6mTjcxJlvplm0sUeQvE=; b=TeN6VzHe12QeLS9ZpbJfGIt6q3ajWfY2JueQ5IyLBCORUoYnV2asiZYFHYaYWOfJhPy0WN2URnhUA71be/r3h1T9nO0NlUT3tRU+93U02TXUAn6yHl1QKWFCeMalZRv9o5rsIISYDLO6x/qa6OCa4kWX3VTG4E9V7PGwISCdu9z/F7EPMTLKG23XMgMlMh4+OwFgTb5CtiC5DFLP44ohaOtngwhGlKlnGjdfa8yxZsDhEcA9VDQ4sEjLafQjNyj5redTRoJkIaCBRVWpfFKjeU2KatjXNC0CXqArWw64gSwdR94smxKfm77oTc5OHgBfBRQf+xQh/PI1RPd36Fhung== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5161.eurprd03.prod.outlook.com (2603:10a6:101:1b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:47:46 +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:47:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:12 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [VTb3ui1upbx9MHMGFgeic6vZPo4Dv7gW] 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-70-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:47:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4b8925e7-c0d6-4850-3c35-08d98418e281 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymIOARQAbZ9l0nLKQ4v+dxeKvW+YBqBaH8/7ojEReo2OvbsIdWXdmZoVBsHQd9734WWWq9e05uqet5pbay1QmKyaeanev6Ig6aRI8VRJ7lQKsiRCqEo/upACoVumYWc4B1CdU2pSzA14i7PVgky1903TlXIAGfF6zVsZ6iV6XIqBgv0A7IAvp/UNg8ihk4qbRrSQMFwL5ZT6p7q8I6fX6pkP78Yp0cDUFeHpZ35WMTLmZdhX/BZ+vRn8AUwWNkUAejqyUPyrEcRbsswFgcBBaHi+g5mskC7ZdaKreSvFTEbkv0gultIiefC+dz2ugscqKQSj3MJZTDoiOE+St+w1/RkcqtJT0HgIiYne79+n8dUXAY3D5iTLSjDaXKCa9J4jwpRy7t7uBMisvaNKnHHf5RdBA2S4wBNFhkx0t9Vt0zCEjVuG48gAU3jhr0g3PgYHFj0t2Esq6PvtYboLDUV2if7lvj+5k53UNitYrJQuhNf6J10W20lHpjZy3lttYAeTQdBg739n7TvxamdxPqld7TH1Xksdqp3FGNl2gPlvh55mCvNd63lc4NmqfP2mmCNvuNvVAD0yhmD+2UupM5rZgeRbEIII1iGujAyvrDoZvACY5rkQpME2ULj8vGjN8BV+W2Caj9ZGcJ5+rRORHA2jlHkyJhwkEUckyG1Ndh5jkdoxU2/9YyAU7DArh8Dt+sB6Qs9M+BhSkcJyxJ6zUJvShICC2D1oE/wiFpg= X-MS-TrafficTypeDiagnostic: PR2PR03MB5161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1ct38WHtrhroOlxEKsi1cXa9xOzBERI8AuBlzIPCOvnR3elnqkgVbz5siWsib5cwV8xAKmJt/z1uGCCO/2UNvBvnkdc/yrnmqzdZgnRRyKj5RLEkQwoW7tS54WvbJ5DPQYi0yNIGOTI0ZA22YoZ9opDkeKDqWgTmha0ZnCl8BHIv1w7pl4WI/qoRke4pTAiSKLL5sd/XCOd7AX1eqRLMGZtnoBTVFXrWOtw1qFSf7oMISy/AA0blCIpPE4ISKS8+ybtXZJsqJ7p/N0+3CkfdwOBjkozhWN9OOZ1DI96TQBVfbyApTgHJJSGLugvOQotaVCnRQe9jJPNFsqEC4FN91mf146uoc6NxAGHM/AWwt4J7EKtTNLqrsZmlGZ1eKk+gWfejzET//YyCsST0GhtEdqf4+qEipEuNXQLzyGJpG2XZ6H4pNKJCbO/HOwg/eE7I X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dGHW0l4WQYz3FDWIklYD9r1ayMMWIKOyzeo1mjfdF7bkkB9QzSGzpTROrZX6BDWcN3f03fLSxmd5mTsP6fxZg3gMvb5fQvmSzaLx4e147b6YiRAjbPX4wEQbLCazWVq8mV85oJOxNhw4lH7OPLCfaQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b8925e7-c0d6-4850-3c35-08d98418e281 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:47:46.5998 (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: PR2PR03MB5161 Subject: [FFmpeg-devel] [PATCH 071/218] avfilter/vf_lensfun: 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: Npz281Egi1no Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_lensfun.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavfilter/vf_lensfun.c b/libavfilter/vf_lensfun.c index c9a62ccee7..596daed104 100644 --- a/libavfilter/vf_lensfun.c +++ b/libavfilter/vf_lensfun.c @@ -193,13 +193,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - // Some of the functions provided by lensfun require pixels in RGB format - static const enum AVPixelFormat fmts[] = {AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE}; - return ff_set_common_formats_from_list(ctx, fmts); -} - static float lanczos_kernel(float x) { if (x == 0.0f) { @@ -536,7 +529,7 @@ const AVFilter ff_vf_lensfun = { .uninit = uninit, FILTER_INPUTS(lensfun_inputs), FILTER_OUTPUTS(lensfun_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_RGB24), .priv_class = &lensfun_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:40:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30732 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp696510iob; Thu, 30 Sep 2021 06:57:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJgGBZQYpLwt0UFpEsuNRYEHF1IXwIPln/TRcYuw7c4kA/1f1LnsdFGddUij3Qhmn4W5/O X-Received: by 2002:a50:8145:: with SMTP id 63mr7396537edc.190.1633010268526; Thu, 30 Sep 2021 06:57:48 -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 e6si3554144ejl.722.2021.09.30.06.57.48; Thu, 30 Sep 2021 06:57:48 -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=a0ia16PR; 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 6FD9168AA1F; Thu, 30 Sep 2021 16:47:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2096.outbound.protection.outlook.com [40.92.90.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30D4868A9FC for ; Thu, 30 Sep 2021 16:47:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lgjx0XMkVu+fXNcQC0tP8pa1DEawAwVistHRUDoMGEg/E6MCMDdRndNQSxiXJ88Q0+4n6aoba1PuTAU+XVB7nNZDEnJwyaH0KCRabUuHspXeoJSf5l2SPV3j7qQqdLIepc8z873KSnEqBvQyBSZCFRudAjalwdf9A+0cmVASad0sm78wBLiInTETq268Q8UqU1xoNK1b9eYQGNiAml8cLmqbVfTmvBSt+eNYKfs2sDkRxRHuiIYAYBwaiKX6voqXBwQKm5RzPuaZtetGDMXy/2ZUu7woSkk1Vh4QfBbXROirepXV0ycWY25zyu14VqoIYWpNUkV5m+X4cetdBUShdw== 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=7XAza8YrUxg/e7lPjQF1cOtkJG2ZQIy2OEYmclYd6Zw=; b=bTRBekFVggJZWGFn8tKl/EKK28WffttW6EVyIh+67pEFJgq3rfBcrVPX98urFAQrNThqElU517jN2eT8/UQd8iDDxpr83ntwZbmQuSJDL2jMif3kvHKLSnRG+kRXprioPtsggrCCRO0njkN09EC9Bm2QAUHsQ7Uyjh/HsQR0q+vHmnCTGm5iQPsX1H+5uPYPL1m/XrnxT4POqiPwNbgRhD1H8BLLwUwxtBM1ljX0Bgsc7bStVbH6Z5oFYKqDu5H/31YnYqgEYwwPagL++m5xyPkNrEJPS/cgwbuxhNQ3h8JXGbMkzVc3UN0dQZ3B7v3fgSMJBWq3x9czQvbMmWU67A== 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=7XAza8YrUxg/e7lPjQF1cOtkJG2ZQIy2OEYmclYd6Zw=; b=a0ia16PRLl4146/eM6CfCfj4W1+vH3nFR6MsWsfZnKX8G23VBw2LNtcHgpm6P4/ltg2pD0BA+wQxKNrgtvxHVIg/ZmnZfI+EJ6I8Uab7Q+78RnYvT2jzv72jeVFcG00lDhEV5k9ty6Xzj6BRzNqsHUOKIE6/5Sk3m6GVPXWOUrDD/EQ8N0dT8pW4LBlyZDVwnMi4B47wm1sN3B43sG/1vH0XgXSMeZsxNbPOlDKZFp8exCVVudND198WE1xZbN5bfdhz2yiSGQMDIUOuXTGuXcKQnOSrvSk4NyJSVzv0DYOWGmaBk+QDVhSVyke6zEA87w4pbHJX4b+949/Tsy2XPQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5161.eurprd03.prod.outlook.com (2603:10a6:101:1b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:47:48 +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:47:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:13 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [GQe3cInVguSp3sTz3p6BpycdyciT7TXv] 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-71-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:47:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cd1718ed-ff5a-46af-243e-08d98418e3ca X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymIOARQAbZ9l0rFgyejjvmaQun/xajJELkckDE33aqpYTe2NzofAmaD21FqG3Kw/42tu2vi95EX97tH/27JYyel7ngBeXCNXhpPEFMTzJDYPhTpP0hlZg/LVbpQdDemhiUh01ipmqlK3fxOdknkU/8iyUAqNG1oRXEe9ZambZQFmz8lm382POw/xU1hm1t9YGFUw7pHnE4a3NOuzMT7zZmX5c55e+E11zuGrlQ3WhioeAxD52lHm5BIfI8u20D1D1XfUuQAQdFm/jnIfmcwArsZdLgmWLU28vMNzMfadOc5IMAjcNbRhKhXDuffUgelG7phzGEhKidrPEs2Xxb+3m3owsl9tjK7/kSgB5EvM3xh72mgrvXUqMIUv+MecaHBRwRCFmyHl1cOsK1Jf4aKj3N2pg7zy0JP++Zkz/uLpc2GGhV6bRp12lSkkyhzte2fKoEqmabzhBDLUiIOTDTzf13+qjzmt5AnjNQzcgjdsRKfvbOFO4juKiUGnb2j9hbPJvjYRLR0VbEO2/iCUe5T6KUki/5kPR1GM6OaBdOhus+BZursyGcAzl9iFs8NsFZySP2oGSGC86P/l09UM8krTi/835B0Cem+lmRLuvVUzTUku9VLuvPWNY0Q6keWqWOIvbLHr1iMjwVHuXTZQlQF8YclWz3dbNV5UA1o9SYX3Xi4pBl1ofQgHxe5byr1f6/gI/jN4n75ekyIyB+DS3PMgpuwZxMKXfb0xrrU= X-MS-TrafficTypeDiagnostic: PR2PR03MB5161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: erwylJTp6Cma/7A2DFaby/rHJsQWaRoc2SpShtyRLLkAujV8JupdcWMu+cbObrfmduJJFFgLxjVnlZsY8ZcbcHLByZCy5CaDqVN6i1lZptdCmx/xv4L1IIa05tGYvCyzOKjNTJ+6+0c9wkrTu+dZXMLLTf8B6wa1qls3cqDsj4z2WFOVPhYd4YeXybiAKndeXlpSyRoRY709rpHCUKGB89P0Lx8lMbStGSxqEvNvG8bJuYP0rnJfDiFOo0jpQDcwFyMuVa9xqWiSOxzY5pHMn/cRqMCk+5ymSqt0et8ph+r1uGFSzi4nJpr6lfA32AvDl5+nDvZK9hLCh6RIa+OMRok0S2gfyV+Lggp+muZM3yOwPPY2XQ6OH6a8nURTpDaAi3ST4WsVKP//u5UrOv6Zh1o0GF9dCdcsHV/0hYR8naetW1wgPZgWZtKd1MDekFaI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oUwS7GrBx25UW/olXfE3voN0Jf/BE9iTk+ZzWUHgxbVt5Gm/IIUUomqjeSm9CCQCnZG/kW/SOncl6jz7NO30Clew2gj81Z7YT94ComwmSsnxKTNz60XMNQtNZcNL3n6d0McTfvdmZ1KP0GmysYog7A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd1718ed-ff5a-46af-243e-08d98418e3ca 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:47:48.7712 (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: PR2PR03MB5161 Subject: [FFmpeg-devel] [PATCH 072/218] avfilter/vf_mcdeint: 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: TRdYev57VVLQ Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_mcdeint.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index fcbc0257b9..e747521c0a 100644 --- a/libavfilter/vf_mcdeint.c +++ b/libavfilter/vf_mcdeint.c @@ -162,14 +162,6 @@ static av_cold void uninit(AVFilterContext *ctx) avcodec_free_context(&mcdeint->enc_ctx); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE - }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int filter_frame(AVFilterLink *inlink, AVFrame *inpic) { MCDeintContext *mcdeint = inlink->dst->priv; @@ -306,6 +298,6 @@ const AVFilter ff_vf_mcdeint = { .uninit = uninit, FILTER_INPUTS(mcdeint_inputs), FILTER_OUTPUTS(mcdeint_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_YUV420P), .priv_class = &mcdeint_class, }; From patchwork Thu Sep 30 13:40:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30734 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp696661iob; Thu, 30 Sep 2021 06:58:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3qAdoHuVlJ8iWbnN1LRIIp4dtUMWZOdFGtmElsTyuRCOODRWvyDTKMKMY3A9Rl1/z41fF X-Received: by 2002:a17:906:6a8c:: with SMTP id p12mr3788221ejr.486.1633010281386; Thu, 30 Sep 2021 06:58:01 -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 j22si4368495ejt.173.2021.09.30.06.58.01; Thu, 30 Sep 2021 06:58:01 -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=QAQ3LQ83; 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 F2CEC68AED3; Thu, 30 Sep 2021 16:47:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2100.outbound.protection.outlook.com [40.92.90.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B160368AA49 for ; Thu, 30 Sep 2021 16:47:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OkzJtkq2USbxnR6Yv4/Vj1YlyJJwNDBsMWZW0wYzkaHEwv4bytht7KtNPTAam+9pxOOzc/Hx0fNSbycwiHpX10+21gZfYDm3HH8CDrHSfzpY9NMH42wDRE9CO2wUVMoK9rTvER+ZlO/Qh749B+LRj3zVT/VE8nm5YHLqfuTpbFoXvbBRDW3kwQh1qPCMNsGnYQJgSyQz1CF8QWdUB6EX/17OcuM76cYbNoc0Xjej2b1CSjy+ldxKHIMJBclJh9kwGHvLz88T70AM9Sf9uXpM81BVXenQGG7gc8Uczth0BijV7DZD0HILL1CmmxDcC2hO1TrJAyIybyS+yld/nNrIDA== 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=WiN71HXDTFxr9Y8JAcpdgnTkc4HBJTXXTVdkcraOMi4=; b=C5HIyynmVRXn8YSZ8R+u4DQ45fj3Q0NsBujsB3f5l37YQRIEh3gkQZskFaBAQe3e/dwa7bNTAyrNqTPmgQtTThHW1E0AZU+LQGiWdZtSTFC9o139+ySwjrdEvYvCfOGX0vtUcS/SnkwywMtCmt/SaUxTu/zclN8qVx6oT8HcCG5KQ1QcTSap3eM2WKND+phCwpdZLeZ4kIpGQtUNp3jtzu8QWFB30XB9Z4MxJaC1oM2lNvmE10SGpT3Io6zr1rNfb/Ct7xJ80eIlD0H1PVMCKd/J8WaIV9OpnYcMhEDNsEwXUUYJd45vYZ9feas4h0JKryTjyuUTRTsqYIrPQOhH+A== 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=WiN71HXDTFxr9Y8JAcpdgnTkc4HBJTXXTVdkcraOMi4=; b=QAQ3LQ838eRCU5rCQjw458vVy/T54K0DtNI2vu7s9ybm5t61J3ZOhHraBleVfbO4555SUmk++cYflnKc6wfP7tdBDuGSuEWxCgZk9yBV0c6THI4lg5nKqAWHOXes1zeGW5c/y7REC+nKUP25/KpXi7fHQsFErotrVyODCihGT6v5Q5Ql59nEIdEcVolnJPaLhcxkV8QawFDDmAWJT9+1J9JdSer5K126MMl60L4DGzru23h5LjZoatfo9UVl2S1AkDt6Qat8NZf52CqVFM6nLUB6kP4d7eyBbA5KUFp+c4uXN9w8ui8CxzxN9q69NuVsleuQOSMQdhdc9Fllm8nSEA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5161.eurprd03.prod.outlook.com (2603:10a6:101:1b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:47: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:47:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:14 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [i2w+i4QuoC/9vCyfbqAW6xNZfqm/tUkS] 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-72-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:47:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3f9240f4-b369-4442-cd4a-08d98418e600 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbN6ihUoa1XKEDcvHQuBkEiy6tHUTCefh1fSlbgHpDUEqPXD+NF0UhmUK6xyHWlcpypNzBC2jvHDj8SgQR/jLYGZd+Ug+4l4gNk7GnSvboadodtitShwfymHy1IaXCiGVXQ1So+cAeV7b+bEZYyB3w5AzMSgIR8twm46/1YwMDy2rcDL1I3GyK0VoC2ENoTbfpVAYqrGtPDcTUiqXdUSzeDJuojvJGzRX2KUc+szGUr+hcOBzHLKFoTYxbUptqxxsEfBQCOPDrLS1bqV5TvluJn7KFw+W4TILKZaS8UczozQR5Ldy2Jg6hKEyY/7no87j5RUM628t4f/ZxDIG/RrWZZHLWGIQxNMVUA2/bR4bq3XTlmSXodDSZK425MNlzrndrVfvx2x9WChd5YMaQORAtTYIsjiDv04DI20hyLTdHNGXOVJ4GmfBb/DGumDwg+UHOXGjSLMJZlP12Kr9p2Wrp2kJ6JR4KHsmVUWZcuCAxJEE2RKMWsSy3lU+Z3fpwgmTTnl1hNuDjr967k46IcNtyAN8fLmT67Nk4ZCsuhOuWEuC+7kDM962qVVwgYNRumv9AXOluKHxHlQI42eOnQIN6Mc7Q+DRQTTPzMORLkF2eE0SHfLcRqJ6hXkym9PuRff8jRnGZk0ANJTxsapBuwGdtzNdvD0dVjnsW0O073ap6dB16P/F7XQzY1gWUiRBaDrB87mlU/ttXepQMAXBmlj5XG+bxRUWxPTFnU= X-MS-TrafficTypeDiagnostic: PR2PR03MB5161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1L8zFFbXHT4fdZv1vGizwIKMkS80SnXNtedMEymjUy3nm01/ZfToQ/pJNhj446PaAb9DsYJ+10GXdDjvSAbGABjYeDbB6HWUwHY5MaAn9EjUJAGP1j0bIZ0uK4GSmTQHRLWk4rEQaZ1zopydtmKkln3hVN3Nzg+LiHehdVku7TSSMSH+RQcU55uywOOnk3r/xp0N7wVrbxDGmcg6zlYH4UYzhds0UCdB3RQIoAPZ44mNZt4lu6gA9X0ReK5/Ml0C6zWhg2NywpX/h7/VTAi5HPEIWwqhXdFsIlzdysMuTcNqgOg3xybdi6L6uuuEDymh5kidtFcpf71MQxXdu/UBKt1kCLiWA5+zf79p4tyI902f8fWUQl9jmrIY+3eYIJ+H+fsxSYIQ2PA2ApnVW85/xg05sQsba18O6jd6f9VifMRHbj0MLqkcNx/SAc3BddNs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TfRqMkPVDfk4F4j+fexpGW/w9rtu557HioLFwb7arOUdA+ig8IYu9/TQbJsC8NUL+14BcDjDhPctGO6ZtetTynAqD05jzH+2PL8OmJPXcP6OR4i2uuUWMMVX4HEH+tEQVfRV6Nhkdp7tmLc3n18K7A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f9240f4-b369-4442-cd4a-08d98418e600 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:47:52.4839 (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: PR2PR03MB5161 Subject: [FFmpeg-devel] [PATCH 073/218] avfilter/vf_pseudocolor: 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: B6TLk9hHJJi7 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_pseudocolor.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_pseudocolor.c b/libavfilter/vf_pseudocolor.c index fd84a0a819..cb9c9c84cf 100644 --- a/libavfilter/vf_pseudocolor.c +++ b/libavfilter/vf_pseudocolor.c @@ -279,11 +279,6 @@ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_NONE }; -static int query_formats(AVFilterContext *ctx) -{ - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static inline float lerpf(float v0, float v1, float f) { return v0 + (v1 - v0) * f; @@ -924,7 +919,7 @@ const AVFilter ff_vf_pseudocolor = { .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; From patchwork Thu Sep 30 13:40:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30758 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp696856iob; Thu, 30 Sep 2021 06:58:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDaxYmDSoMU9B+Jbn0yQj6eiDZQ5Zkdl10ijtABveK0deN/elzm2FNB3z7WJDev8qqw0/z X-Received: by 2002:a17:906:f75b:: with SMTP id jp27mr6756949ejb.479.1633010294489; Thu, 30 Sep 2021 06:58:14 -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 bo27si3511153edb.182.2021.09.30.06.58.14; Thu, 30 Sep 2021 06:58:14 -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=J06xFWoz; 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 1D0B868AEE4; Thu, 30 Sep 2021 16:47:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2014.outbound.protection.outlook.com [40.92.90.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D05268AECF for ; Thu, 30 Sep 2021 16:47:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VLcy/i25cMuwPXkhrnSQwnHFXiSjRGHg+ul1ZiHCrgOTo2E+0klxhhJvoamibHI5B120gUCdjCNDJeeelWPS6jhVuh8EO0YtSCbNGWkGL7hqB9addqavv6qK5WHt1k+QWO0Md0nSOTiUNAIx1oN5NdeM7m/AgIf4mjkIolDlhBFV/oQydAeGwlIOFjCQLnxqA6Ymzir5J5awsEZ00TnxcxJlE17/gwgI0ifv6T780EsYUEq5I+4zALsZ4LpvQ/tdDl1TFpzppet13T8k52Q/mYAPDeisNklG73yn2SbOgezuiZPLGJC4Tz29VyZmLBNgG8kjR82zoRwXOOGTvLi4JQ== 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=J65kJ11DpMRHK1apjIrPaUwnGhYMqL0kLjg3H3urG6Q=; b=dJgMfgGZLp0PkrvyKmCDXVIWoQEAe75kDN8UWmKV3BWSU3RtvBJhfstGZglpiFu+i9mNH1sTsPt+siI8EdbsNF4tup0zKTzxBJQ/Gyp7wMkemGKg+DKxIVeKdERGMgWgc+kg9TZd/SiIzJI0Sh4GC3Ezv8A9arSR2XQIT+1RH8Cd5wIFvOGgfJy2f8cgdR83Tp8E0pcjmDQ9ROkly8oGzChqa9f3f0fk3/C9b7ybysTfjuKzBFzaK2d9DuakIrLj54gSCUQa3lWJaUrk7LdwF/2Dopr7aGte8aJbAoui30jDGJeBNv9RMVotWeNeNIjNBJobv0VzKYJa1lRa7gBqgA== 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=J65kJ11DpMRHK1apjIrPaUwnGhYMqL0kLjg3H3urG6Q=; b=J06xFWozoBW87rKtcVarbumn1+0ctvSQlkI8fpDZ5HYNJLTW7ys79+Ue9Nfsp9wkY0+LeAtB5/9wZt/oLvTTHHhAWOyOvdF9VZzdotECUOL3cgpvYz6CT7eBBaF46e0bk5KjROJ2bczUTOUxXGxjh2QUHmimvWvXMJM4E2g4SZjFrINjVgHWiNGhpLtxfuliTP+nlAZP36pNOit4Z3jF/9yaKZJPc+0wKKA8kJKmkbpp8B+soAP/WqUyX7LJ3+QeC3hilYrGsIjrNzl+OpFzh0v1gv26vpX1oQqo0LQTSB2Jwm/7NhN+qtayfJQVuBLFG9bOav6fEzq2WK7XuzdnAw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5161.eurprd03.prod.outlook.com (2603:10a6:101:1b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:47:54 +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:47:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:15 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [S/4x6Kpgb/EoBlpwmcoywcArCbr6kYAZ] 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-73-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:47:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 62b23284-eb6f-4376-0ab2-08d98418e76c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lXc27DlA3TZ7Oe4iqwsKzUmElfaC6OTrr3JE2ASRd52LHehWjYoRZBIDCPJZ+h2DUrXwh+0Aoq81/tk2rjsZqKseEohsZ5I2i0rnZjSvMeCjoG3NsrCkfE6LYoN8vOzfRQyl1o3VyyiRj92MEbWd+pNlfYPQXo8YRnWxpmG0GTFSgWMmdI5P16hB45AG/Br6+2+IDeI+mJ1O95sGDdJOLCLcgWlgESh6o7SMsSAvtNyK7nVWw1EqimkDegOC1aIC1udARr+Z5yocSitzEmktkJEqCdYktD0YonHv4Io3MpF2FRJ8UqAm9Fxy1PqdxbXKO1mju44NrNYj4WTi6tpOG3qMImxEIRjL7BsH+fpF6+k9O+xQXdpmr7seUouDq2YsQGYDrDVAeiIYgIC0KJljqnNxeDxjygDxhjVfTAQ6E9jTrb4yaAfD7F6E9flep+ln8IR4U0WBHT3WAVDshpPHE+a+ff6O7WbCS6FqzmADtJN5czObSxJC6K6R07QgBBAX2gEMZDrCSYX1bEQNKrFU7KwxGeeddN3EP/CapGLaPt8svdniPhNLucnqLucfgwYthBurusYuw/dMzNsVjScOmorW91tlqrxa5Q1BLL5t3Ch0SA3Gxk4xAn1APVKgZYeHcnBsL2Gscb9hPDnLkr5qvrH5Ex9U28Yd5Srzgx//VYFUwmVRbtD6USyRr0XFAuHgxRF8SgFQ+75bTak8EPLJlTvSyCudEy3achd5O44NaSNI= X-MS-TrafficTypeDiagnostic: PR2PR03MB5161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Lug2jhNGWh0rPIwod0w6BcqYoeS7oxtgYAUR45j15RlenWY5unx96zwkXEEOtPuPUpPr8FYCBDrkQXwfcPc2D4149oce8VwaH0NJEUbOKuASeL8WplEwyaHEfOOVjaDp9eInXLr6oLDPFiYG5sSAkoHeSmBGE/KTHclpT80xwtjIPUT7QGXwXIoDifzYQ72rTRn2C13XHmMHtcLrM8AG0M2fMAiHzkyijfW4gpdfAgJfPUkzRItDVy9342MiegRUic8TLBi5ROi1t+RxVZ2hjx2s9T6dqT6D24YgV5jcT/nJ7DRBPtEv5E4LpaRiD0yilnYBkEqzOrgbszPzr2qd+GCAbjZR586jJkxiuLzgYEZXTtWmrrvsxdh/dxJQBBzQLpf2UJ6k61RQzFX5zSRmGVhdAeAdrZowObA4ZeZExxQs6A4fXqMbaShGz0NP802A X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hx6uQaQoh1HiCZkHp6M8ekPeZspzo07OHjPqrr/c0utOElmPLaMcdYsmx31+O8wssWA4rI3g4uMBN5V9mecd5FLB4hz7oexDfQG6R3Rm5lF7phycxmHe34Tkc7yw6XY9F9J5tP3lc3hlxd8AJQGgRQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62b23284-eb6f-4376-0ab2-08d98418e76c 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:47:54.9311 (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: PR2PR03MB5161 Subject: [FFmpeg-devel] [PATCH 074/218] avfilter/vf_thumbnail_cuda: Store format in filter, remove query func 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: krxKpo5BHfN3 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_thumbnail_cuda.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libavfilter/vf_thumbnail_cuda.c b/libavfilter/vf_thumbnail_cuda.c index a7a246c959..491542c60a 100644 --- a/libavfilter/vf_thumbnail_cuda.c +++ b/libavfilter/vf_thumbnail_cuda.c @@ -412,15 +412,6 @@ static int config_props(AVFilterLink *inlink) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_CUDA, - AV_PIX_FMT_NONE - }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static const AVFilterPad thumbnail_cuda_inputs[] = { { .name = "default", @@ -446,7 +437,7 @@ const AVFilter ff_vf_thumbnail_cuda = { .uninit = uninit, FILTER_INPUTS(thumbnail_cuda_inputs), FILTER_OUTPUTS(thumbnail_cuda_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_CUDA), .priv_class = &thumbnail_cuda_class, .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; From patchwork Thu Sep 30 13:40:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30739 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp697004iob; Thu, 30 Sep 2021 06:58:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyE1CP7uRtOD2Pi9VV2zifgF7EK12RdCwccG2iY8EWEA4Ok2TQLnASb7awDY0pZWIiX6fdq X-Received: by 2002:aa7:c2c7:: with SMTP id m7mr2075781edp.339.1633010305575; Thu, 30 Sep 2021 06:58:25 -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 g14si488951ejb.50.2021.09.30.06.58.25; Thu, 30 Sep 2021 06:58:25 -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=klCM0jgi; 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 36E1A68AEEB; Thu, 30 Sep 2021 16:48:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2049.outbound.protection.outlook.com [40.92.90.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 952B868AED4 for ; Thu, 30 Sep 2021 16:47:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ru+REQd50Ab9i7wo7aTWjFaqAHRi3CMRbFXhgwJteEDpJnWZIA8OMDNj/LhpGdHkZXWsMGGBWg1OW3tdICIM5XlDS8Fihvj0FWdfvOQp7LPwMcoTcBYK14IVPGtxS5OsvTHaVNFyTq34YtOnAzn9P85Vhxl87O72ZHdaD+9SmhurqjWxbLcdiAuwZygQe19NVYZqA7c9m99x64G60R7LQa5UlC0cB3Dxy6z13Z+qOAMHGsK6Msc/EH+fPOEsjjNTJTWi125RklEQz7KYBgNXxvmkhSW0ZA8wwfiseKSjwPMiVEtvXhQqNprcjoueo1FF0iVNBLYThDLMPxFbLdGlPQ== 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=kOQGYKIU8fW6z6boPQeu2ZLb5KErpG+Noc+B9eTHrNE=; b=Sbbg1LtOyRZwxOCjbg27trjjQWm49x8UxT/pbZ4FKK72oDRfXthhpKK5Mx/H0NKrDkpFx+VN0h+vopwjEY4Lal7VlmttkkfkPer2ZK5cNn5JIyh3lHbmK4lojO+U7/dxgwvvuxqrgpb1pr5P2dKW1yL7xX3JhR2ErB4AOBLa8CrxYb+mvfF8YBnji7iFp552R7b7CKWce2XGtVi8cH6hAIcLXDnEE633ZoJ6l3tKx9MNPcX9egAyg5kaKheTMR/xHCC9MOybmlDbIZ3/nBCoUg3rBY2xTsjbe6xpLcH5FBol8ILXhoUeIUmZ1A0PIVFONpUTe3+2Gv1ugM9tjxCPXg== 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=kOQGYKIU8fW6z6boPQeu2ZLb5KErpG+Noc+B9eTHrNE=; b=klCM0jgiAPfXXbMzUjNYz17x2GYJx9XBVsjIhcTepIEXswFIC6haYpcFS6K/qeGCYKcikkKpAyje9LO+9PhP4N6bZbHMuX0eQpBqMAD7FiFOKbLCrhqVXAZJ5jdku1YJWLAZNlQYIrAdJHT0EHZvOfTcK4P7AEEjN4UGhzmqKiaHLz5gnASyccBfrq5c0Xrph0DEDsfYnsHCKoHtJ5APX1Ae8oR8cK1XO91Ppp+VhxCZmQa00EZgeLulUTCQ2OZqI7ovhea2qAmwJx1JORSeSaunrxj2VVjkyE+lbgjaQfjr1OppU+avvkq+q0SNdy9ungJgQvwD5MdRLnP0czYdkA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5161.eurprd03.prod.outlook.com (2603:10a6:101:1b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:47:58 +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:47:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:16 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [7iKM4I6HYCnmvult8RI9Vf7yu6GGbb89] 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-74-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:47:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b55b8362-d2cf-4ee7-d153-08d98418e950 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbN6ihUoa1XKEF6d4fLZcynnm9zQ0Sw8YD3LhoYdBK6cuyD18ohh5xYBAIqzv0yL57Bikm3NkWRtsSIvwhbJCarVGA+/3FHPZ25YsI99JWuQo/COTyIDERFy22GWQuF1MkKt1xYxdVbEfMI22Q6vWjAN/W8Fxgn8oMQg5XSr4F1N/SxBSM0blhRJHsd7JcxkQ+sWL1c96W2qxFX+RqFy5LjT6QtUlF/Kq1osQpvtEZ4FdymIETj0KZvU43ADmcdTfbt+pE/1uG+/yfMg1t2dZrXC/Mk1j5+gc6uoNvoPnph66uaJz+oBGQRsHeVa5z9+YQokUaDMraNJ3f4OgY0drXgoBL889cx/ctoAOAugD/OzzmfmJGhqgFZpu2tffOZevRJzPbHK4m1lllp9UPKnrWQzA4iebjJX55+FclGodT3PJaT8ABTQ4zR3JdXxc/SAuQlutkNj3UZw5Sl8kVjw7ocbV2Yz/+oNtPS8dlF4luTiKHuIHBs0D3+bQFLs6lxqmtcTwREI9RzK0CeYKIAJKoc5NdyN7HJ19/m7yIxZ4krog/xp0JvUttLzFeuy38mEAkyK/9N8qPKuG22Z2vbHMfU0ehOQmLI5Mkg3JR/ODOE3BlTKqlNcM/jIYOX2lJyU57op6CIljbsqE5b+3oS1ng53nW1i37n7NaWDamEYmuQuJ22opVCDEFw6lTmEyBGqHklRkb3zn2QWkFQTqUD+tagqgCO+ke/atv4= X-MS-TrafficTypeDiagnostic: PR2PR03MB5161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a7rBNsYguTujovI1OcuhNkqVVeLDSx9PFsDgxvFOhjExUqZbtZsUxA6cS4/VYCOuwx38FS1I1e0+uY9FENNnjYEvvYgbwplH6CfvYWrxhOV8FuT/m0N8BQRzGBmCwcLzKQDyN8Us7n8FrznR+HoI66Aq9oBirInhjqDrzSUp2PtCzXJstMlfLIHlxJfRddDdC8MadwO8jGUrzWLpeKSGScqBPwyv6YnCjaRyoh3nwvx78paiNkHnazEJw0C51u7g0ooXjE3CPhbfGSm+EPWNk3T+b+2Aaj21OvrTgfUIg5M+NHNT9RrfApPuKqIwLeZSA2b5jKnhl5ta27/sQS8OAgq1BnVL70m5qQ2f+b4UmxhyJ535oQQHRjH4xnh6aQFRiXqAXNVAqpnYatlZsY8B2zXVomDJ3T4VZKq0oPFWEBOTa0HQ//GbNJfF4kESVJKX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4QOTmcAW9q01MODHxcodHr4fg2DvZ+uIVtifRNdRl2U/JfhTgPWkh0OtY7H0wPLphfLG0duAZeRAfzfQ53crRNvPPBdYey9I6VjHvhwGYm+u4iMglBRnilD2z8unpsGap7aWRqku5KUsjQ6LwTeKNg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b55b8362-d2cf-4ee7-d153-08d98418e950 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:47:58.0335 (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: PR2PR03MB5161 Subject: [FFmpeg-devel] [PATCH 075/218] avfilter/vf_tonemap: 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: LNGkiUkF3Eda Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_tonemap.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/libavfilter/vf_tonemap.c b/libavfilter/vf_tonemap.c index 51f56c7386..363df8034b 100644 --- a/libavfilter/vf_tonemap.c +++ b/libavfilter/vf_tonemap.c @@ -71,17 +71,6 @@ typedef struct TonemapContext { const struct LumaCoefficients *coeffs; } TonemapContext; -static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_GBRPF32, - AV_PIX_FMT_GBRAPF32, - AV_PIX_FMT_NONE, -}; - -static int query_formats(AVFilterContext *ctx) -{ - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static av_cold int init(AVFilterContext *ctx) { TonemapContext *s = ctx->priv; @@ -341,6 +330,6 @@ const AVFilter ff_vf_tonemap = { .priv_class = &tonemap_class, FILTER_INPUTS(tonemap_inputs), FILTER_OUTPUTS(tonemap_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS(AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32), .flags = AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:40:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30737 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp697125iob; Thu, 30 Sep 2021 06:58:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjWpzV31M36pJCwYnB18AjD1Qn30Gbi33JIgFEAUhxRjFGao0S2o4NnTZRzo/9PBY7FDrZ X-Received: by 2002:a17:906:5e4d:: with SMTP id b13mr4537513eju.428.1633010315979; Thu, 30 Sep 2021 06:58:35 -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 g13si3323550edr.467.2021.09.30.06.58.35; Thu, 30 Sep 2021 06:58:35 -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=S5oBssCk; 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 27F7E68A83B; Thu, 30 Sep 2021 16:48:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2055.outbound.protection.outlook.com [40.92.90.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC3D068AEEF for ; Thu, 30 Sep 2021 16:48:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mOcpJDG2POc4r3Hk0bUEjOEnVZi8BbUDLJQPLuPoXtilwf7V6yxgIsa7NCAn2N74+OGLMiwDoUWep5v38dyiNOPc/wv1FQO8mD7X+/1QXBHn4uzDFOYloE70KYYZgnxzyiON3FEBmfHzKvFB+yJ1arq0OFU2HgsA6QYCpm82j/eFLQNIs+SJ3NWBp39ugvTneFQBBCe7A1IW+4wvtjRfibT4EjoUjWrhg08hOU0j73ShDZblnniGIFHxMd7SCOdbnB0F9IEXhmXj5JfI6IO3I7+7xNQMekW4ZyjrrScLIH9Zx3stAcutXHeLQIbKcCvP22k9ZUvLP2YCxklwUBwkuw== 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=rXSX3rfTKAQoutjgoKU6qrRHz1WBAnj3kQuykBemXEE=; b=mEi58ZpLiJ8ah6glOJEZ2rwaegz3g9sbhXOQ5krFWyHJcds8y96SLCtQqhcTwG5offOngYB0VY2OKkCPILB/Tx2eG4amRIcQdyNPacB/Fl3smNg+cEIXam7eTr5HAKVtrg3QqNxjXBZAa43iHbmZEJyS0UvR9uZ6ENUwPjjDFs4oxSt7KV6K4XJg0Y7/tX4lHjx7fOy2AZNydSVltbtWINrZzzhk1Ogkqpqj1HT16XoNQ4rNI87Qzm3cBe55Ctfb49dCgiOOi/f1eGIBoqAxvlTvWBjuAqGq5xCEhUQC9EXKo77+MhbUpux833VXpiQAiYp9xibCn2bAVfXlB4oDJQ== 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=rXSX3rfTKAQoutjgoKU6qrRHz1WBAnj3kQuykBemXEE=; b=S5oBssCkbRWbiZ/XkT1PpSJU9wp73F1K3BRZz6vHMXFMxi09+q83auAlrqufpHTk5udQMeZcKowtqjKSM2RQdP955PBvuA+C+Mt7njEficCINXIxu4J00bPUYLXLLCEEe796UruqLXA3UQRI6abdvSnDJuk1M8U42WZPCVyw8STMZyKyTPTPVQbJ4BBdKrZ0GjEkh8AwgQ8EakhZlvZ+7toaq3pvw7crgvt6E6FHNxwUs79gPk4B6deNfjryPBm8gDquZZHzOviqQ1SxV41+HD+NreYqQ+ugTh1/GDcz+qJGVmhsfpfO9grGPvc97uIwen2jdzFItYeuIUOgwxVDRQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5161.eurprd03.prod.outlook.com (2603:10a6:101:1b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:48:09 +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:48:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:17 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [EUy3xcwN84c8zw647rXQr8DHKx3PEoOb] 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-75-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:48:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3925c09f-a74c-4dd4-d86d-08d98418f033 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbN6ihUoa1XKEHXuNP8S0qOvFASoZIvxekJdLsJDTfZF84lCGOKRxVsICm6GBFqcGaG0EW0mA6GXXDwo4CIuX6VftvuOn4QJv1gReKXw9UIE5x9MBzmHKiiY+OPs4BquhCkgyyOaNN/unhB/5YVk24Yw1B4iA+WJB6xme1PLk0rlDvLaVGs4I9WDORzTpky6T8rugJ2ioOUFuhqkQKwisP0wDN2bCnJS5oMe74stS6N0YbxEjzy0mfji+YeYmnCJ9j8nNVPAyx5wFhA9NLlmO2961J4kEPn86GPzhScdKUTxJDzkJ++04RFdQaEz7r6Q/J9HiWTPaCkOtq31MRh52toV9TS256EbamxhJi3MadTBhUNX2uTcTQOLre/7/VHpSfq2SAnXVnil8HevQ5+xfCECE5osNMeJYzccEan3REDhDIMiy2VdQ52Z1vT9fIfQMncNd1AGWxU6OL484+tLeQQp1NYn/PAt6oUv7mk4HpprteEX3e11ndf6cXfwp7nbCyUbNg4ZB/TTG1Q4h6A+iWVKfmW0GiCC/BaXK4oRNLlYOCWcnV72HuGvrDvWQ/0WGSk/0J36EzpUd3ke7vOps1AD2tXhQfCXnsuaMlpbBqGuLObiKm8a6o1dLhSEsQ/dnl+9CuwiaG/S5Y0tvlB3ao2OZwbeT2zCiBHY436NsnOokBHNhV/mrGvT/5swlSXEXlqAX18y+HkSunGCbfl0wbSjExqBuy/Bk1U= X-MS-TrafficTypeDiagnostic: PR2PR03MB5161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W/vrCmTVajZPXBEsLXO8W2mSMNOa9mxABAe5JlerMLIvxZwBc1OvnirO7KHp/1edQwAlra8ZDHq1YsbydWQHyv9NBwqkt55Oa+9RiagF2RUbWcaWE2KaUiju3S1a8OCx+LL7azEyqRDQHWbCssASdSt/YS63SRABghIy59xQ5q4bRp8KUEr/4ZD/avP8euoMshO/MTKyt67rtCF/fpuuhz18ebh67xl8lBYa76r+3J0j1EJyaRnQjaGuPCQKl9OyNImhPwDMf7RnagwCCdBg9DncOfbc+/r/BKzDalVIaUsWQ4a615If9zYnfKaK+9t752yvOQIIqe04oe0tTUkJfc2GEfPt/sf0c+rfX9XtrndkXmceDdTyT6yHXBTOQ6tMHxnuU6XmE0E4uqc5y19HsXBlk1pQDFsrX2tsRCbisacWvVWHxXW9yptxx+w0HnSn X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0Ir4e/AvuqHJ1QNYRv4TzOIPZFAATD9Y10SYjCMjeS2pGi3+fzcsJUkzAY4DXcP8AzmpdjkpzZR4vwyVfkUI2qQvvTxAdyzX5lGdoNnCL+k+45PPhj5+6zj8rpfM0ySz0UzZUmoxCy/LeX1PlmFEzg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3925c09f-a74c-4dd4-d86d-08d98418f033 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:48:09.5747 (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: PR2PR03MB5161 Subject: [FFmpeg-devel] [PATCH 076/218] avfilter/vf_chromakey: 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: nDol4+Px0PKQ In this case it also allows to avoid a runtime check to which filter an AVFilterContext belongs to. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_chromakey.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_chromakey.c b/libavfilter/vf_chromakey.c index 532d81ecf6..d08e127445 100644 --- a/libavfilter/vf_chromakey.c +++ b/libavfilter/vf_chromakey.c @@ -301,9 +301,7 @@ static av_cold int config_output(AVFilterLink *outlink) return 0; } -static av_cold int query_formats(AVFilterContext *avctx) -{ - static const enum AVPixelFormat pixel_fmts[] = { +static const enum AVPixelFormat chromakey_fmts[] = { AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P, @@ -332,12 +330,6 @@ static av_cold int query_formats(AVFilterContext *avctx) AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_NONE }; - const enum AVPixelFormat *pix_fmts; - - pix_fmts = !strcmp(avctx->filter->name, "chromahold") ? hold_pixel_fmts : pixel_fmts; - - return ff_set_common_formats_from_list(avctx, pix_fmts); -} static av_cold int config_input(AVFilterLink *inlink) { @@ -401,7 +393,7 @@ const AVFilter ff_vf_chromakey = { .priv_class = &chromakey_class, FILTER_INPUTS(chromakey_inputs), FILTER_OUTPUTS(chromakey_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(chromakey_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; @@ -441,7 +433,7 @@ const AVFilter ff_vf_chromahold = { .priv_class = &chromahold_class, FILTER_INPUTS(chromahold_inputs), FILTER_OUTPUTS(chromahold_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(hold_pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; From patchwork Thu Sep 30 13:40:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30763 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp697274iob; Thu, 30 Sep 2021 06:58:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIjPm3c8nNPafuixLPaFhDfwe4SshUh9JDDKOt2sDJIpETtojlAOOo8fubTnyT4AE34Io0 X-Received: by 2002:aa7:c78f:: with SMTP id n15mr7515751eds.338.1633010326334; Thu, 30 Sep 2021 06:58:46 -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 nc14si5985076ejc.445.2021.09.30.06.58.45; Thu, 30 Sep 2021 06:58:46 -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=OVAzqndP; 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 1C10C68AA3C; Thu, 30 Sep 2021 16:48:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2055.outbound.protection.outlook.com [40.92.90.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A54E268AEDA for ; Thu, 30 Sep 2021 16:48:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lfphvUi/xrASecpowoPsA0DFwgUk3LwXB3k2BDQdptWC0GeQYocbHJvKk9MJ3Ox+omMqI1AMpVzKCkBkQplseXYdobSxY66oEYdMYqLtD4D+4w8w8oKzvHL27hhiFDxOYH/bu/OVA0gb7DcmM9Yov9HPJ3hgycFIFc174ouyFRXJV0nRBjOPLtoOq0pGjv1NJn4g77XzWeHGoQUQGmZaoNTkxurrMtDUBNy80l/Bh5zFp0mH7T2RrqbRW6sdVk9LPyOWnvPx8aN8ff44+/49jwvXJpT1BsVyusogCDjDicdpJDCc6S0RvVJzvuKVjZAXsYdJNoLPWbeC2/fBBhLwCQ== 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=0/iikmQYElCJfUzh8dlUXEhtBKPzRKTKwgwQ7MUoBv4=; b=HwF6CZFxPM55EJ9feh2Ziqc2hGDgrivI5RlpAgyMInqkI9wzIS0BtRuipZFrv7tCnJ6AX2maCnNwoXYtWo2BJXXt3oa33uPE2/Z2swwPNDgq8N6LeNE3TK7rAzqawTdw5ZYzP6WSejQ8jqjhcDHKYv4Hl+3RWL9VBh5dj9m7SWiDmGFz0/RFKWXVBnDLLfVhDkhfwx67RAILq5+8NZN95RXOe4hlyKvYPkvSSdW7fEui34n/Rjo5cfashhsu1W7d/NkmaMmL3JNZztvNJaVh1nFhyvmg6XM/MQbP7106cWZ5HvyvXReXRrSvPQ6oljL1wWwU/SohzWxutfTQaO955Q== 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=0/iikmQYElCJfUzh8dlUXEhtBKPzRKTKwgwQ7MUoBv4=; b=OVAzqndPBMk+dwIla8ZaMazXRa2hViklq6t4XGr1nbUa4OROvoQctcRARxmP3cApVN05ZfRScgMECNrKxi5yGgO5cAaZADAl1TL0IfKF7lfbVDXExAFMsm2uYFY3Z3p13pHFdv4INBWUWpoGcm4zo/DOHEistmSyQmZpDkqSK5+BflaSOyo3cbqDxYVe/vLQMS9GgPxDkSEaEZQtqW1yPsFb/QPQF+zQDuq8rC2SX959HkJmeA+O7UqPYrydnLVQ9iS7qBvqsLZUoOSWRj59gS7hPGphTyCRZIGQmbijs0Fl9HQciihZIENGoxJYIU1ywXR4RtqkbimKZGUkjK+IDw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5161.eurprd03.prod.outlook.com (2603:10a6:101:1b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:48:12 +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:48:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:18 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [KXGRywPs61Ijf8KXSFTGMREftT78NVdP] 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-76-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:48:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4037a436-0050-40ad-f09b-08d98418f229 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbN6ihUoa1XKEHKVtHuCgoRLc5LJj/CGFSQvmfCIhHHj3HyWwUteOQRr+ADG+WSaeNgvLIsNxlFcvLRnROv51evm+3QVdXOVAsWxXNZAgOzCOE2qv/ZzBRjliN9vIBkWmMaDcZ9t3AGcbCeBbASgyrStLre+7ISazShvANwSJM0gW/yNHxag+1ReywsEzTk1UXh+ZEZFXx2nW2b7+K48qN/valxGmF/Nd1WM3jbP8g0m7rgmxgAb+1MQ8QS/cWi7QIOgmlwStdQdrJDhHSDlYv+NVgkSncBkKIiPbMA1xEVcvavzjzWpswmDjbHR5YXZP8Ew2GaDp9Q2YWH5pFB8HRlcwWqdhCC16917hyDXG1smG4Ixk3SxDrpcQTMhlZFXsnT+RiDwgVac+m+4KwJnsNF7moHkTtDMnKJ5pycysY6d68x+tyG4rqjVhQtrzHmk7EMbIAbeTBB6gwjhO98WSnqd84LNjTpZ5XehF8Fz457zuafuVtUvHFC7Ft/PMDJBRoRcMWdEYE7qZTxaMumajfS+rOos4AHakfsmVjZ0G9WWWjlSQyhojHZbarjMKuPGfsxXysZnGuE5r01WUpxUZPUIC6kAqmb7Nei770mUaOqZaKLL3aqJUUA+bB93egmFytoWxogbPV/QdXW6LRg1jmHZIzsK+GGCUns4vbS/gGDYGY021WlN7bDYrOV87MLlbuYOx0lU1dqYgCi73GKokKeqy+XTh2o2aT4= X-MS-TrafficTypeDiagnostic: PR2PR03MB5161: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N0SLJShqghnDFDRsFJtcaogMT3oUEjoL9/rsOrMFgmxr1mn18Uj7RK6hpAKyTNa0V4O1iZ3rrDQfCg/IEPpTOVIDmHxxnB2nWznD3Fb2vv93TU23AHPQ2vcCodX/a+sSZlivnbiKAZpCDMJYi1zLm53mQnCVspCr6fs2IjiCF2taXeSTDvLYOz78nz5zH//qOQCXvB0V27vbG4UvmgI57DanHQr67v5PcyZ59ncwItd6KXVNlMzUqpnNXTjgn8JH0UAScFnUogaP1NmOL5/9N/cVWhbzj9wEJAdBD2GSvpWWJHIvsZWXu0ef074t7sFkobShsLOp7r37A5BYT5W+JYPx2BZ5f+nonzJk4p7z3m4HyvCMAqUeTW1C/3oEFLhFQd987ZCP2kyoWpBvEMY1zXcZVIW0hu7penFvoX8nSBLIBbkbFUlXpn3Sq0DCCwJa X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VSxybAUxCokKASuLt/enQeiVmCeygh/vpHNheyzH6y/W9hnJf7PBDFDd3Q8FByXpOYEsZXHFfNNyKyZlUHjmKZV/B6l5hhHFLitHt9JDz2AWcnaF68Wr5Pt4F9us7p7n0fB6pj8BKk0rYoHB10PV7g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4037a436-0050-40ad-f09b-08d98418f229 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:48:12.8523 (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: PR2PR03MB5161 Subject: [FFmpeg-devel] [PATCH 077/218] avfilter/vf_chromashift: 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: 1lG0ktm+JQz2 In this case it also allows to avoid a runtime check to which filter an AVFilterContext belongs to. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_chromashift.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_chromashift.c b/libavfilter/vf_chromashift.c index 18e362adb8..1e85530485 100644 --- a/libavfilter/vf_chromashift.c +++ b/libavfilter/vf_chromashift.c @@ -52,8 +52,6 @@ typedef struct ChromaShiftContext { int (*filter_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); } ChromaShiftContext; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat yuv_pix_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ422P,AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ411P, @@ -75,15 +73,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_NONE }; - const enum AVPixelFormat *pix_fmts; - - if (!strcmp(ctx->filter->name, "rgbashift")) - pix_fmts = rgb_pix_fmts; - else - pix_fmts = yuv_pix_fmts; - - return ff_set_common_formats_from_list(ctx, pix_fmts); -} #define DEFINE_SMEAR(depth, type, div) \ static int smear_slice ## depth(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) \ @@ -447,7 +436,7 @@ const AVFilter ff_vf_chromashift = { .priv_class = &chromashift_class, FILTER_OUTPUTS(outputs), FILTER_INPUTS(inputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(yuv_pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; @@ -476,7 +465,7 @@ const AVFilter ff_vf_rgbashift = { .priv_class = &rgbashift_class, FILTER_OUTPUTS(outputs), FILTER_INPUTS(inputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(rgb_pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; From patchwork Thu Sep 30 13:40:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30851 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp418953yba; Thu, 30 Sep 2021 06:59:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyhYQ3UxcIA2bsOYHu3lLfnQ1bsf0af/GiV6smduQhDbqm+ZL+sTSO8iqr6Dk0Fyd3Ik1J X-Received: by 2002:a17:906:3796:: with SMTP id n22mr7258129ejc.552.1633010350840; Thu, 30 Sep 2021 06:59:10 -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 fj2si4050745ejc.474.2021.09.30.06.59.10; Thu, 30 Sep 2021 06:59:10 -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=Ydv2sqCB; 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 E996468AF0A; Thu, 30 Sep 2021 16:48:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065019.outbound.protection.outlook.com [40.92.65.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C7D968A9D3 for ; Thu, 30 Sep 2021 16:48:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mdAeC9LKJUBdYYn0e3JbSXQqV3F6+xksCHtKHRg9PU9kp3ZajaE6AgV/17eiMaXq6HvO+jqhcrA/sRokN1o5OXqHVmi7sqY/u15Bj96Pxi6krsWCi4YgnqU9psuQcB8m1p8paewVCe0yH2eHrBirj22SqDOzzELKwgVnlOfci0YhujDvyFBMCpHKP+iI6kFLzYQfWXZm5w1f2pcC1j5LfSVzYnnBzb2lFHIGGAypE8oPN44aFq7b9Vks+zDMuhC3IJ2S2daMhdLe9FXnvqD+EZSXgcNH8or6XIgg75+xnmuhguVDlbMQkjrdfoEhNE6VZz0xXV8cxyNTcmHkaB92Rg== 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=u0fZ1QFWyqRQFu0xRNuadb2fbgkNsdFL8mQDBWPZuZg=; b=LArYpxocrXtbOfwg4pT3956hbbEos4iccZbv1DPCvJ8EjTipGBhqxnFiuWdtxW6Lmh9kNS3ySsfqQRBHhyCDJvVUXtfIiJJOBLaylOMVSVidItJko8Mca2zEohhiUIW5LLCxlndA2H5mOSwqf3EJZLeaayfTgcGBvLnjx2Fjssu4STkeC/GEFRQmuMb/JZH9/NcgCA0QPm0jX263Z0yMXA98/H4Fjk3u8PGC+q+ZXcY4S6FVzkE4hDdNwOLkK7fqIsw2AvuRqLf1ToMhNr0CTA5mR7hgCjQotmkrYi/DmmmJYKGii4CjOFTFua5IGObiFfz6y3MA4MAmTLNU/RXOTw== 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=u0fZ1QFWyqRQFu0xRNuadb2fbgkNsdFL8mQDBWPZuZg=; b=Ydv2sqCBKm/lWQwDaiWReUvNyiY15F7oJAyURyLez3bm2x2wbrokYC5QC3JEyBN6G1Jnfg5/+8WZnPaJg2PtLOkjpNTDZlad+F5C6in4rLqFusCMQWh7AfDbq7iZ7a607UPs9j0RpGF++lPB/IDVpBC5bI6m9gQHj1WpCH/XziHaGjEzD90VOR3tIRjJzlhX31O9xuLTcDQxNl1fAWUZux6aEc9ZowcnglaTT2OeRpf8NZaw3lcUCBxgQaPSMzxcV9JJXZ1IAjqjfWj/REJksvh+iuGS92k2hDPQhoUgnAEbda2w3o7OBfL9cNvlKclwXkq7DT2v6Bfet9mFpFENpg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6379.eurprd03.prod.outlook.com (2603:10a6:102:71::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:48:22 +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:48:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:19 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Scgk5DJfsuKLTY9ggGIdGT10wruFIrI2] 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-77-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:48:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f24205f6-4480-46b0-b0d1-08d98418f805 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbN6ihUoa1XKENyZzoOq1vXa7lF22yaYkdZMW+noRz/7wrZNpstG8WnTGIBo4t9vLE1I1AoMUcqex5Ug/wVfmMcq/Yy9rUDggmx2TUBITzGXMnLcixaf59ZMrt2dzaMgDt3efDBlGCmGY8y/q6CZoew3mkuJsr3ul5eZqnD9GFCxChXVqdO+s1KWoJv51Y+5LaX9PBYlB3Mg8JL7ahD3jTeS+z3jG7yBzOc8fs70/e0GXls20oMengC6ZW5kPLSBzgT09at8QsRrl0oBCMU7O0sRh/AM9vvAKsLbD8o9NF7Rn2BO6QNWO8XcEpm+fPVH+erLEY9sQvZ+NXj8Rw92yFhBTdM+ULLvvAX06eNp2uMWVpkHVUX4u7mqkAkcV821hVSJEN7iw2CLMXAwgRN9uG0jbzhyZPaEfsgQlTYKXN7n2GyzeynG8nB+qQ5IL3RsjBGFNIIVarhGPkYmVXfVXfXvEzqUMj5HhU7R03xGjzBHjxfm875MLSs7310IIGT4NE3hWyBrvOzz3xoN654WSnKe0Y7ZHCGjHtpmDZNPvRiu56WzWvERTuedPQS3+BAq2cNIUF7hJh2NZMien/Fp16aN8NRc0IK9shCNVcfoiavBlafSn5RV3qD+UDSGpQ4rNd98Vs3ABunxZmUlrSNaEyi5AYFnAn5VqayOolvP4QimlRF1HYqinp0OZocJUesqUXGaAKrgrOyTv57kx7afg2zCqjvHxV7VvHo= X-MS-TrafficTypeDiagnostic: PR3PR03MB6379: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pcpjCfP9zKQ+AE/iBC9orj5Ch0XKTx4zOGcrg0v1aX3vsukFX6W4mpgPWWf89AyZMVxrneIDV5r7gMUVl5iDgFZzmUGc1ye4F8JqpyRBFkv6xnuVpsSbjeDmCn3F3Seei77D7XSU3D1kRfxPGsbXRT56PhP1B8MBYvkDdOYbzznEefeT33SXWQemJvPQLJiR+kgGrtb5oejAQC4bwtSqTiswDbdqnl0YmV12QApwAiLQyb8NHc46Q4fbcNwtwAW1USMZNIMfVoxPq7akwXBE6XCxiJdFgQ6ryAnSjGgiGqZvSxdPAj65XnTzLoZs5XF2tFuunGP38lS1rBZvfcQflFi7YHWFmpDlJr8IrkUjmqVvHYR3cXYSb06X5lDuTHk4FscS8uileiyfllmPmkEG7cMHcNsdeJjlV0TseiRHXFD1cevya2zqmNielC4nie1Z X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0B6pLVOdKlZWMtNmWA6g+0I3W6h8oAViyvIFMRNNK1sLwPWWWF0mPItbsuU0lwirZfLa1p/K1xWVjJ9txKuhUiJowgkojrxoR7/20/Z1Md+SLCQRsVsdQJrAanODu4ZcKWY1jhBrRNK95tA5r4XqrQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f24205f6-4480-46b0-b0d1-08d98418f805 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:48:22.7040 (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: PR3PR03MB6379 Subject: [FFmpeg-devel] [PATCH 078/218] avfilter/vf_hsvkey: 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: Ov+4hhhHlaX9 Content-Length: 2277 In this case it also allows to avoid a runtime check to which filter an AVFilterContext belongs to. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_hsvkey.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_hsvkey.c b/libavfilter/vf_hsvkey.c index 30dcbfc029..7f2f191baf 100644 --- a/libavfilter/vf_hsvkey.c +++ b/libavfilter/vf_hsvkey.c @@ -244,9 +244,7 @@ static av_cold int config_output(AVFilterLink *outlink) return 0; } -static av_cold int query_formats(AVFilterContext *avctx) -{ - static const enum AVPixelFormat pixel_fmts[] = { +static const enum AVPixelFormat key_pixel_fmts[] = { AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P, @@ -275,12 +273,6 @@ static av_cold int query_formats(AVFilterContext *avctx) AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_NONE }; - const enum AVPixelFormat *pix_fmts; - - pix_fmts = !strcmp(avctx->filter->name, "hsvhold") ? hold_pixel_fmts : pixel_fmts; - - return ff_set_common_formats_from_list(avctx, pix_fmts); -} static av_cold int config_input(AVFilterLink *inlink) { @@ -333,7 +325,7 @@ const AVFilter ff_vf_hsvkey = { .priv_class = &hsvkey_class, FILTER_INPUTS(hsvkey_inputs), FILTER_OUTPUTS(hsvkey_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(key_pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; @@ -374,7 +366,7 @@ const AVFilter ff_vf_hsvhold = { .priv_class = &hsvhold_class, FILTER_INPUTS(hsvhold_inputs), FILTER_OUTPUTS(hsvhold_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(hold_pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; From patchwork Thu Sep 30 13:40:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30738 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp697426iob; Thu, 30 Sep 2021 06:58:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzU0RP62UKCfwbQgLvaPkr/yyvcUYbGlJwz3FyojBxBR4WrEGKYEaZJw3diOBH7pn0SPnNk X-Received: by 2002:a50:e106:: with SMTP id h6mr7353685edl.295.1633010337365; Thu, 30 Sep 2021 06:58:57 -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 nd8si4269732ejc.657.2021.09.30.06.58.56; Thu, 30 Sep 2021 06:58:57 -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=jrov4oY7; 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 757BF68AF05; Thu, 30 Sep 2021 16:48:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075085.outbound.protection.outlook.com [40.92.75.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A368268A0EA for ; Thu, 30 Sep 2021 16:48:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dtqTaU5pzJRYC5mm/hLFVLdQ5OgiS2kByB7qtzpr3/jqHW9CF8IydhbODRHcKNlF3LQV6zNp+eG3mnMpGCdapCse4dunFfMNHj7TWuNo2vdrniShbQnUrfnom9dC7ZEsIJdFXIgsJzRaOyRWYUqsz6CAvFuKLp3Ar7qGRti04mYS6oy+WXA4y8JyfnkHFe9VtFU/R52mYaj1033RS885xSs2x8dclHuRYAejJD0oe4YyIFRMX6Z4eSN8VXGCZjqT6ao6Ty0/e4L0HxMZs6xOuvA2FfgxDrPBsFlnCIazKneAOI03gvUUsKSixOB8awHN/kC/6tzv5dtc1ISTJbPIEg== 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=SWwtIZ9efoDSPDbX2N/95RFQBYwkVus6GLtQnnSBIiw=; b=Ed44ZVj2Q06t3lTIs+ePHmf/OHqCnwyziFVuV2cQ1qynBY3KUKMPQdyp08SboW5OWO/1aQ1fnHdkB0PXm/12/PykdXfgnuO3LPIFl5K1Rs8p7doRzU45AnKUg/+dMUoFeXvaz3oayDjYzsxGbFO4QcJ8G98VCNys3lKrNUWkuYyMmecX3wZVufN8MdZrasYwxrh4Db3T5Ha5KecalHyK//w0m+pRr1VYayIRCSmiKApqSIU/urDSDiuZwdN4zOd8q2GLGHZyhNWuGKa86qDljAdhigfE6XwvmY6VxT7v6TlKktMVv24P7tn7ZI+6iVCjipNE6xRrcABlbzFp8xlMaA== 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=SWwtIZ9efoDSPDbX2N/95RFQBYwkVus6GLtQnnSBIiw=; b=jrov4oY74iHl7XhgqFOfWf878HIRoqD3Lq7obM0grxh84uTMQ/juRWfhYtvbq/vUZA6FKq0bxGcHNDGW/5+3lfea4r/M0yj0rpK0kuy/JiDD5quoZweJ2TTETk6jPu4sHMsucFD27pVwv0AHCjSd17sq6xcfSriP4tonVbExxK9gS4w3WOZ653jZS1JgKwUsNfscc33B0gHZrWPYPbgF7AjY+/aUahMnslrAU4WGbDQNbWJCOURY1TFZGgBr9vKG7KpA8G52ZhPTlnXozr3WwDwJ4wxpBivcvQj/ehGJZRp39SB/v17JuusaLYkTkRzowdk3xaC4qdIo17ttJy+yFg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7071.eurprd03.prod.outlook.com (2603:10a6:102:ed::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:48:26 +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:48:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:20 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [AV5u1d5IhYwDcNZjqBOTAsrLU3H5+bF2] 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-78-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:48:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ead94c19-0aa9-49cb-7dbd-08d98418fa43 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymIOARQAbZ9l0hQjGYPVwnpQmpplnOIF6bKa6fFDhPF+sfHb8LSlw2U2oxYVMUaqVewZD0NAMxEFah5vMbpKa/5VFkgTqPTnEOMT84G/aY7iszUIuNcqW2rizhgmyWDrv+IfHBoWJriT6HEfpkX1TtpDf/Ah0tU1/R0X3L0phevhfcza+61o/632ChyqbZOcSUJE/8Y6fUfMAPgKlcKnBlhEIBxYKIkKVCgoV7I+RKynZrNNS0lG7sCX7BytMER8CzQ6t0d7bl4fsnNor46e7qBa7CZfAVXW80b2RTSjas5UdD4N4LM5Mt7CbWP1XDNhW/WdrRI1lIhdpTenXMjfTF2XAkqWRXNVeJ8wuhEgSGF0OyZ8//lOgvZvkGJJsx39lo0rZcY0MvscOJB7TbdjwXtl/iBRoaWJxC9kNOtjHauvlp0lnF0xvTWafPfXvq4zYXgsBroy2Nd3lSiEm4UlTGK1UuqIWHDlfqO9xpIPg74zwrZp7TcbXXLNe1+4ktP53SSbxj0k8k67St7d8rVAuNGDS0dcPtMe3tNYPRO6iyFArISEgL5/UT1OpL4P08xbOjOXcw8yruYvSorlViT0Mrj+qqGRUfUEaWWBAWf7F9eIOO6rAT7aS540lU5Ut+/T+CIAWej/GnRHKkAUHioz8Kk6a5IDNKpa/mv9JuxFJw6tpu3L8QTaLZh1QOgySXHDksySmyZiIQ++nL5Tp5TVALfjRN9+KRAb0RM= X-MS-TrafficTypeDiagnostic: PA4PR03MB7071: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nKbuqsD/EfnO5apAFRjbYoOTAHzMHSb/Y6YeDh7naXFY5W3VU3v3nLITYE8BLyqSWHDdi4zNh/I9+3nLz25LhSjSgYWgWHWi08IHMl472T0VWzFw+sjt05eEL8zhaQyKq+lXyNSYEvcqt1zl1zI6wOwTQvoCyDpp7MoqVlX72GrgwYBy1BEfHq1xr6wYfpB1q7N6421UzAjrVlj2pfMAEl/3OEtPV4Xv0fJzYYZGsgz/5tYztRWpTnJXpJbxzxZz8iSQ/DFQQ9fhXCxNJJCEFxtbhAnJQ4as8ZxdCoL2i+gKwFVtcf9VZtyhp+ALcYnnnAw0GGzy7Z3QWJC6nROE0Po6dJhmOf4oB+bwUPCwvO8ekhabscHhvsd13I+XdmEcVjJXHrGgYQRlJVhZAlzNdXhYpED+6HPj95tPWGJBoM/us7G4htWIa98qIjmRKJX+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZJ/Sbn57NuBku4kkJkBGZ1G2vqixPyC7tjLO2Nj8gEKlPFupTbxkXgkPBZSAqZkM2fGoyPhHDpcFB6DYdkPepq1dNvwf0V0Q5jVmy4Ldo6FNKz9DJ4Z3QuZP+ToEQiGbY7MGJbWp4ies4sAlCCPNdw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ead94c19-0aa9-49cb-7dbd-08d98418fa43 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:48:26.4505 (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: PA4PR03MB7071 Subject: [FFmpeg-devel] [PATCH 079/218] avfilter/vsrc_sierpinski: Store format in filter, remove query func 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: oy+fK6nSVU8m Signed-off-by: Andreas Rheinhardt --- libavfilter/vsrc_sierpinski.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libavfilter/vsrc_sierpinski.c b/libavfilter/vsrc_sierpinski.c index a26542be42..047811c11f 100644 --- a/libavfilter/vsrc_sierpinski.c +++ b/libavfilter/vsrc_sierpinski.c @@ -71,16 +71,6 @@ static const AVOption sierpinski_options[] = { AVFILTER_DEFINE_CLASS(sierpinski); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_0BGR32, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int fill_sierpinski(SierpinskiContext *s, int x, int y) { int pos_x = x + s->pos_x; @@ -227,6 +217,6 @@ const AVFilter ff_vsrc_sierpinski = { .priv_class = &sierpinski_class, .inputs = NULL, FILTER_OUTPUTS(sierpinski_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_0BGR32), .flags = AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:40:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30841 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp419066yba; Thu, 30 Sep 2021 06:59:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyT7CfD8FdVBDJazDswdhxu+uJtIUULtyNcb8wyHs5bz4zIDVzQp4muq4aknYTi3awLoKe+ X-Received: by 2002:a17:906:a843:: with SMTP id dx3mr7162616ejb.97.1633010360996; Thu, 30 Sep 2021 06:59:20 -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 h16si1192991ejb.34.2021.09.30.06.59.20; Thu, 30 Sep 2021 06:59:20 -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=ahrqirMT; 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 DD24968AF0E; Thu, 30 Sep 2021 16:48:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067096.outbound.protection.outlook.com [40.92.67.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3BCCB68A8F1 for ; Thu, 30 Sep 2021 16:48:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g6UMtMb2oNtEwcyv3nGBKFDifvkLLoCQEnR4dzK+ZWnC2jzaYRfpEX5Ek3YUAi/jEV5ghsQhRAke/Ls1iI4eduadu6+UGR0fAD2v+MaxN0W0xOXvF59xIapf8GxJ5ISn72HiveTcU7qdF40gPqbFriZhK0a+X6wV/7VJ0Hm8eYjgrMzt8eibwUcs7oTvMEhTsNs9O2szFTsbEvb5+3nu2o02DoxoFfTcVaNVwnvo575qbsJen5alrUqdDaNVLB0IF8KgKdjLzZ/Uf2wKcCso2abV9MLN2tUY5TNA1ltJgXx89SmXaWDwEaX0bggR+n+ch5+uCR+EE+3lFgbapqqqtg== 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=9dbZYf91+DvwONH8h1H7bfdHFeg1j8IzkILy4P/JFSw=; b=RfIe4KYmFk0mCc+EwmWXGtDvX1kUoP/ZEMfEZX7ZGIqY8xX6s5mUX9ZUSlxOMWU1+B6b6vBmnchCI3mGzEhb/ytlKcVE6iMWj/mDz1fj4/w6qYE1734HilbWN/12WL4mjjOGemXATkAXjVVj+bEjH4Aqv4EAR1KLl2VjPH9xZuRUbIwIRKDwGVn1fsqp4Fjt4g2e8alazH4kzp4oiK8bf7DV4m0UTWydTQHQ6w669SDPvYbEOAf3pKwFpLnoYtTSKhfIqJpqWCj7ybMlga1hYl99T3l7rEcOkb11XUqOgnO82XvsSE0XbOUcr5aLD8xphsCv8YeZP68Rw7O33w6qLg== 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=9dbZYf91+DvwONH8h1H7bfdHFeg1j8IzkILy4P/JFSw=; b=ahrqirMTdX1P8gxgkGbQnvrGZy2BitpIQY1vtnIA3TRZ9mUkg9D57DP20Rz28RAYUiaIBvtD5XSr5pg1EYehrJ5puJfJw3wAWWjPjwOBQqiWI5Br16/LH+7IoYNDZXFdvpvK48/ceo2ZVrCEy3K4zsPL6gXyRxLw1xIb1qzIcQo8Npf7+C6jSjJJBp4ouav5QgObPRUS+7QPJzqZ2+ZTKC2QDcTa4ibm83SM2iqavpz2xXCQ7DrUAbtW953IEoYBaGydluDTcaIMfme2OlNnwdlRK0DTW11wCNPmYEyeMWF71lFQq1ibILtiUWupzycR8nnQXsCNUET2WcWmKdVFgQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6379.eurprd03.prod.outlook.com (2603:10a6:102:71::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:48:35 +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:48:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:21 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ZuButUktiFVc3O3cX99ay93qYPlDurYX] 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-79-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:48:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0d10e908-c8a3-4aa1-7fc2-08d98418ff85 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymIOARQAbZ9l0jY3yEqhjUatWDwSoXB6kowmpTRo7lPscq/A41mPd8IY5oZcB8j0nNtQEolyt0y61xqqL2glQNWh2VohRanIMzwCjjj3ISWALkoNyB/4MSka3d321QClqLHyFNHbYc9FG3wXyPq1Et6saA3wIuCUno2mdNrFFR1qDnDp4Xbhw3umEIx0h1vWzw8EDgW1y4kSe2lSKH2L9YgWtyzOoZXDV+zw+P6XbkWZtWcIwDdkIKrtfNv8e+DlYMCFkpjY0+r16zBK+MeXy+YKBFXtVPnsIrUK9z3207hm9EnUV/ldzME6rsbNpSnT79+znIuKg4fwEqmiJutfQVCDLYfeelkb+LdmWGTky4OV+YGe9tj1IUXKzal5alNhNBoM7lObHjLg6oBGLfnwOKGaLPN97EfD6TmP8lGWMgSS/aQ/iJl9/iz+5do1RENhUYzLYNLKvHKs8rBlUuu242HlCR1gn3uYAdu79cEpg7hEtndjnBTH2k9lvY/JVTrgBA+5bRsNvpFC6UrYjsXI2P4V5HzSjYkOJFc0kpazUkwkPVH1sow4TkHidWv3HpC2GNPygZp2iwt60O2jqfVmn3vpVfST94sKOocqfA2+33LsBZ3v8JPtRNeaPXXPnye0vfAoD6vTCZgGIGlXMqDh3DWttuBI4cd80sMss2edcuCVSKdvwfPzl2q9juERnKdCxP61oBXb9ftDDer1iDNuMDXcvOJuv4vGyJ4= X-MS-TrafficTypeDiagnostic: PR3PR03MB6379: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B67zVXdKd9Eda5WeKv/vOUV8IPAzDF3MjCyaN53Bj2pdXLO3N4M7OwPCiwG3PsjwQfsc1tiAn8btfciRAyUseER3R0CLPeai3ssZBFXReKJIr1VYy8o3ZvcfyJsJPDAPqKLcjFKalRRE7Tvyp6OPDoX6CKqFrBTbRuOmnvAHn60sOtJl6gzmxnqXmRdzu+7SXfphy/lsybGma7x0Pc3hzKTKUjlgWiACFuymD8Qv0yuRW+mZ/jiu7bOGLqEZdy2arreAcFmidUA9xhAwxksE6Cyc4NdTbOqCsjegj5hU5ms8mmFA1EiS9MgcN/PSfjjWdA7ns8TFdEHe1hUhkCqf0vsS9q+vI0W0Pj7l2LnUk30JcTL40Uy0vbF6ka/egI7wlQL+GqjYj8GPAby0pW3PsCn237hMC0Paxh5lltF+m88n2SmY3iMWfQK4MZsLvCwD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7lr59Nmno8QRUZWR5cURPiNbXi6CzhwppXCqAaJNp9aB0EFLWFktU0k+jbgAlDHLnbv7uEWNfX8QAalveeILlYstA/9KHbDmjpfAmRgse3V7TK0Q+xj98yHJwi/uKemoIU64Rf7LUVvFTHXLkaZ3xw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d10e908-c8a3-4aa1-7fc2-08d98418ff85 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:48:35.2747 (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: PR3PR03MB6379 Subject: [FFmpeg-devel] [PATCH 080/218] avfilter/vsrc_mptestsrc: 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: /GlK11tSICIq Content-Length: 1263 Signed-off-by: Andreas Rheinhardt --- libavfilter/vsrc_mptestsrc.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libavfilter/vsrc_mptestsrc.c b/libavfilter/vsrc_mptestsrc.c index 329af1fe21..f1bb777efa 100644 --- a/libavfilter/vsrc_mptestsrc.c +++ b/libavfilter/vsrc_mptestsrc.c @@ -290,15 +290,6 @@ static int config_props(AVFilterLink *outlink) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int request_frame(AVFilterLink *outlink) { MPTestContext *test = outlink->src->priv; @@ -361,5 +352,5 @@ const AVFilter ff_vsrc_mptestsrc = { .init = init, .inputs = NULL, FILTER_OUTPUTS(mptestsrc_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_YUV420P), }; From patchwork Thu Sep 30 13:40: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: 30840 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp419253yba; Thu, 30 Sep 2021 06:59:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNyAJ08ULw+ZxglBOwLEj+qcgpMgI0L6ufi0F/yELXGJGuzpxliatgU/nabMx0vNWqeQ5h X-Received: by 2002:a05:6402:5193:: with SMTP id q19mr7623344edd.397.1633010373240; Thu, 30 Sep 2021 06:59:33 -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 k10si3580280ejk.439.2021.09.30.06.59.32; Thu, 30 Sep 2021 06:59:33 -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=uf11+0C8; 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 DB94F68A33F; Thu, 30 Sep 2021 16:48:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065086.outbound.protection.outlook.com [40.92.65.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4B3F68AF1A for ; Thu, 30 Sep 2021 16:48:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vzp+e/joKkZxx3cUMZL+12cK0px2uqQqb0GP68LAX1C8w5bpMrrlgOrg1sJ1Ke+w0cuo9bI6ZdmTS5pzZhgsMWrnrwVf5w4mv9Bjl+3pTVWBWSapWHdqQvZDDLNOSTVBRJoigAE2LiedzNOZWHIrvjYmASOb5KJCnZsOXrywdcmrHLMJRVVFGIOAp1My3byyNAB0MScyZ1xp0XojMf//dJ0A5uUZ4jacMspstkah4xG2DPlKpd6E7jnw1XpLigHtMvJnz1m+BDkytCS5N4WFBpP22TZN+zReKCwz04X+zPGu9wDqDRGuvQ+AouIRnbq2JRgwXyCTiMDkFlwwjD8XsQ== 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=MLpanSWA/YwnvbRVta9IOh2j4AaV/JtJmvE2xqFYqQQ=; b=BDN7TYPTPROwhf9Og+bqYMGHwngBsxahfW4Tlx/UbvWwVowdSZoOnBG7lgjf+K9mN/3mzQOBcawFbr0dlVTvQ9ScBerRcy+MN9jA7VWtD+aBoWoytXBsKwRMAIRsCX2vngzVw7FDm1DxXEQnIN3T1sCRpGDeGhoUE9Rmo3QcHh8lQcCGezJtjZ2G/8vIQJ5Eh3ixhyZtmOZWYKaaP/yolntBwWKRAPqj9OEi/yZLPP5gwhxWkmTp3pYUl5zrAMUDoneMHASDvr+LL6Avi8ldiLmT1RbULRNqmchJRpZI0TvAumtuCwkSlCDCNp520AwiJ1ioFGjXZXlkaYZuSGlLRw== 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=MLpanSWA/YwnvbRVta9IOh2j4AaV/JtJmvE2xqFYqQQ=; b=uf11+0C8N+SF9DaDjC6wcmEM71jfwGLVeTvZ/eANflg3Z7Q1tEmJB8EHHy6H5gm6grMWOE4UtnYdJa8eJcRFyFJDzY36IEDKuBQGv9fNABa/Cn3alJ/GCR0vXw/3T8iJExT8YPrKwCGBPppaiDTx8fdhLgPkoEZYp7x4Q9/C+0D8Y7tC3mGvAjHpH47BelE2Tls76wQmabXhetfcRKjw9TvVj3EBpujRFMCvbb0nUGF7YJyU8XB0Rp7a0ogGVqnGLr4TM+F78mh/KXPO1X+LoT+5dlnpTk5CssFkzrOGcyVGzj5I1gfmLiwzRro+S1tojXQvHOokL/KfURAM9CDwyQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6379.eurprd03.prod.outlook.com (2603:10a6:102:71::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:48:40 +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:48:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:22 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [KgACyZhoxZtoh/qs4usGlkQIadXw4eJB] 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-80-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:48:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 594ed100-dd5a-401d-c0d6-08d9841902c8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZvVltC3d/coZUM4yJKaBcNTP7U2VlmSCdE1RFBbIzRYR98aPzbwvCcMF033PrlKOoaBtPIashm0a7SbyXxBnaVcDK3m84CzbED3j1Qb+YATQkvMfWRhP/Ad51LCeWMD1a0t8xMXmU0hZwpimjs00TIDh805UkMTgWcg17X9HGV7M/x0JtLOg1PzmtnMxDkb2E0vcla9sLi5ZEpgXUNNk+Xezi9N1P5JSx+cOM3OsDI2TP4YVg3LWPjl9U4/ILqKAe78L/ZzDguEauFrOGSiHpPOpkrRmiF4gipwXYQ6FDctuDZ8Ia93yF4OpE3l8kChuCxbK/T64mRbHL1rSVgFULgMe0myGy1WUT5kg/bHZHLZi+swMUJFjcb5K5ZTTFJW5XB6HuvE5odDCOByImjPZrUf3AI2e2v+zeeRG06kgTC9QhEIXfjXRZKr66okC+RkCdu0uuJnk5qnYuLCrLypWcI9G/eh5lpMHAoJFg72btq7XBolnDFe09EiacUVLthOJBioDRRIzNkX6jOKa5qkuU2Pd5BA+YIES3iIt0IUo7NTb5kCgkOF52muhf+6VO539b5te7Wzf3aNddjQF7FAe8bvOBeNB4WHF51MAJdVZf72pGgFjwZCTJkfXUL5GUrT/GELoxDC9alN3jF8gHiL3NYRZVAGRj+34VIaRGPWo9xzrs8YfWvrBJCLo9FbYhE+sQ= X-MS-TrafficTypeDiagnostic: PR3PR03MB6379: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m5rHaaL3sQEQt/tZC+jlF2BpiOX7K1MKaoA/DIGxPcO+wylJoYjhzB4XtxSYO777u7MBoOhKb/f66qHMrE54sr0NxTA+tnSGDk/uHVs7Q2ycfy1dZ9CFO0ON+8PEnuOZFHcPxMfAQRz++9GwhmMomIBoL554ahBJHfpkx6tAuwGKcwD5xkDexvMpRL/6JxYhd58fu7hCIgUaR9p61O1WV/1g62CX5cwI9s42PC2DWgVqbxX9s/gXV9AiUf0txbNFzz+EuDNuWvH/c0rSktLYOzb3A9ydwoOf+l6a72uUUdO0ChHTO33Tr3RUG5psPO8b8k9gyWq6sNoHtPqEXGR4oyuu2jbhvxkxKGZHNeQ8f48wywbOKaxDA1OcePiSUjCdg653c4Xs8o0jFRNgRHwP0rL96VHmac5Kmyo8olaplMm8BSbNfi2bJi9ja+sBSq4r X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LMJuPAazwj7sYFls1c6LcbACTXlYT0lN16jFegXhLjeD0LyXolpEamnbr0iaK/5ZE+26Svj1t+uLyC8Rm1ceLczV208LjywIGesVYsDou6p2DQ5cmeK/766OlCrEllUH0CXY4ILXIoEH7sD8Z395aA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 594ed100-dd5a-401d-c0d6-08d9841902c8 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:48:40.8063 (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: PR3PR03MB6379 Subject: [FFmpeg-devel] [PATCH 081/218] avfilter/vsrc_mandelbrot: Store format in filter, remove query func 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: onDV4IEMPSv6 Content-Length: 1286 Signed-off-by: Andreas Rheinhardt --- libavfilter/vsrc_mandelbrot.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libavfilter/vsrc_mandelbrot.c b/libavfilter/vsrc_mandelbrot.c index cf7da01506..83e39f1d13 100644 --- a/libavfilter/vsrc_mandelbrot.c +++ b/libavfilter/vsrc_mandelbrot.c @@ -146,16 +146,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->zyklus); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_0BGR32, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_props(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->src; @@ -424,5 +414,5 @@ const AVFilter ff_vsrc_mandelbrot = { .uninit = uninit, .inputs = NULL, FILTER_OUTPUTS(mandelbrot_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_0BGR32), }; From patchwork Thu Sep 30 13:40:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30837 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp419426yba; Thu, 30 Sep 2021 06:59:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8lw3HwIOPKdpSArkCKBb8+7G2YRxtbfnnbfQ9dDlCjCVg3EKIMEJh+r8i8m0IeH+tKLBA X-Received: by 2002:aa7:c941:: with SMTP id h1mr7511282edt.128.1633010386319; Thu, 30 Sep 2021 06:59:46 -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 k13si3456832ejp.411.2021.09.30.06.59.45; Thu, 30 Sep 2021 06:59:46 -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=VyOOhMN5; 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 E595C68AF2B; Thu, 30 Sep 2021 16:48:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065095.outbound.protection.outlook.com [40.92.65.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B769268AF29 for ; Thu, 30 Sep 2021 16:48:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IpctizoNHQOw0MG6QEIODsCtQaBVcZtr4C1xWVQ0d4wWHrbxYA1TAfFQ3yHTTlWaiZvy7ZAoOkkFuzN94Or3PZt/hOfSLtsJeeQO6qdSbUMGBz4Hujq457eoGWpKvuvk+x8C/ALJrwnprz2mK4ksIlh5qHdXwXRwtLEoU9B2oUaT5L19f80QqK/mc+DTfRupk5whowuPIpnWe1/K5Q9rBm4LvZapqSWJX7xGYWzq1cOgaXVeQkrrDhWU8BCseIkzyUroaoXYPfUx4l2JxF6vX6nfFoNKDgEXnoZpkhf2wvoJpFbnb5/3w652eR96Z8X5klAIh2pBwDCcnww8GOYT8A== 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=6p3qmLihctFY52XcP+q5a9NQ/Rb4y3nXGgm3t41Rur4=; b=k+yyXuGr3wkblwqMyUVy1lq+XpVnTr+Xx7o/kzN0rSluDVW9/Qixhi2OGgl5tu3G/zvRlLGcb1AM92hwdsbDXg3xkpm8nZN4kcq7WYe/H7O3rx+5Z9HUdv69hmn9i6H4zsPN9vvm6AY4ry9K/JGCTAF7xh9WXupvlkPklNKeqmZGsOjeAOLTwyvEkjqOycC2rMuQXlSekJlNEX2z3s9bqVF2Z5+V4W1kiVI4O/oTM1Zh+VvVxwj4Db0YXhh0rj9F3ftQSLSsd7gTGih4yUAMfDrTorgXyRtAKbC9nvt9/GbhbSpE4jNEsZrpS0n+fMl2MVmg/z215xK1eokMDnCa/w== 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=6p3qmLihctFY52XcP+q5a9NQ/Rb4y3nXGgm3t41Rur4=; b=VyOOhMN5gJgt5IL5cpDYKvI/NxnXYoG9ePNMIodyx7XyVqLA5JgFKEtJIAX9m/OKB/Co3g+4K6uIiDFGOdscExxv1OYLYLXDU7TLX5TBWPr/we4d1QeGYWhpRWWhUL7VYop6PV2J4M+5zYjlV0prAGeXqlWBtHHuZAO8JEzpskXxMH8bNeA81jJlRNewRhAiVVNMJS0gc7sboGHwfS9CIJ5iaOgtNaJOBKru3E/0t+twLxXhTuwaoIjx+zQqn2Ul4hpldMjoPMjKv3Qy6r6fZaRALNCjkioVuhCRRreI9D82/wkKyH17KeH6Ev2xHGY4pjpA4+S0cqlZBv5/qVI07g== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6379.eurprd03.prod.outlook.com (2603:10a6:102:71::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:48:45 +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:48:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:23 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ju9DcVOdhzvVZrcvWMO2J0dpQYrdIYUP] 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-81-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:48:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 749c462a-dcbf-40ab-2fa4-08d984190560 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOzptFBBX5ROwDerkAFqkoaK7Dn0Xw1yTgl8QpeES2kg2uGZXYWVu69348LRKHd+gXMtWoRatM+3WaKTTeMnNTihSS4ZMVY1f9vgs1s9yWvfV1Jv/lfX4ZpnIz3oF3yciyTHj3Gj4mMDkx8QIoTYE8olk+M44foqXjNDFzjqsZWOeXaFnGi8lkbdDrSq4azC2UT2mQkNz6SGEJvoQQZxYVopuWShMqdLDTUywLmhJBqzfLtRGIDLFWJ1KabjKWlhwKW0sIOJ8JiLtsopZkEL3aWrOx0O6ljnPBi2AmPoXI28Ismj8VnmNEWBVk+K8i9HbnVDlmNP3jRKPkkwxApUi8mUCB0Q4yF8bhCTpVZcTwMuT0q0ChuGhPgMu8X5iMhHOvwT7GZBsW0lZ3aatFP7jVkTMnEDEwMy6Vo1y6RaoEPFTj3Vlc4GFWn1eT0BW5LXqLuFFOpVn0yPFnX+qFnUF9Wc8Ls8jzRB+C/DYafgmGcz6kXaGNQ9NK0jE6Jn6/AB5ztU+gpSgxODw2StLQ7YktAdcg8vTWkW02mdMHRFLn0c29+TUzB0HcIT2hNVIruZKrOkQTPFn4d700MdkYqrNzL+DSxvSlK4fCxwpCrirIk64/5NhrAYCb/H+l7cWS6no/TLNLTXLyuzmgIRlFaGxlx/eYQsofzdhTz0kfnGlbyHL8WTPYIN9ra1Rp/8Jv4yQ6uWvaZ2tmxAIM1HuK8W24qHQ56z+SwCcA= X-MS-TrafficTypeDiagnostic: PR3PR03MB6379: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KyzMg2Nt8MAU7ic7FXrzvJMNbvluCcKB09Yq8FLIy4kHl3Va67t8KyS4LhEBeQVjDDuV6w6cOOHkbMt1Z+nT0etWWZIkNbsN+svXfWJeGHVdELfVKchkUc4ZjrHBc6x9ujvE3mUPkfZT0FHLHGFrhJpwDPehuH2TStfIurIfuSsy1jusyyVC6BAWYLrWId0rFQLUkV1lUawfzzFGaiEjQzCZ5w69hRsG8d+0UF7dOymFsxogl/IxbgTAKAXC7TVOAbAopvofksnIaV+nISYyBw+HSA+VpjlAunV7qtDUDPFPJIo/KMDL24I9ZWQRNeXxTFIzUZZnqPxH3PihFJWkCXcX2hYLQNNUZggMJ0xkAxZ5iIfjNK0SH+N4a4uoobk6klz15hHZXqcNMCvARq0GloSywnkduEuqY7yTVwyfQC75tQ63+qbfwJ4EqUz2FjHt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: c94548Lx7Qd+CuGuNWWoNVn4l8tKkeavLkXYui3VE8xdoBGEsHAQuO38nr7ZjlBi9nG9bcCKegcVRiMUYrBbtQpAqLiUWyeB4eeEMKmSYSGj+MTopt8H+tqebxSF1VqsS9AvstHCcS5tGqd4xQq6MQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 749c462a-dcbf-40ab-2fa4-08d984190560 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:48:45.1373 (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: PR3PR03MB6379 Subject: [FFmpeg-devel] [PATCH 082/218] avfilter/vsrc_gradients: 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: 951nmxhKPvlC Content-Length: 1421 Signed-off-by: Andreas Rheinhardt --- libavfilter/vsrc_gradients.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/libavfilter/vsrc_gradients.c b/libavfilter/vsrc_gradients.c index 5563d832d9..b976f7f826 100644 --- a/libavfilter/vsrc_gradients.c +++ b/libavfilter/vsrc_gradients.c @@ -83,17 +83,6 @@ static const AVOption gradients_options[] = { AVFILTER_DEFINE_CLASS(gradients); -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_RGBA, - AV_PIX_FMT_RGBA64, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static uint32_t lerp_color(uint8_t c0[4], uint8_t c1[4], float x) { const float y = 1.f - x; @@ -301,7 +290,7 @@ const AVFilter ff_vsrc_gradients = { .priv_class = &gradients_class, .inputs = NULL, FILTER_OUTPUTS(gradients_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS(AV_PIX_FMT_RGBA, AV_PIX_FMT_RGBA64), .activate = activate, .flags = AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:40:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30836 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:1a45:0:0:0:0:0 with SMTP id a66csp419615yba; Thu, 30 Sep 2021 07:00:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTLULCrar+MsMeYBWls8/GL4GZbUYGWT9ZLsoieJICpNUM5Pdcjhe1D4COMkBNpDawzeYp X-Received: by 2002:a17:907:6291:: with SMTP id nd17mr6749884ejc.194.1633010400769; Thu, 30 Sep 2021 07:00:00 -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 gw11si3553504ejb.215.2021.09.30.06.59.59; Thu, 30 Sep 2021 07:00:00 -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=NaEIs0dc; 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 D972368AF34; Thu, 30 Sep 2021 16:48:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065050.outbound.protection.outlook.com [40.92.65.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 521E768AA78 for ; Thu, 30 Sep 2021 16:48:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a9m185PqrkRiaYe2oLPeh1O8I+Ue4tyxGXvccMJ51mksbirvC/qyCeX43Zy5HyBFRVyQqZRxKx3ni8KKuQL4z0xTgK1qsTgaQ3Wnt1zXPxucY3TFiNNivLNWt574KE+n/pv8rAiuTPLGM7AsCEcC7+b7C7Luly8QpreEVKTl2YhZa30klwXTalOMdnVy8xXlXCwQzXjNwtBwt4T+Mq8LgNaoScb0Y1V+AJ7kvC+e6Ypm7lafghRa4QzWnmdQwHZzi/E80o1SIUWGar+jNgAdLs2WsNCPCajnq7gdIh2fhGsjYOHXs1DtPUzjcN7nGH79hBnyOL8zN8dj2c9V/NKvjw== 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=es6hB1LsKbhfelEkfRJQf+Gvk1XdzJSalMjju1PzXwE=; b=EymESYSKF4BdiLAKJFtWm171Oz+bvBz53ElOiuuAEKaVu7L4UNLjwwPi4X2k/6LJypoAcs1A9ZbsN4UyWPaR1z+YvK427G1wTD0sL5kppN18cEEZ1DKdtc0CoXYSu1LzK3GHGD2CfPe7420oeSrGtGf8daTVigAujzq3O7mlq/q1/vPyXdIYAToLklsxCyPVl2qJJu5vH8CymYaB4gtQ+eliXiwDfEyRHUIpN2xNWpPwivzkBg4AsR5LCiQjnB9aTXRzt2g8/kOyiiqCOtKzvz7hVPBdaVKz/eXy4OTXq1oZ8k50QJ6Xhf4PtAuA03rY1nj8Bxt10am82bke+Y/54g== 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=es6hB1LsKbhfelEkfRJQf+Gvk1XdzJSalMjju1PzXwE=; b=NaEIs0dcfqC1uKz4PzRMTWvlkWv7yYujbeb1pLmf+S4JY0m36cU4UbPw0sNODK1WHRCps+0OPhn4gYnwAZzplNFbweDrGdMSwKB4+ktqZ9i72XLjOWaNZT4BDxOiUnJvI/uYXbOjhSWKaBJrl3N7mikq7ixmakaYvJAirS+ewvKnSPxzjefYYvXfAwQ+mx/7yA717rtjPOcipX/h0CWbKEHEpDpVerjBu9xMnVvwgrmYteJDxhMCZA7bE/3dOnBgfyyqWcuru0qTFKwUsuN2LtEARv1NZxomyPcvgf33kdIloQ/Uzf/govHcrFAtsWx7YtKB+d1xJzr8eyiuw9SlBw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6379.eurprd03.prod.outlook.com (2603:10a6:102:71::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:48:48 +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:48:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [NZD5m+57+5uy82fikRR1yP0p/LeuFJeD] 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-82-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:48:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8badf1f1-541a-4943-2372-08d98419079e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymIOARQAbZ9l0j7PulHwO0z85/QE14qSs7/MxhtmhrZwhlRVs/PAKvAb0lXSUCVtOSq+962bGD1Xf3wf9rKaUioCXfTrUNtBvCD+mR+OWzCBPdc3akWiF4Nzn5Uz8g+YGekRi1G8lnVmmQpRj1ZmNBx9sQHySxMU7/MpCzizR+Zyr6wL49JqkAuf4FSsvyGlk9+uHaRF24wpgOLnbbhiTGcbHfw6YkxFCymnvKJe71LiTXzXxUobKKQI7NgVE6QjPdnx65NG/YPGCCl8t9zok9W2ajhJ+qmSa7mhod5ESovFw1xhjxNvg8YeykrX25q2YUeMwZRleHnWQaWr2rgTTpCIQtP4cdEBttzVgpgRvXtGc4uOMBoNz7Wc8p4W841Jur6AIGso1lHOrPxOc14L3205s2K1rX//y+KVpsV1fN194epFXjvwOqjqUnWdpG5ydYcuVdihOB3LmkjXIgnSbsYMOg8Wrqn1/a3w6sUqAtKczz+4NI8WTbLZdKWVa6mGO0CMS/TAoRqBH0RTt42G/PwGdtY5vKyxmt0hvCjE9asbtU6rLVzM7ssPzpcN9hXdse0AuPSzDZMxuxG/MFvY/ExwOwu5ZIMRAZ/V5MWjx5CevSPxi2V9oAeozInp3Kr/XJvZQXt2tv1mABNYLA7zz1PZBf+Shk/g/VrPpvdSoSg/DGvgpeesH+iyISfb4ZMxA/jDzTeOz1eyub9oCbiCiKYoPfEt2Jdltto= X-MS-TrafficTypeDiagnostic: PR3PR03MB6379: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VoOisnuadAg1z1KcMTo8iHQoxwDObx1mnBL+ijbpTaQaH5biAsy2Q+TbOY8kCA5cvd15Dz3VhVGWeqQ+7oqNcNPxwpJxEvIh4dHr0rklLtEVAR6ZCXVj9B311CUiNbLUkzRRMzcDVF0Ou/bSU4Nz6YYWvCHEDbFQcQj+cd+TOf0YQpZQBBKqmTkJCtPYDsrKakJ4HGvVbfFAN3i61+VdfUGl5NoatqK7XRsgQlOBydIV6+lAfuZBzYEf6q0fDWed+nTFpYSdqEiElWL3+8JGjqX+6uG3H4DBciIwnBkukudGhP8g+NpaQoxGcElojWOjc7x+VxYZePHGpo2iec0yn6L3MrhO5MyecL9JV32GyFVIhkEkfLXhjR4pywaOkWlcgkC+cUemKGlF22gzb1C+rBUqvx3wGFLpvsKQvVQqKQRUYIMELyreKRu2ieGo+vhI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Q4kJiu31ZZRH3ewD+65fVNWzR2+OTXSfOpoHyUpT/yNiS24sf6+J/+0V5VtLOY2CkCRcJtcEW3McgamUyubPXQ9sE5foSIlocxciK/gPg7uGInjBSq1SsS0vlE17ckTnfR4lhEVJO2chD6C9Bll1hQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8badf1f1-541a-4943-2372-08d98419079e 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:48:48.8729 (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: PR3PR03MB6379 Subject: [FFmpeg-devel] [PATCH 083/218] avfilter/vsrc_cellauto: 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: hpLruUzGiyC3 Content-Length: 1267 Signed-off-by: Andreas Rheinhardt --- libavfilter/vsrc_cellauto.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/vsrc_cellauto.c b/libavfilter/vsrc_cellauto.c index 8f6e02c82d..ceac86a344 100644 --- a/libavfilter/vsrc_cellauto.c +++ b/libavfilter/vsrc_cellauto.c @@ -308,12 +308,6 @@ static int request_frame(AVFilterLink *outlink) return ff_filter_frame(outlink, picref); } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static const AVFilterPad cellauto_outputs[] = { { .name = "default", @@ -332,5 +326,5 @@ const AVFilter ff_vsrc_cellauto = { .uninit = uninit, .inputs = NULL, FILTER_OUTPUTS(cellauto_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_MONOBLACK), }; From patchwork Thu Sep 30 13:40:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30782 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp698483iob; Thu, 30 Sep 2021 07:00:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3CpEj71iYJFTxIZatkRu+08PgzC/530KYYHba4nDVRRKYfpF8dbPELix6H7J1vc4vfOAE X-Received: by 2002:a17:906:608e:: with SMTP id t14mr6835322ejj.441.1633010414880; Thu, 30 Sep 2021 07:00:14 -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 d26si3308057ejz.183.2021.09.30.07.00.14; Thu, 30 Sep 2021 07:00:14 -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=bJMEENkQ; 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 84A4668AF45; Thu, 30 Sep 2021 16:48:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2021.outbound.protection.outlook.com [40.92.90.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3AE2468AF36 for ; Thu, 30 Sep 2021 16:48:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ej6vPKJrcV/Dg4o+Vv+R5j6/cGncCsQ5VgMq+3KSjykMi/u0AMKIB79e1gNuXdkpN+5AwLr3d8Of8FZpksEQhuAg+N2H4EKW12FkjoX+1JuN86ma/MQ/TRwjgn4SDVUcXsb2Ydq70Z+vWUUudgmiiDJqqJ58ELFIDBlrR50uyqV0DhL+2ynmFZdnAp+a+s3vZJoqSJek+xOX4js9E7GiMpylc3ziTsvYNjy6T1wcvDuR1beUITwrX152OcxCo9Fyo1Fkz13aCAp1d4bmxIe0Q6BhRJxq/1yQekiFnME1Ke8qqDXd5r2jAim+PivwJnf3YmSHFa8w4zR9wh5xWWVT9w== 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=osPG+uLejQTFNRtj1yiBi3w2I37ut3/QGFyleKlDLvg=; b=YGE6J2D69PRaWdXA/rwYQn4Nh04heVipy8XVB2lVbs3wfwwx8AouSK/nC8H8UNf01XUWTMSVmpVIVDVR0rz0i48yfk+XntyIqHKVqmUpMl2vnbfu0lvykFGRR/ZvNTBIurQ+QYsOlDbHaMwSFlpfx3ytMzXU2+beAkQ2deo/kjatAHsKlUzEm1MzFClGRg6KnUTrepzbr6141h8pHcRBr0LHEJyAVrJ1kIYVI0ZqgkXovZ/IcUefUYVvOxZzuxKJIRSk22Px+Z/EDmMpuexHNm6qo0KCfbfym6sXIIxjwm2U4Ig5R3MRrTm/2BWEhKXvNObYB791Clb+KATMbfmhVg== 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=osPG+uLejQTFNRtj1yiBi3w2I37ut3/QGFyleKlDLvg=; b=bJMEENkQb+lBJcfCFMPaxFohmj04esT+XEvPYRy4Fjznl7ass/ygTUZv/aBaZ11TnmJNJHLAoVubAQxraIXVELvPFVIuc65xHvfPIj53PDh56FbFSEbeuKVvtvd6S1SgIS+aWD/UqyhCWzMs+aozmXxPlE/LilV5zAs8BXsF0oD2oX4dPRHGb+1vOeiklqicmxovpXJ4LePGZjaZ0kn+AmmEiTHbjUm5A9IG+Et+5BwUEkp8gRUITqQgVarvauSXKWqZGo67npsQQR0Mqw3ICMn/uN48kJGBKCdn52Qzd0xAPWYi8MSrN3e6sU7GG6eq428nKRDMj5nNET/WBNpnqg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6490.eurprd03.prod.outlook.com (2603:10a6:102:7e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:48:51 +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:48:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:25 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [WZ4Dgp0QmNckkmy4XmoHiKmDqNFW5ko9] 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-83-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:48:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a6d6cf26-2420-4041-1f81-08d9841908f9 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbN6ihUoa1XKENwp6xTyaJPLWpADTJwfHoF/ReCcRVlQP/URZT8dMQnKDrzZIDMbAysajGoeGpb5GGLKJKSRcWopWDAbiBDjETb48EqT3ANTxXyyMuLzbEVjWrjzKKC60Nvix3ZFjBdyFgVoZT8C/cbNPWXGDPA3gdkL9FWh5BAS9ye6rkzk85zpz3hbAWMymJ72EVhhFw+98892WSS+GC/2JVi8Pkz63xmPU2UkVxRrKo0uAl8Kjw9jOlmTxPqA3vXigxhkXRbvfptPibY0BNx2UxiQXQiOs+zalEUgUco/R+QAM/WUV4lPcKzSn/cB/nfSke7eFwf2tdVgJooBhmCqPC6P7wzv7P6CWX54CAX7LOLwdGFi9+v0acAhXNcuEjS/wp8PrsueuFYIr4+C8pUBxPio4HwxZ9JoeN4o9uKlwi+ALmJWoLgw3Fue3DrSKAv2LNH/PAMwBmSHt/Y55a6NSPzMnx8lXfBi42G+EUOUJm8IBU+D1UefEa7B1UEdVWcxmZ5U9KWU1rwoEp5ZcHqJ+iOliE3EB1qgHKZE51M3YADdk9PvoDJfZc0iUiwEcAhSpstiGoAgxRBHOzBxUIsXtY40xbZ1f3ilhTXhAQX02pWOBYfqWlIyM2czax7t/i53XLVB7sZMqXNNK1bdIh7Q7dfUsGH1YGaQOkWvPIL7+i42RB8oN0riHfQ587XXXQSUZiVWTlQMqB6c4EBauGYRk9fo+6PDXQQ= X-MS-TrafficTypeDiagnostic: PR3PR03MB6490: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SuiAfx9W1sBjZzJSzvl0Y5QbGWvOMAlgJ0OrCWVAfdNWpKlWdr2ByNgEtYlm9lGrvzEMpt/q61FpcOXY30bppHnPOc2wISL1wJhBWX5JJI4ZontmkPy8puZ07bERx+/B3pmFICuhzQpn8h95UZ90FDa0+2p+Y5ht6oVPblMhA+tnycCownCAoRoyTuTWzHcei734P7RvFW/++PWyikYqLPGobvNou3hxLYanTBMzZr7wbd3qd8j02FzX0EtTnw2sgcLt7tltrDnBqnIRRB3zlsewg1Jyw4ppuUss6sr+UhUhgdULyX9Jv5zyUWY7obwAAVI1EUNEitpmtStTIwu36PL2nhBOBz8BlpWN54+USn2ffXvdpFJznpZBpHqsCyb0lyDR1SptC6e6D8JwF+L/57DMdkljjM0aizjur3MUW+5y3jeF8LHc++0MpGADeDn6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GGp54lsUxYmsrARitmGFytRrsDugGJJirGDmE0wNPhuGUYONQytGRLGMaMKSydR1n4f1+CR9owa7ELw0EWe6NNF8Mvh2TKQZk0p3S12pOGSNq4LLE4SOIzYN9KCI7Eq9VQFWqnjtBgvUdYx0K8crCg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6d6cf26-2420-4041-1f81-08d9841908f9 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:48:51.2106 (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: PR3PR03MB6490 Subject: [FFmpeg-devel] [PATCH 084/218] avfilter/vf_yaepblur: 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: 87LNj/yjEjae Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_yaepblur.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_yaepblur.c b/libavfilter/vf_yaepblur.c index ed48e20c2d..d691a4f89b 100644 --- a/libavfilter/vf_yaepblur.c +++ b/libavfilter/vf_yaepblur.c @@ -59,8 +59,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->square_sat); } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, @@ -83,9 +81,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - typedef struct ThreadData { int width; int height; @@ -344,7 +339,7 @@ const AVFilter ff_vf_yaepblur = { .uninit = uninit, FILTER_INPUTS(yaep_inputs), FILTER_OUTPUTS(yaep_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; From patchwork Thu Sep 30 13:40:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30783 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp699197iob; Thu, 30 Sep 2021 07:00:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJsofemVNx+m/nbkwo4c9KLpw7O1VppgZvZ5iB+aAsofvZQL3UPOnQpgRxDC38yThvBzrD X-Received: by 2002:a05:6402:1d04:: with SMTP id dg4mr7281051edb.183.1633010453742; Thu, 30 Sep 2021 07:00:53 -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 q6si2821921edd.367.2021.09.30.07.00.53; Thu, 30 Sep 2021 07:00:53 -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=RBLrlxn9; 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 BC6BC68AF52; Thu, 30 Sep 2021 16:49:02 +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-db8eur05olkn2109.outbound.protection.outlook.com [40.92.89.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4414568AF2E for ; Thu, 30 Sep 2021 16:48:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L9ywLdYcBCJ7op+z225Kc3CPtg63nggCJAu96agsr8nYLsi7WCrDnjnVZSUl6ppT88YKgKHOYHaaOUHgHDXgq25k5pA6eyROyHFnfPaW4pwhRD4IcOhHypd77A8EQOPwgDj+NLOK/adUzOwWk9pN9/gPjp40MXB+pl7jm8QbhsH6S1disG2InQYrP7Tx01oGeLTUmcwIzo7PluubfIQ+pNIN0khkiPFGrOJ9zjweqCJJvFBUOmEHdLbpBDi/7fC3baldA1RwrldlKLpFkkMY88j8SWxmtmTMXBzRwkHO2K2Bi8huVz/JMA19ILGw0rEJqcWByMpYy3BV9AjaHi9iwQ== 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=/qJwifZVpyUFg16HxsBWCAuZYJ8xYXTW2W3r0YGbzzg=; b=R4/QcMXu4Goerw/UKK4fjwuqEtMdW+hg/klG2Nkwn68gISoV9Uxhn67cO716cErFTW8QGtCctFtUQe+7ZI+oz9X014ZmsJJfFx4cuXB3YeXAWQvF1eDQqwijvxmim3dov5kc8HTyMsWl5CoS2HV0Hp/IghjvSEE3rnAMee84CnkGPWiCSg0QLpQkUAyqeGauvZQhrUJcUUXU2/V2iCtzEYoW0cWM3r/2gY+p8NQd6cc53C5KyaEpbKNlktQk3o61Xd9b9BZlcy7xhEpB5/Su5J3ug81X+jASaUzeQNpxLErq9nXEEl1L0U/YxF+ucBlTX5k3ZPd071UKZPups+HVUg== 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=/qJwifZVpyUFg16HxsBWCAuZYJ8xYXTW2W3r0YGbzzg=; b=RBLrlxn9T3sQvoJrprrPRrSXMHakUwNJmIro+3gsA9/KZ6QQ53sgcECdAef3AIdhOpvmpW86q0etk1K4e7xVu9FXNQXaFZRy/LvdbwNBDAwOcqdBEHzKw1MSnL3NgMCy7nhZY07H2RiTgFXJZ9ZjZKdfSl4qiirMACaM+cqq9bdxOiqWaODAta35T+y9HFK8ZFOnrOZXWU0IzPgQ4kqaW/Vn6WkIUKWP41k33y46Xx2vrFV42Epdi7wLelAsu+B/17WiTn3vnCXHAudGAnpUN6Y31VJ393rEC15X5i+rM61fJZLgKhfDahhvJI2i9lktw3Jd3VJMbEN5/WaJVVzCpQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5322.eurprd03.prod.outlook.com (2603:10a6:101:21::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:48:54 +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:48:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:26 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [qfn0dAL/yFv6jUzDjVHcKkjyxzAdZtfq] 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-84-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:48:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b8aebf25-b204-49b9-2ea7-08d984190aa9 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbN6ihUoa1XKENwp6xTyaJPLWpADTJwfHoF/ReCcRVlQP/URZT8dMQnKDrzZIDMbAyuKWNuIGGX0WvbAGeG8uvL8cdgF1fW2aqVhKeFQl6xZX6130S+LdfstRyZHU5VEUULMaQbMM/7gM8eF0LCgtIK4La2bjmuKphPhI7y7wqHUXgrLGR+LmQA+N/d+vJiLkHPQWo0vOeYWsmbTT09M2d3dnpMPF2Sd69kk/Ty1QTx+BpMUIZ2UoU+sgPzF1RPBcWZoYoknw2/Rok3aHXLWD4kqbNguVLDt7o2Xj4nErbjnNlB+Q/sAJIllIK3RBXb3Z9A44Ic8NFaJ270EHcSRL8dE0AGY6HvKF+3dUXX279v85Z2JjlFSIEX7c+pv4tca75PdXkmSbxZEYKpUj/Mkt+Kb4Pk+80m9B/laMnL6uWr9Of/Eb/YQnsv1A/CBqDyo3/FKfiTAEhscuZCyVW6W8gXMeePHwYSHn/sAHmIvelckfdMUlSMsXwRozU+hHGJndqHdv0x22CPlk+ue6DIl4wTx7/bUcpwnTAj76N3xUZV8DBn4SUYzV+5Z+op1oDkkAumYkI/n63R0JdzKfLhDyxlCHf16VPJNoqv8rHAjZgaXcunge8NpqDb6pTqkTSb9Wv+63Jxr947PBwy+tX2ppqXy+KNLd6gmhZinN+XdI2wg2oPgyikm2VeryPP36QOmWKSM3vKCYn4bvqqOqyoytMMCk8iZ/CaT1Zk= X-MS-TrafficTypeDiagnostic: PR2PR03MB5322: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ha0nW0Epx3+g1/rMnx2C71USvTA+Tx+/4F6/YlgUZ2fdMe8my20G3gkuWKXPbI6q+fxXBoFVA16Pkn4eZeIbDvSeL2GHyCSV6vAOoJF4brGvraPkHjyFvj6uqTte5+1WbiqoywzsCtuqBNXJJawzL+yboXAPEA182gLbQAXVFQb68DvgywFrVH/1JAL9TViQAKVuhwhA3ammaSv5a3+VUVyigddvZCbxIGtOy0zx5rEXwCXYgzagjckGos56VTdATuBHdzJ9a825fgHNcVvG+U/X5KYNhetfvUgOGXkgLzFynJaJcYj1xxq0sEBYsAKh+HT9lyC5e2cYm1dgSlOViHyUXbA1QrqrejPxl/e0Kea8xJumHXj4EVcEplWdx1+xoJqHQ0YzqUaBd6xA/RTWMbMUpYWWr0GmDBdlCtUeFGw+If2c5AThlaw5+5gAnitb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VkfXimEETndPLK+CWSPA3JsyzmP+VomadYG2Q+MaBkNeNkClqSvMiqbjKQUJLRfQ9Jx2IpRtKWRpKotlg8uXzuL31IILWsFO0SZbz0jdgi0MkEGuhv1AD2bCi3nX8JLxtm7t1AtSUm5g157RSkm8Lg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8aebf25-b204-49b9-2ea7-08d984190aa9 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:48:54.0013 (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: PR2PR03MB5322 Subject: [FFmpeg-devel] [PATCH 085/218] avfilter/vf_zoompan: 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: AAnunJL8SMnD Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_zoompan.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c index 58155bc162..25458b348b 100644 --- a/libavfilter/vf_zoompan.c +++ b/libavfilter/vf_zoompan.c @@ -325,8 +325,6 @@ static int activate(AVFilterContext *ctx) } } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, @@ -341,9 +339,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static av_cold void uninit(AVFilterContext *ctx) { ZPContext *s = ctx->priv; @@ -381,5 +376,5 @@ const AVFilter ff_vf_zoompan = { .activate = activate, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), }; From patchwork Thu Sep 30 13:40:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30787 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp698718iob; Thu, 30 Sep 2021 07:00:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIwl4sgRCzStu/yaMH2Ttv+4rZXVPg8RvWkeWTN/pNpAazUpsPepL2fE7Tgy7zj8sz89HE X-Received: by 2002:a17:906:a0c9:: with SMTP id bh9mr6958879ejb.51.1633010427673; Thu, 30 Sep 2021 07:00:27 -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 f2si3408719edj.494.2021.09.30.07.00.27; Thu, 30 Sep 2021 07:00:27 -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=NEsiFnhv; 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 5D8D068AF3B; Thu, 30 Sep 2021 16:48:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2021.outbound.protection.outlook.com [40.92.90.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BD0A68AF37 for ; Thu, 30 Sep 2021 16:48:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WqKLhXkLH4b33PfN2XeZUgdMvNijqAgH56oB6h2NdfLMFi6T1v9IKe0o/q55zzmWYJn7Eu90CYBFt5pcKDLz3e8eUFaHvH1knKxfovhazBAP/dtmijVbMU06LJJEFPkeWWhfu1fxUyYlQMYf3p4OKNjiXrchyBLGkZBNvcUbo+TZnGGB1KtLhOhgCLOqUIZ4qF3f7xSQoA6tTvyqL6/P0z4f2DzSeIGm4yQE2s8DGTwtEFkloto14aSLvViAtivhMdgrE+kcb/LY9hbg0iJ2vGO2L9PxIpbhRO2nnLPVp07AEj5+nWuBCmUVvr9fcLT6LGz/AuaF1vKLqCjtHEQu3g== 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=egT09wiyXow6YwMtTm0CVqk4dsef51ezSVD7LK3mU+k=; b=BjDCjktvwI0oyymkTKJ1VSiViEPTI3WfLMrJpT3Pij/qkr2lrcUeIRZScGJQB1+hcP2bE0EWadbZDy8g3e4kX5TTh5H372IGcRDFqS37Nk6XU9lQO58BEfg5xpE9j4H7LS6fXRk46V+X6HdY3Q1qnbHRkTNLJ0NFow2T95AM0a4tAAcVLuRh9MW2e5FwMmIQwQ5rOv/xEOQzUEzffb6qrT4DvWoGlf8E/81OXzVTsZlIgOTPh2W0hmQgJy6XDnCn2Bq2NZRqknnEcfftCW14M2HTRpvZ07RFxaXCAOY7NmRv+0k5YWEqql5X2Bvk9kUtKIUGlS9XuY4KFw5ee8U/sw== 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=egT09wiyXow6YwMtTm0CVqk4dsef51ezSVD7LK3mU+k=; b=NEsiFnhvriOyyjMNTLJGzL3J0Q10csZLKRoUTv1nFQpnp2i5jtL82xfbuLf362xvxkMbXavZJP5RTABvK+/va6cIvdckPptmu3iat5Yz6M8Tpv+MRUElU7RaWorqOHYw3JUPbO6WQfpRB3332tfm0fwdynAQuAfvmb+YU3aDqBkF2lMAYoC6q4x90Y4vujHV5T2Wel+tCJlvIk9NUaHDvfDCr/0cUF2oVUQxf3mudOVlGfNI78C+baBrS51tJ62crB7lzYBz18D2c7OPvTbe1/HqPiNplxv4tFylDyjsgJvd7Aee5Z44qhziznZxTGP5CEdZLm1OozAeEV7LMIc6dg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6490.eurprd03.prod.outlook.com (2603:10a6:102:7e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:48:56 +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:48:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [jxu2WcfFf6PtR3ug0IhSDJX7N4dkq+5B] 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-85-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:48:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 602adbb0-df55-4d89-5488-08d984190bfd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOzptFBBX5RO45dysEik60Y4cdtVu6yeuLpjdPjSb4s8/0EiZRY/da6aPYXFpL4EFNdeJFL5Xwlo7cnqzc0wPrHqf6/yGlUDqpcYocxfN8hEepnRfh83xWEOV2G3TEpFem3FG1Ev5kjPv2A70W8b/Ao41ug4YpdRBctny1pZJlauaSZQJNTk19J/NuD93CVefwvhOTrEYr0HMb8teXdb7kFliRC4AEkq88fV+Beq7ZSkjNJ+40KFNhigPIwEQM/vtc6kgESo5EhXbj25H7snui+97l/ypln+xySa5vEeRKcv1YbKJ2FI8+u4wZh1OwE6er8JAZhYTmnfkjSIVeqoLKBXkQftpDDtJOH07kztx+JApOrAgBGFn5CXnEP7y5zjlHQ4Z4BYaWyQEpF6lnkp0QDasc5nIjnYYlCzyjTxL98LhQEpyg4b35mk5r0q302L0LIN/Eisn0R0K39jkC+DidR/VTJXiJLyQpyITep7PjqBu0aDL56MWgOnwuMBmPtnvWtUGUfBR88RSXfNsrUoHiX71Sv0cYDXWb/o9Yu6Ok0wKoLlM2Pw1sgnx8Ai+l4kZ+NxOX4jng2G5bvcvZYLpSzLRbDFhGrFYxA6twvyAflE384mwgT5S95O6zUeXVwiKI327The/DYR1xN7Qg11KWo2OHTmETz8+4BPsllJ+85BxyUEOhMhaDRXu8M8HtO4ZrlqtplpGOE1ojcLj32GNUmp0MxGhjdBPQ= X-MS-TrafficTypeDiagnostic: PR3PR03MB6490: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rqHgEBmVVSZZ/FH5vRH4i79dggTYKaXifZUpi4uiloJoBFdI5/zh58JoH1TFSrFreNu6G3D8LoqX9k2TjoeCjX1wZgjfTVfRFC4a9P7T3hn/g4N9QnMaGEQp7mMUEHz6LJD1Zqow6frPsdkg1jJGb2KYQyHMCqL6SGQVbv+Z7xTmH1fIlAh8fxH93qVrMzh29vtEBFnq+F64AEgf2g7n+CXSXZReoaIDOWy5VkqavvCPznvhwOyMKOKq4A3wAN1FoTu2gIqHmF5PB4ALMmfaH1D7wI/siXlgYpPDrDavedY+31mZOJXJKowxjXzyHM1cIWu1Wbfv/MCwKdh4Ydiq3dJJVrr44gXiW38aYW/083WViEl5n9oCgVQR9qhTV6FgwtkKy4MrvqKPFLdCkC2sAKbniljUKGwUrMnU0cgqCDWa2O1frZmVny7Fwubcy/Gz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g9JLb5LkGcIY81yGBMXhDT4TNUlE+fuhH3GkaDbr6ghPWcOKjz+exUfUhgOejD9AmgSbbQEwYqeQZwtpi4rd7lJStXqCp0McgMq940iNB+1lKbuTFQPAjzMH/5FRiNdWhjurwKx/SXrwBiDxOt13tQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 602adbb0-df55-4d89-5488-08d984190bfd 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:48:56.2215 (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: PR3PR03MB6490 Subject: [FFmpeg-devel] [PATCH 086/218] avfilter/vf_yadif: 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: yfRt0hzuzJMZ Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_yadif.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 26d457360a..9c3706e5d6 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -265,8 +265,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_frame_free(&yadif->next); } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV440P, @@ -285,9 +283,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -356,6 +351,6 @@ const AVFilter ff_vf_yadif = { .uninit = uninit, FILTER_INPUTS(avfilter_vf_yadif_inputs), FILTER_OUTPUTS(avfilter_vf_yadif_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:40:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30772 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp698911iob; Thu, 30 Sep 2021 07:00:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyUVvYBytzxXzW9kfW4u6iTCo5I2X5mMGMr4F4QYvp8IMJweP6xmSfMytT2NVqOk1ejsgs X-Received: by 2002:aa7:c78f:: with SMTP id n15mr7526811eds.338.1633010440735; Thu, 30 Sep 2021 07:00:40 -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 8si4156341ejn.389.2021.09.30.07.00.40; Thu, 30 Sep 2021 07:00:40 -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=M4oDjBQ5; 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 5631E68AF49; Thu, 30 Sep 2021 16:49:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2094.outbound.protection.outlook.com [40.92.90.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7E3168AF4F for ; Thu, 30 Sep 2021 16:48:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T3BIOgrNFX1x16+ZaghKi+D7qILp0Vj8JnxcYQml3SOvV1uKqSJSk0kjh/NU/0mLX69Ee0pnEqfbz1qpAr8/6Y3KU9VWV3DejfP9pMj+kJ8uEUGgoYYfXFFd6+Wb3xsEas0+GwCZh1lFgFrLv0I3HZLi43ryjAesUipYYpQjDwokK8e6xr11mon7YFyrXPnAzsF1wV/7LeuyMUFM8w7J00D9nXPCW42+c13DJ/rCasv8MXGDWkfp6z08f0RHXKrJILbsxzovj7vp45X7WXNWKFNIMVuiKo0522a/gYCn2d1qG4CFMbGdfRbMXJ4vSBhSHlL/VnQUWB+UK81OsJu1IA== 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=9Etv+WRJwYfhpULTmn2qee1XX+f10WVWumW3QnLT7rY=; b=PicvE+JSpRV7bIj9wdhayy/XrStLJmR6bw/r54KiWSHJ1cMXx512K0y5fRIWHYGkSd+KBOKDQHdUTVhSQGJUxv1qufB2DItEIUeA0Dl/TuMJsMmmoxGYom6BOU+lXCHzjBXXu9WHHwqsvM0m6VpNauCN794aEwh4f1LmgR6zCPsfVICt5o9Y8o8HjkiZywyleojN4LqPgKO+JO+cGRmTrZG7/CTbZaBns0c7mMFP1eRGoPKO9X0CWR/oleC6x+ITcVZhos9eqkpQ9hcuGud2at+crYTUwJXwWgynxBp7MJlfkA1wMLYOq/l15ArCfmeSlZx3O4i5EuzPcCdjIeashw== 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=9Etv+WRJwYfhpULTmn2qee1XX+f10WVWumW3QnLT7rY=; b=M4oDjBQ5UIsEEARWebsA6QsDCOYEFZqiQ3Uup0GKr8bTk+b5CgfD/z04Oobc9UN+D+5CSmQhU/IEbD037aLY7k/28HBaDn+C8c8VxvMGib7pxCmPxTJbZBzF/SRiUVqJaqOLxjOcm7U8A9P4T20yRxSoD0f6b9PnRbV3TNnAeidvcNboB1XrSRjcDdDkH1Kr2CJHmyT4Ph8RNCgu+ZKXGVKg5/Lv7WrMqogarY/oqd3NHOrFO4BmBg0UdIQm6CElmRMlXBPElhELmqlIHBoJH0HaDsLjiNYwSQLFQn/eC9Ah/gmc3PZS/bmIx+WbMRuMLKuMaMt55LHGKjDYiWHjig== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6490.eurprd03.prod.outlook.com (2603:10a6:102:7e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:48:58 +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:48:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:28 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ZhathIaNouPVbH4Gk4d1LrJSPm+pCEqW] 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-86-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:48:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d63e585e-9e97-4642-6057-08d984190d4d X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9NZw4tXvfuyeM3+HaJfuV4WdGQIBbsp4OJPNWXBZCahZIU3URRDED38cIbLbK7oipVPRunRdkLaGXLZXfJ+QxOV6yXrOlIVv71PRsqetW6bIPBW5Iha1are2vo9BnQLyHnSAq8oFVCPvj2f3dUVyU9DUflohJosQ0BHf/bd/FPWVsSzQIyJWwpjV8KUf05f+wA9iVbMYoLWEg2VuSQPAQmWbLJmaKqTILA2pVaCP1IN4d4DnoxAx2SIr4DnaX8idhtPGMv6BuR6w/acteDGhL0loa1i10+7qj0j4kK70EF7vBcWdwm0YsTe41f+9xEvzFqUi9smRL6RkKO5NofOhrNKwEXyngc8aXIxQlGjEE4T/BStASn6WlAlD/GiIopvuCT/FOWGoxH1WFJCY6CSi0oNoO/0qSKel5NysPfnBz3IJz5+FSXANn/mJw6dbnDgd3FV7iK+kUwOOFRxyW2TC9Tale68jsU6OV7FKIDtxlIMoB1xfZTWzRzsPmvWcZjbqEVuXe0qK+wiXaA1eBgJFU4W1CHq4M6Azn++8Slz1WWC8IoWSjYIMV75meFWNwl26oJtmr707sOwTa89Au1SmQpRJcV5+JardENsHPvZh3leC+2GT8zoyjfp8qIla0Zo6cu1ZSsgKqoNr205rOULINuJkmkQ3mYg1DcUCcKEH48cgdB/UKA/x9RhrOpterYi85BY= X-MS-TrafficTypeDiagnostic: PR3PR03MB6490: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9tesevjz/mo8iQuyoScSMGz6nUpdj7RfYvS1Y3PImxT+LLoQwATgxU0VCvpdr6kyNT6iD4b9dReCsdCrIV+hC+SlXk/MiquzmZYDEMfEDU4tnjOZ4NS7MCDvEa9emwzznWqnNuZ3MCN+s3g/mmjBgKAGx0DF412V9pEmLSWcf6U6zjwATghTNuUr/S8N/EfOkfI92gFI9rEdc2mTqLb42kTBX8C9cdfiaa9PQewoQFWw+OE5e6unxbMQQ57oIAtzPZ8D0aL3v51uZYg9n7nTE/WOT9D8GwaofHEtkKFq4vcLN1tYIzmxACXniiyMLxXHG0fp8UuVe24SxmcyVmdatOF1dBCLAdlhOtxjEXanH3HJPrYngy1W/aawf1vmF8w8KRYen0gD1BuqDaSExZsR7Gc9fqwFwT1zp7txnxvoS3S27+YQ6PHIcAO4bdiJKGYG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DI6iJA093WttD1StMSvGe1V80iXVa43wm0MbR129aB7JzxA3HFedMJEANyGrzFPfFO5W2+81baqfI8SanbMc3SGODPnhMgAAHQV7V92M0CF+WruAvJ0Z6IAkzbQtMiP4JMwHvxqnON3iKrNkPxsT7g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d63e585e-9e97-4642-6057-08d984190d4d 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:48:58.7066 (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: PR3PR03MB6490 Subject: [FFmpeg-devel] [PATCH 087/218] avfilter/vf_xmedian: 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: w0bH7molflPn Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xmedian.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c index 2ae4132b44..04d807527e 100644 --- a/libavfilter/vf_xmedian.c +++ b/libavfilter/vf_xmedian.c @@ -55,8 +55,6 @@ typedef struct XMedianContext { int (*median_frames)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); } XMedianContext; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pixel_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, @@ -86,8 +84,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pixel_fmts); -} static av_cold int init(AVFilterContext *ctx) { @@ -396,7 +392,7 @@ const AVFilter ff_vf_xmedian = { .priv_size = sizeof(XMedianContext), .priv_class = &xmedian_class, FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts), .preinit = xmedian_framesync_preinit, .init = xmedian_init, .uninit = uninit, @@ -480,7 +476,7 @@ const AVFilter ff_vf_tmedian = { .priv_class = &tmedian_class, FILTER_INPUTS(tmedian_inputs), FILTER_OUTPUTS(tmedian_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts), .init = init, .uninit = uninit, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, From patchwork Thu Sep 30 13:40:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30789 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp699533iob; Thu, 30 Sep 2021 07:01:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrvqr4KWhsOZ0eZxRx9n61ptTc+UzcNv0xsr7O7rzTyBxbBZWxMQDjDhmK9QWWXcvixSmN X-Received: by 2002:a05:6402:19ba:: with SMTP id o26mr7415874edz.1.1633010469164; Thu, 30 Sep 2021 07:01:09 -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 e3si2687687edc.615.2021.09.30.07.01.07; Thu, 30 Sep 2021 07:01:09 -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="Aa51/8Pt"; 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 BD6E468AF5D; Thu, 30 Sep 2021 16:49:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2106.outbound.protection.outlook.com [40.92.90.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0888268AF4C for ; Thu, 30 Sep 2021 16:49:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LKZjtzCbKIg9SDikchuFfkyfQGDmpbXLmuUTm+KcQHhp0JXPYMNMX1/mmo1AdtXwU1/WrFj6xr4443EDfXYrgLWhI60RR9G6mVN5uCTrkTfISobMRd4sGfshW1ERMbK+7F9329CnXhhmbjgI23VaGUG8J4lJMfmv4B4C4s3So5t3ASslMYX1P8BM09BoSBy1f4MZgCyM9VwkR12qTT8lbQM4jXAX+A8G+FBBSMWOp/+dgqOFk4/NowGt8AxwNQ0BznIG1IKhMlu81jKcrJFbpIguzIfc+0k1ErP3MTGVt99N0haw0V8IE/TL2zrDNhGyaR7vzvdKbLowSu7+lSvaow== 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=OXHCqehfXkp1bz8G1n2uVA+cDGJqvU20ctdFi+kFn6U=; b=Jl+WeiThEHPIcIYPFwMSPwr6QSBAxhKV5dPjmK8cRWreCxWUqwDfgxak2pOWeNTkmPA1uiPrSmwWH/LQlpIbGQMvFN7nlkxi+I24FOvUqmt+iCQUA/joHEAsvkXsHhT7DccwpO6ztnUvRgEJqx7ITblXEOYj2ld+jlBRbNCZ1drcVo31ZR0A60GDAxQtqvcK6CcYYoisok5uUsnPNaxRNk4XlsScNMsNEmyHFpTxh5fFjEAobi3CEJXHRDgmptIMlJctJpn0hdu69qU/LF8RU5/8cn1RQDxaVgvGtwdAlPcDIRzSGQrS3o3e/rNi6A6yycBKj3Y+HqZak7MvjP7Sjw== 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=OXHCqehfXkp1bz8G1n2uVA+cDGJqvU20ctdFi+kFn6U=; b=Aa51/8PtolayEHVvwLVwp2NSgMudfsLott2+fzBcpXzxtJxSgANQb8EoSGeMKzx/QW9yec2wBBKX96KpYN8mzH3VWptfPQegfb6N7bC20gEP/YMa3yZZ/vGCeR+FWBj3YwVhk05f2HZISd4RABtPuPw/HVN6gQHGdXdnvjepzyIjBlVauQCZfG8H2whUphJOiBpvFGLi0MctAB2am0mAlcAbtDFh9T97jImlsqq8vOL5ucKmea+yWxpLD9ZmVE9e4V1YZJnzjO70TpBOoFNbdVHVn2+nmH45B8Z7Eq5BLT+8k5MYl+1uznc70cXrkVEu2LtorOOaozfvcKuyUnYegQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6490.eurprd03.prod.outlook.com (2603:10a6:102:7e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:49:03 +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:49:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:29 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [coC6hOI7HtalHMRZoyURd1zy7/VSh8Cu] 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-87-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:49:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4947587d-ff29-4e0d-27a4-08d984191000 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbN6ihUoa1XKENwp6xTyaJPLWpADTJwfHoFCXR5/pf+BcqsQMUFVOIKcW8cDR8dt+uyQdj0MKpCdNX1zqkmjaGu4qTWVKSYiwk8vpd66ugIdTKxN6397v5I1cJQaMhrK4Q+lBgyt2LuCqzOie+1itrNe5eaO7C12hGhNoJc/4Hl1hE1eNIqtC/9YTioa97ffMCC3rrMAZVYhac9MPAWs4DXz+v4ygti0xgxTJtJ9zJkD0wPQhXDccJShk4eT0Lly5GQpJVjk3P9zCFx/pBxVVhTz5C3OaH5Qy5GcoGY8/++sMjbyn2pOZXJ+EDffVy5wp3UkDY0qbfHtHnSiretBpEQ5XzSUe7cG9WsAAcccgmFHjYUUn7/gzjrkIeW9dNZI5pc4mIFmi/I3HV0gqSjrnW0D/a6Ker0tF1sr/F0E4Bxb1nnvDh2oEJC5MKU3kQ0YkZP0jM+ATh9naQY0TIo3vk/n3pG3vP+Nztu6yHPkr3Vp5ndLcbm+kbZXxPDgoOVFs8pFQdDoPyzdUXbFa+V5gYk0ai6NHXapUACfYHrzykHetlKhDsl4aPdmNDnb7DpgRftHOmKfsnM9IYEdfS/D/ME3ZGojKFTY1rMrDvFAbioxQKkgleCz2iaE7frzozZmiv1wxJx/iqqyQgk7npMxtKzlPCvqSmPRJb91CyLezjApP/x/EW5QoWvRXB+ZHFlpJAmNttP6szBvSoDIgEbgRmnRTOioOGWOqPY= X-MS-TrafficTypeDiagnostic: PR3PR03MB6490: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +aUvtBCvNH/U+8TjFjMSJPzAkTSdABnrPV+ovVbRcxj0pkN+4mCz7bEHqrgSJavc6t5TRYgEWipokAq6kf9hOtmehrjZF4uhaYZNtxB34HerCtjmUrksUS/To8TPaOPT808plsi6k6FqoMtYnKbYoTBOoYkcCGjLbXDzaR6OCG3nm0U8+0XS9ONv0JStxmZG8diTBGnoffGlNVWnwWRsoVlfsy2zcv+EZSvMBsf4LtkJjUIbp15K13+D+0iJPyPmTN0anMnuqfbqrU0P/Hx4kw01CWDqq6XZh/6MuKX0O8CO1rgac+f2gREOo/HODl3Mh1fUodKNOUE5cILuiV7nPcGUg0EiQBSCU6hpHeESCXv2vkgOj+LXGGSTg+5N/79AfO9xpldYXYeP7Gd3mupLPiBCChIo8S9/80GFvIHVepU5gOuXm40chUljt38MO/w4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xo3AP5EkLLVor4EnVGj1yqyVEnbxTqrKUcRFJhXypuQ8yh0ITvPriExKRRnEZ/hihUmRAEjNi1Ca3Sy/K/5aWqvgxsp34aL7YeZTTpUsbOJ0P3kFyNYMkWFTeddRHl5AW8sQcQYtCo381PFN2LIqGQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4947587d-ff29-4e0d-27a4-08d984191000 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:49:02.9300 (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: PR3PR03MB6490 Subject: [FFmpeg-devel] [PATCH 088/218] avfilter/vf_xfade: 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: 9UALSr73vqQQ Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xfade.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_xfade.c b/libavfilter/vf_xfade.c index d5506a44a8..10f0edae52 100644 --- a/libavfilter/vf_xfade.c +++ b/libavfilter/vf_xfade.c @@ -117,8 +117,6 @@ typedef struct ThreadData { float progress; } ThreadData; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVJ444P, @@ -138,9 +136,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static av_cold void uninit(AVFilterContext *ctx) { XFadeContext *s = ctx->priv; @@ -2005,6 +2000,6 @@ const AVFilter ff_vf_xfade = { .uninit = uninit, FILTER_INPUTS(xfade_inputs), FILTER_OUTPUTS(xfade_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:40:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30770 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp699787iob; Thu, 30 Sep 2021 07:01:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyL9pQFXeT/70OvmjwGFAwQz1Yif1EmU82C5cGGAST2R8MTCx2iR8+6sPy8a86j8BvSgHqI X-Received: by 2002:a05:6512:3095:: with SMTP id z21mr930930lfd.167.1633010483803; Thu, 30 Sep 2021 07:01:23 -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 b27si4076009ejl.186.2021.09.30.07.01.22; Thu, 30 Sep 2021 07:01:23 -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=ah817eZq; 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 E4D9E68AF69; Thu, 30 Sep 2021 16:49:08 +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-db8eur05olkn2065.outbound.protection.outlook.com [40.92.89.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7E2A68AF62 for ; Thu, 30 Sep 2021 16:49:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TzcNqtNkTS0fqe6tzJHji7BLf2NPC+mgDHrfCa3vhHii4nYVxJOEuX6An7+mkKPHiTxDpjm2rfjPWshdGTTAOjQlOO8TolHg67wlT/MGFffdqhqmYLogJMZ5N6PpzG/E+ppYamJITH7Zivi+hAEt+06o4Xaw+MIFXe+pdxJ6s+pQjXB3QYfxVVQyLDxl2Gjlb1kb8w96cQa0w4cNLz7aPErNE4BfrALWB1Z9qHfWZHDtz2GFKnlmDWDrMnIGj3sNcomJBxDbVIVr7s0HUcjXhvH3pq7MbtKLi8R0Ts4X7MApzP8SlPHh6PYuzsbDsp+NWnUDhbTEGBTDgpwjCYja2g== 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=7xfVEQKC3a21ikGOwc0g/HlHp02Q3L7/GnQiYRNRon4=; b=RrKwmA1KTgz8WicL3TbzsSnM4DwfzKlvyq53FMzNBjfL7OLPnn4Yx+H6WX8xJpJYOABXgQUcv9elf+iZq5K0IsmmoJBAOyNWXA+8FlroauIQN9q84ZRifLOt4sNu3epUYfoL4B1dssrb/FuZWw7//fCq63aSHqDZGhZ+3+IAfMMZ0vL1rzS3SWjXr8j9L5DM9C7KEYkfceP5ZHqyHepvb3AhPTpg2QL+mM/GsFfAhsesFgzk5MUKynTriZBg9BoG+5QkFoJzM55camV56s9bUCMShk49iqxp4qreXDb15amPSHkE4caUwbbzpGOmBtQFRw/S/Gx6zaf9hfqC4o2UpA== 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=7xfVEQKC3a21ikGOwc0g/HlHp02Q3L7/GnQiYRNRon4=; b=ah817eZq/HzFPfOsBGIt32opvcWMD8MHjDDpB7qFD9bOM0gVX55f6+5vU8nRMxrNyzfef7tUC7u7xWXHgol6xKA1OCZw9qwQKZMqYUBu5tPmvfDLO5zcLJumNr/21hrDWl1z+6EylDlfn4wWw/hhxioAJU0eqA4DFxkTawQFecm+Kcf+Ycq0Wku4yqGpagI51nQrk8Zxl/1cq5csikwmfpeYtGMuaPBeV1NebpmRWw838+z6jkHeKFNIedvr+mz6pzdHHDWqIa/TDbWCShTh767ggIWXeab+i+RLSGajtGR5Bw4bFp1Lw2bVFn1VqzsLddSom7H9mKrc0KpL63pg1w== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5322.eurprd03.prod.outlook.com (2603:10a6:101:21::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:49: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:49:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:30 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ypibjm2V7VMGV/VWQjTtkgmHBb+vbSIQ] 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-88-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:49:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c261adab-646e-4e90-b7d1-08d9841911fb X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2l2+3H3DBlVYxbmAXhegqXh6qvGIigwfXGW3/oqLHDJfVKxUH6oG+xMofxnD+aeBsysNfFRP13Sr36cjCRjBIyNMRY+TruP5Wo3VppESJIfCfnhCSp6U2UpAUwS16xw7ecfOYaRZ0r7rhobv43jBQ89t4t3sr9M5nnBVlW3Nl4RrxdhfOKl/7UFbWRF9nzTxdNzvirMscpYfVWzOPaYCY0xn5/r2k0FO7nalo6zqUIwW7iUtwbTemysXPHsyDKPIj/okCdGr+933/qDY0rfj6+BA3AX2fpQmfgNoyLUFGzvFXDJHlhigMQOWlhnurfRZoelO2WrNos85EN0fo3p9psmvhf0+b8nvYyBh4CsyU4RUGPX1y7UBtFx8EKoZtxn5GHCgToyGVkN41AEqkszv9ET6ZgtjFW3WmerNSB9DZ0JCNTnhr3OatjJLrd8aBeG3+a2XjKUG0wEY/w/Bife5XQzbg43GDZq+jMGJVoWdEc71lwSAcFYcw4NFZaLVGjvCXVsiWZShEZ11xUlFgB/M2wMRHWh4Wgtaw83pbv1qdNJgoAaaC4Aq/t57KIW7G8D1kg9p5vtcKOcVUBCBiS55QoBpK/fjU4HKwI5G9BVv6sLjg4s2uGt/iKytfT+vtZXusR6N/0acWav7jm83R9r3MlqsuqIJsvg8rRen+3yZR8rlCOXqptBsbG0nbTuX64gYAs/+weD4Iox4uumDQOOnOR2Us9mbnN77qaVDlHj8SeuF8= X-MS-TrafficTypeDiagnostic: PR2PR03MB5322: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z2Kp8TONpqFbbOPKT0n9C+ls2JPqToc45GV8B68YhYoHE2NX2sCw70jvCkJCzjC39WR/z7E9jQiNN1lVxeVPva8VzY3dWALVJ1xWTnpqDU7lr7csUz4HAERJYG/dPIxU+Qwc575qUoM7jMEwZLxrFDKFLvZ6Qa0/aaH6TJDgUyb1VEpi7IiwJZ10vv0CyiB3jKRuLKlyslOswwbEZxz48PMd2ubGRR6rraFrQBdmMzDGKJLdfcE8Opvpy52vGCkY4wPQXuSrDk1o6nic0AJIKo0KF4nXGRRCSKbzR2ee4Ir7Al64L/5Qq6NDLbP3I364LzR9S7R9EzLGoCh1z6w6KrnsyFWdnfOSLKaenI25W8X3RTPY4yEjxIIHfh6l/hv1FL96470SPn9hMDrYLkJS5hDX7w9horNSz805pUFClWsnpT7I0cRQ6FX2ZobEXqAG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5tLyPU8Uu7PRR2P/Ysdm8mV5d1Q1egyKETTe6/RPAtnplH8jAsz8Os26YiNV8I6QEV1x7Yag+2mfucVREky0InTw+g65kuGUwuFPfU6QdOgoctHHqOrl+gCbpDr1iPULIHmoU1/kFuTINYBRvr9GvA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c261adab-646e-4e90-b7d1-08d9841911fb 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:49:06.2614 (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: PR2PR03MB5322 Subject: [FFmpeg-devel] [PATCH 089/218] avfilter/vf_xbr: 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: WQBoBPv7HzBk Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xbr.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c index c799284566..6ae5310c9f 100644 --- a/libavfilter/vf_xbr.c +++ b/libavfilter/vf_xbr.c @@ -340,15 +340,6 @@ static int config_output(AVFilterLink *outlink) return 0; } -static int query_formats(AVFilterContext *ctx) -{ - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_0RGB32, AV_PIX_FMT_NONE, - }; - - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; @@ -425,7 +416,7 @@ const AVFilter ff_vf_xbr = { .description = NULL_IF_CONFIG_SMALL("Scale the input using xBR algorithm."), FILTER_INPUTS(xbr_inputs), FILTER_OUTPUTS(xbr_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_SINGLE_PIXFMT(AV_PIX_FMT_0RGB32), .priv_size = sizeof(XBRContext), .priv_class = &xbr_class, .init = init, From patchwork Thu Sep 30 13:40: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: 30773 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp700112iob; Thu, 30 Sep 2021 07:01:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKhgT0RwZqDyKQZlY3P2Qhe+TpScX2N0hHGBPRSw31untZVGB/IDbpq4Y7NncPfLPWMwbZ X-Received: by 2002:a17:906:4482:: with SMTP id y2mr6895923ejo.484.1633010502272; Thu, 30 Sep 2021 07:01:42 -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 k11si2804200ejk.702.2021.09.30.07.01.41; Thu, 30 Sep 2021 07:01:42 -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=NS1e51hV; 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 0CB0A68A858; Thu, 30 Sep 2021 16:49:15 +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-db8eur05olkn2029.outbound.protection.outlook.com [40.92.89.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD33868AF57 for ; Thu, 30 Sep 2021 16:49:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UUqLBcwc9jSSRx6SIDN9hkLBSvvDRycY/fMu8s2DSWHHkczuxVHbIHLf8zloXZzhbeoWxyOWfr9/ZXBmfbtrznK0HG3oZRw1rVkE6IbdemqgPto/g0MzTbeOX5f0Y/+jXGAaz791KT+n3w/rHPhrQ98I3Au+k65CeASb3uew00QhTmXbgc5x8cSbnjRmpUL4X6E83eCwlmG3znac/7B6FwREAgPYDH3gfDifmFqn/P5RBrfoLMHUl3bbuGBojV2QtkMDnxNROn03EUXt2aJKA6qoHDu0IALhSs2umzjBHev3afoeTkuTDfkTkIuAw31qS8F5B4RNSIXd8d9TijPjdA== 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=BtcBHmgbFhmIrI6oUUWDWRfTREqgTNNROewjdaPrN5g=; b=nzX4LD5yvVx1xYP2T/6mfz9loTPMmmcsczFiHBbb2rL1Xh2U757uJ5fe2t06HBPi/BlV2Q1TfGjVlQX1MrGXQOPs7GPoD4LvToI8jP4yCroJLCJ9Ysqrc6RQSHyMKt2w9VchREqlt7X3GgWFOnwbrpVH7WkAaaVFzd1ILfFzU9wFJ/GdYzrpOnAeY4CgUVotzxeosQdAZr4vC7MlWqvmUC0SHGfpHpH5nJIHvhenA20XG9wyePulbAN5PxoX8+vyLqo2nPQ3+cA6g9d53wWVI94X0NcaHHoi9Sa0BVG5EXjZHwiH0WRv4hd/QqKamLfFQQk8oymLdZY+obATvH5LUw== 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=BtcBHmgbFhmIrI6oUUWDWRfTREqgTNNROewjdaPrN5g=; b=NS1e51hVNYTogMHUGKOm5SIjtdIhCBAmTdkH1jBIlGEE8k929GI1c8Dhp/S9IJYv3l4frjiLBvpDNvq2Mw5je3QbFUSTDQIBfD234VLuXjxiEmqMIsPb9mgofRZlbVuWbjup4XzOzxhBoLXA7jtPEgQaWdRzDiJkTFmTodA0PsFxNYKGoDkdy8uow8e6ykxxcXshvgIl4r8A5bAG3DfylmratNg8AUwHKogvibtrPMRtgAjD/mkHd9GlseIPpq0951ZZdKxY6wFLHCKzuvuhbvQybMJ2ZDWaFmDC41Ok5Z+OKhmA+qQLOGX5dlfaMCv/SnWmXYPx0nb5CJuewtqwAw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5322.eurprd03.prod.outlook.com (2603:10a6:101:21::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:49:09 +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:49:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:31 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [PI6tAvOPLRNpF415W5XuONuajp2iT9Et] 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-89-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:49:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0dd472fd-19ff-42de-b951-08d984191397 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9NZw4tXvfuyeM2ZbScQE5m7GH5sfR+G84sE+Kt2lQparhcqyjweevUw896yqvR0T4BYQkcj/FBGs9DtcaKOuyAsZWzs7t1hOkCdYFGcBZP6zyvHEQzM5np/e2RnW9kYZ9oP+FgL27a+7nZpA7yQiX4C/c10P4+QJ9ZZIT3+qLCQUVgQznZUdTrCCH0M5cAQyv0Cnp/ROjSLhgp0RC817rk+JUPO/ulg9m86xAZEJKUThlpuJyWY1y95uumIru9jPz3mHscv9HaCTvvjAEy9nKdWZlVYK+/maBuzi4DtHM8+b1S0ZIGuiwJ9P7GURn0X5bmz1uiOOmUabHHi4ezPiQgj3DJM38TZgy83t8aeSzu2+83x7ubCyKQtAKlTOF75YWze2x0AmxuKNJCiREBc1tO2jOCdEg4rw0XnQM7pjurrUGTh1TSp85ykui5YUTRFsfo8Coui9gbRPloulHby9Cv1YBLU1HhXpR0Ob+odZ4BTp2n93iAl27A/FgRUQCuYDfHc+agqmhziYXuu9bFy8IJ6MrckWWuNoWCp6qykh1eOJYUk45WjXxIIGzwilz2zDkmOGxTPKvPbM5AUTUKrDWceHv4cHFeh7/oihNf9CzD0c2jhJ4ZxBKcQfaXCFNZWgSfMf0rbGDydoLmz/xlL1ceUB8Ux13xSx47ita7XMJ1//FVvXBaCzneQlqY2mGG1DolM= X-MS-TrafficTypeDiagnostic: PR2PR03MB5322: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DvR4TluWs6UxPumO0WymfXUOuM+68HMUBF4Q3rb5S6zAM+ZNXLUw3HJymCTBZ48FTZmdJ02ooRYq1zmbyzgqWhyJIlrZYNFlZWYw9v/WHl9pg38BUrDvY21oLR1ZBjqxG+ctuNger/HKw9jnHiRYKLv7sqLlivrjeXAOlW9gyjmsrwWTtbQXiPXysKixuuwUdrYHEnrBxoN6HPNM7ygk6p5Zl+5j8gQZ4DvFn8T1rzNzG56VNaSGyovyLSpxx8P42neIL5dBgVcFoZb0171nCNjsNUYZEQRn6nlPdvLqQlntDoT+ZlpcvnX7Gd91xWD0cnFPrcefsSqnqEedPPfnctlUIz2MmoNMaSNMoGBQPteaGoEM2oa7vQ3509OIgs/H04e6IovVCM/7VKj4kAjeCQjpZqXIMSoYS4rWmCYc8xrP1rmeQYQPDzUw5XBKqmc9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xGpjL72rGcvWNmzwqzLuSLH/lUQIbf5JAG+yIfGMnIGDDAw/2134vbq4YNX8WsxeddCcwbuvGfs4JIdwZcoAOoGwRU3zBIgzcZ8DVhQxM4bPyy9S9qUGMAVCozvuIAYBslJRzMZD5lU2FuSA2m51OQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0dd472fd-19ff-42de-b951-08d984191397 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:49:09.0033 (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: PR2PR03MB5322 Subject: [FFmpeg-devel] [PATCH 090/218] avfilter/vf_w3fdif: 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: R8PTvKk8x/Of Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_w3fdif.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_w3fdif.c b/libavfilter/vf_w3fdif.c index 46f1435582..42398939b8 100644 --- a/libavfilter/vf_w3fdif.c +++ b/libavfilter/vf_w3fdif.c @@ -73,8 +73,6 @@ static const AVOption w3fdif_options[] = { AVFILTER_DEFINE_CLASS(w3fdif); -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, @@ -101,9 +99,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static void filter_simple_low(int32_t *work_line, uint8_t *in_lines_cur[2], const int16_t *coef, int linesize) @@ -617,7 +612,7 @@ const AVFilter ff_vf_w3fdif = { .uninit = uninit, FILTER_INPUTS(w3fdif_inputs), FILTER_OUTPUTS(w3fdif_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; From patchwork Thu Sep 30 13:40:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30785 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp700395iob; Thu, 30 Sep 2021 07:02:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoQjswvVA0wN0jCf3dpN13rOxuc9HqdPwHXAsaL5xXdASOFNEuor2a65R/ptjzLb601wAl X-Received: by 2002:a17:906:38db:: with SMTP id r27mr6905983ejd.338.1633010520005; Thu, 30 Sep 2021 07:02:00 -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 x2si4440003ejy.385.2021.09.30.07.01.59; Thu, 30 Sep 2021 07:01:59 -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=aoTUNjoN; 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 2531968AF57; Thu, 30 Sep 2021 16:49:16 +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-db8eur05olkn2029.outbound.protection.outlook.com [40.92.89.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 19A2368AF57 for ; Thu, 30 Sep 2021 16:49:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dUPJfy5ccYHNLsIi8HIk3+msdFlnfSzTdeBoMpxEAaPtK4OjvaIay89EscwKTiiqM+T6Bg7J3lz5P0Cpv4PH8uajMoJxo6nPt1C7Ow7LsU013nWILwolMCW0ohhKpg6jsuLZNAGPAvpDtAatojfOV4M+21S5sYAJ5/StqK7EbtDVBTshXcrIqz7q9endHv6HeoBqPajv3aRLSmFyYLk5xwLdFaqIlthclLTd3YEJMY+9kAe9WkSkbVVqS95YDbNXwRGRAZJU0yuTC17jNRn6noPNHgPwgdgsutfpD3hq2LzxdR9FwJaduDnB0UbP4c+Yz1jSpQLgOl75ZlxVJvbQqg== 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=lFPpx/5Z43jFmGHsVWir0ILiPRU8Uz94qI3jrG5s8wE=; b=N1zKSQL8vZ4PzMO5WvNg7YA7d4wsadrtoypse5cuAWBnY0BYbhusEWzrKvWcilDfGJajtqr+iXdED2+QgSRaq3PZW3X6VcpmLp52NPrsRQutNwlRqIE+tuKm3KySfKlwlaubfPo6oIjQq0/s7Cche4CNgEIAd/f7adiP4ixtE4QZhyYZEgfdTpbeDZi8TTi/d14xgwUtcClI/IKBjs1g+nPPT+GA5rjfRu/Dc1QUk7QAD6dH2YEMR6LcTuExjCP5y5XsOpU/EjYaWu+sn0PIxIZEV1SfOdt96CRaqOKWhy6uw5+I8p7/X30/ThR0VNUMBW75LS+UjDv3Zl7oxyxPpw== 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=lFPpx/5Z43jFmGHsVWir0ILiPRU8Uz94qI3jrG5s8wE=; b=aoTUNjoNxNplwXJxiAMREv1xaeNcjnXPVZjG/wUUFfbBLlwSyQR6kiRekx2kIpeB1r0LtZi9C5v4fTwNd7+1PLOL+q8NSq2DgSyJiG3P+wL2qCH3OKM7jg3nOyMB6QkwComKK5p9GHdTiD7wCqoy9TEBvjckBhea8HTr3wlKm/ZX8Ub8yi2O/1UQZ4t6i1/vTyLJze8L4B9iS+nnPl9J1iocbxfRFjc1iGfQtBm+45lS8/kK0HbBLsKNgocL3gEw7OPaqMh5oqQNrvdp46HyVUxQrZiyY9kHnD2W4kwpTiWPcn/qS05YkxCbvGRpBL10n4tgNpe0cJl5fwLu78bGJQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5322.eurprd03.prod.outlook.com (2603:10a6:101:21::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:49:11 +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:49:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:32 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [/WbEMbXLBUBGNEATqstgzgkOV49xyxE6] 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-90-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:49:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aea3d8e3-dee4-4750-24d9-08d984191519 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9NbGrtVb5P6HSVNdozOhkatI4/NFru6zLl3u8huzk8SGIoivJc3CGo9b5NsTtzYnIoQ799yOFH6DQu3MH2gW3QrLvW7Jl6RtB2izxcjeS8wcmi7t8WLhWy5qG/w65jcKfBRA9Xn3MHpQvtBslzAupBCcjUzS+ddxOb/NTJDtqo4wOetVdQA4liVbAAVWhwnhOT5H4p0jeuAT9Gq9TRdA5Vf+RIuoFiPrZ4Pt8U49aKgXsG4vTExsaWSv0/QLuNMRdXAmUfvnT3eUXcQPVfQFZTjOJTTt2I+at0DY9sRZOYNw2I79JB1vPimo4GL8e9JMtysoEzsTtwpiSpCBHcX5seO1C/jn8coDNW4ZDBO+6GsLQVPe++ODFDgX77EOEgBZo71So+h2S3fyf7Q3+0y6Hhf1z+Q+bsNarQdjXPUeWzVCJt9vd/wL/6ZqM0Jp+1Z3FjNHNGjHfhzXopBqPhNChOYYNGH7wiI5Ha7e39IBfQsM1HIvmMzy5Z8KbfO9Cj1WonaST5EKcF6T1wKoQDB8bIH+//tfmHi8Lqo3fOKTo4/o5WZF9u8MI14dBCynGx8WWiEI/aDHVCHvJ1H60EoFwARDZx6EdeO66msXPrbqeO9hLtEK9CgDuOTaC8qOYXyB8Gzgp4rms5qNGmGORCzKOs1DEPAgpKo1h2RXIR4UqsxUW2Q5mHX64vgpC0MdJHFa3OM= X-MS-TrafficTypeDiagnostic: PR2PR03MB5322: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A0i4fya6wzQnayPXudksS5naNc3RQeEXmYhBBS/Kws+r+ak5+c8+6IBSedNFYRiRhEHF9ooNLaVY1YnQcs/ap4yGdJSTw451vsdM7Hi4q2o6gj2h2Kpof2KkI2ThNKY0UuLRkws7MkaJPbfztBOSdiB/Ho/hKKHEYrLO5T4vctkQ+g4tVgM8x62O3n48Z8ONwnFTs/KbVh5auQ7eTDUFljM+P/3FlzA666kJUfIoNk0xv2yIqcpLA7cvwm7tjJjLmgm4gMlKeUp79S3+xx7L0i3cpp16SE8gG+OGl2nsDxmE3QvPTxrN1sUPmdVpyd5kbm1SBD9D8JKIM+zkt84eiB1DkEkS99JQG+oHuCCvMV6ke7F2MmV22AqMUOUJmnLZOTbLGielCc+rRXyj/UWpMkw8vzf6S9nKaCXd39AqG+ksjPkxkJx2H8efo+aLQ986 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bpg8BjDEiGv7xom4uQCV7gS4a+ejGQ8oKSesHcRA8yV+/bvSnYxkvC5lKQ01z2m7b1uun8GBjvc1zTVpbbcm0ISTE+oxbAisWT6wVfgwYvB86uhRyp9DI3soUSEH3lS7KOk7a/a/zcicauxejAqjJQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aea3d8e3-dee4-4750-24d9-08d984191519 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:49:11.5342 (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: PR2PR03MB5322 Subject: [FFmpeg-devel] [PATCH 091/218] avfilter/vf_vignette: 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: JKK7HvPzAubC Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vignette.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavfilter/vf_vignette.c b/libavfilter/vf_vignette.c index 27772d469c..e7c336dfe2 100644 --- a/libavfilter/vf_vignette.c +++ b/libavfilter/vf_vignette.c @@ -125,8 +125,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_expr_free(s->y0_pexpr); } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, @@ -135,8 +133,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} static double get_natural_factor(const VignetteContext *s, int x, int y) { @@ -344,7 +340,7 @@ const AVFilter ff_vf_vignette = { .uninit = uninit, FILTER_INPUTS(vignette_inputs), FILTER_OUTPUTS(vignette_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &vignette_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; From patchwork Thu Sep 30 13:40:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30778 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp700643iob; Thu, 30 Sep 2021 07:02:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyiSV6VRxMwH2G6ZggrIqy6D+NoA3oAmOeMUgERpEjM0TbI/+T9FrpxHh/lI7UGtt19fkHO X-Received: by 2002:a05:6512:3045:: with SMTP id b5mr6147788lfb.259.1633010537945; Thu, 30 Sep 2021 07:02: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 z18si4558233edc.11.2021.09.30.07.02.17; Thu, 30 Sep 2021 07:02: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=jL8tX6X8; 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 48F7E68AF87; Thu, 30 Sep 2021 16:49:17 +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-db8eur05olkn2063.outbound.protection.outlook.com [40.92.89.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA02868AF78 for ; Thu, 30 Sep 2021 16:49:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h098u9nXQiwBN+7yjALzZkI1T2cg2Hh9F2ZpLlDFbgn5zPg7D/g7HoHKub7EMyNx9b7+Ktk8R88C1vi2HA5ncwWsRWOxKKNLt+fLq1nkVgvQFlkmkIWRvL09mVEEds1zphCCLSKujeGFr8AN8x5Z+A8TbyPizzlFYFFR6DJfMj4k6ByBmA2Aa5x5rHT/NBq1o1siva7AsjeJEKxwlzS8SYiKiJwVgCvVczqoq2ykPLinavPSiY6hJ9js28i+zuo/Px/dnMqSikA/32r3TB/lJ4VGzTwPiZwJahHwy8FPNrbxrx//OUZ8/cURMlxTyrapZM7aRT454EH80R1EcJCrag== 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=D4244uHHDj6HAO3BrGJM4jOh17vzfRhx5zNtLYt/ya8=; b=cKUGpU6petfSSjfgROFacynzMAdOhM+w4mc0Pkh05aFI5ic/0IWkoVfWoPXzeGY25TP059wFwYtdVm3hh3B29KbWlfhF1bjyxSXMoLU0ws3ZQ1r6TLL0JU67+rLgGYlyWauuO2AJ6QB+Lg7kRg8SatX2hQadFfSwbubeqqmv4svwfvld7A6C+rCspsjGwuZ03dDFqHZkitniiRmYvGN5MZJfRc/OGrTQ96EPB3nl6cEOuh7zkuy1GGhxobUZCrUJxvx1oWJZFAKy7DxDCzaj+KZqFX9NcGS+z9o8O8/rAWhoQzKijT1s++xFjTxfH6q3HN8ui4RuaImrOpC87plaLA== 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=D4244uHHDj6HAO3BrGJM4jOh17vzfRhx5zNtLYt/ya8=; b=jL8tX6X8VaoIt+1LX8UikQ8my+5/Scst/gJyweojufBYy/VWQDizdtFtMTIpdB/D6KTcoBkH+YXdsBDxLTXIj/mixpPKpegUDNqwqSJjuyEVpFU9/6Y1fiVcnsO9U5GtTV/4lcKOEDxxgUD6GobBgs6Oh9YwZDduQInWxoGgj00uOs+TZFFWj9UwsjuGBlB9+SaOBR8umkcwtr3So4tTFFdw1MORMj6xB8iEH1EuoTmVkcdQi4Kl2igsLu1EBZoTLlfDUKaLDhBfQpO1ySOrfiQz/EyqnKIvfzrkOc20wo0Ikx0Rc472BDDnjnb1ZjzdURtK8r9wFIoo+aZKwKM4Mw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5322.eurprd03.prod.outlook.com (2603:10a6:101:21::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:49:14 +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:49:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:33 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Z0aMtRL2ofcKuMRhnc1bU88VQlGaNax/] 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-91-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:49:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b8788146-489d-4ce7-5340-08d9841916a7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZvVltC3d/codD1BQlLrStDjJ0t8RtoD4SKdP3KfEl4PeRrAgRUHO0+PBh1OfGFnl0G0tFp/5yKHjGZmpOvH/teAP7xJ/ZVuQdcfO/ixX9tyqyK8G6KsKhaDgh50U0WWjK46UKgweuCzt8Tg/ZioeQWBTuOHGGa/t4bSGY1hVJeuk9lVspQceiz/mKHRX+dh8LyaTGSSH0TuwwECsmGwG4x/Pc7Oy3A7XAwwNX/OmFh6uhPHDtOguucykzmGv2PnmtnGe6ktGKwkwnjxVBZkeceZXs7MR1p3S8123cE7RpaXPIu4hDzl3QnE2seDFr6UYaxnV3Mw1Z5wrNhL73D4MTFI767NvGWj9lLnddfz7b3qAwhM8WPJA3Gw0AzF9z7Oz7iaCjxbXHJJrT5oaMcxeNrnbsumWaQtYUZh0LQK6Ip93vDbs6EyQ3rN/jfDBD0taZ4iRWqzjMV2oBEmKLkeed1hu4Y62O0TOXWEUZHXbBTe2TYNoVHAtbzsIyzkV/Inc+hEbg7o9P3M14Fogrj3UWotouvrZoidvcqK0rNLL13kIL0T6s/JfuaR5ufNcxlgvO5lHa5gchlq7qCHjhZBc+ajlujSZIM61WUL4ADfi9bgdxA2az6v5WHhXjdzI+DknwAlVzrCS99hJWuGYmMH1wmkEt3ThUyTqJXC3lGcIlhdb1ueD5cxBl3+gjtxif7iCM= X-MS-TrafficTypeDiagnostic: PR2PR03MB5322: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yP68YjF1vBhLMYpU4oWqTvP37d9bw4mggxFkVM6CJrM5N6ug86hFNrZRX/AreHilClyS468w8Bc9XS7f6SvTgfZF3c7LNzC1pnUwtLhKdzEteYsm20yE4EYEmRLwHGsAxh5X8jFW+AXhczQTO9DJjZcNKtxWMhyUHmQSEPesDY0sdM1XW631RPQzweLe5dtRA4EjBPHP8NQ5txwAeTkvDumZ80sWDodUMsFwAsfIAD9OB93yp6/tmjGIPw2wyAqesZ0OAWNzbFUjAuPQW4aehT9ZzAtXagzCpLdj02/423CYxPTBxbkTUAh6blCnlfsU+ow5tfb0mOqmrlZd7CZqOrFanzCMPwRn4ewR91Rj8UlPnS8WeHKnIMbMV4ijOOp+nmYxpJq6sQf62mmntTrQMs0b2vjEy/eyxRlVnWG8KHsxdetgJ9yrnNbGrRmg9Bg3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BE9hMZDTHt5dncuzKkcYEViTbnpunslT7QdxRPrEXkCDUqkvx566PDEEIACA4t8fNx5++8nJt75jVLHpvFgc3xMkN11Mbwu6QU7BjTqjT9asKBHrFwYwE3ka3GDZwazKM3AvXZ7SlKyACW9kUZa35w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8788146-489d-4ce7-5340-08d9841916a7 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:49:14.1108 (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: PR2PR03MB5322 Subject: [FFmpeg-devel] [PATCH 092/218] avfilter/vf_vif: 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: 8WEpjhXhkTYs Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vif.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_vif.c b/libavfilter/vf_vif.c index 01851a01bc..20002c51b9 100644 --- a/libavfilter/vf_vif.c +++ b/libavfilter/vf_vif.c @@ -469,8 +469,6 @@ static AVFrame *do_vif(AVFilterContext *ctx, AVFrame *main, const AVFrame *ref) return main; } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16, @@ -483,9 +481,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_input_ref(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -642,6 +637,6 @@ const AVFilter ff_vf_vif = { .activate = activate, FILTER_INPUTS(vif_inputs), FILTER_OUTPUTS(vif_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:40:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30777 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp701041iob; Thu, 30 Sep 2021 07:02:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOj4hYTI9DSSWUwOtTYB/CadD1NpBVpDcohEsdvePuDUKADghlBelOxJpC9vez7mm/1QdB X-Received: by 2002:a05:6512:32c5:: with SMTP id f5mr6492829lfg.234.1633010554261; Thu, 30 Sep 2021 07:02:34 -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 e4si3195617edc.234.2021.09.30.07.02.33; Thu, 30 Sep 2021 07:02:34 -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=kJxgCGAn; 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 5C73E68AF73; Thu, 30 Sep 2021 16:49:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2069.outbound.protection.outlook.com [40.92.90.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4777968AF86 for ; Thu, 30 Sep 2021 16:49:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AqWEjG6gl5FLo36iqA2V1TotbjRzL4YNctwAq430jC/d66Md1X2P7yTOed/NIFN7+WK8+ABWmWbEvo2DLuwH/b2mvskmoICAXcKAwqR3lYVgJq3kbB7cDTAE+hF8FEeKevgkIT6nmLN1GwBCiYLE798OT+sjg1KTCbTr6iSTsgTZwSaTpRQBoi8DFJzdi8a/cQEWoiFsfFj2mLnWTjrh42XHMJ1gbvGUfBW7emYqCYKNFvE/wrgC3NRd74labtEn9CmQNhTcCfyuHfly5tx5W/EXhSHYWBaviptrVeDbqqVgqId9BearjX97YzZs7b0MVp4Sa4rutxPtQIpB9iHSIA== 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=MEatHAzUxeBD+IUyWg+ek+6KbOberKR8wcAhh3gMEiA=; b=HhW0LhK7dU/vXEQrrbS1NEloq8vYVAAITsBQISt85ix4F7QHR6CCn32nZzmfaQxLGVRG6uSllQ7alNLUReNoqld67TFngKL3MNViPhl0ha9f0OLmjMRj8+3r/4h/g1Z6NYfd+809liTUxzMzTDHNXzKMmCbba5OC+sF0iFi6F0NlMzkZ7Lfp+irbFh4SLCWoeofgbUwTvYeSYj6l1RwHAIUYPvxmS/+GPAApRt/sVakxYQkMvJLIizrvaa649HvbcH0zT1G4tp7TS8s9axf5V8tiER+B2lE5noboouui5jizaKh7mwfWWYkBND3xAm6sD5PLgXjVhTg2GP1iEQ78EQ== 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=MEatHAzUxeBD+IUyWg+ek+6KbOberKR8wcAhh3gMEiA=; b=kJxgCGAncf0d9CZrGcWvDbrl+l32jrB/KRlAXFoFlk3MeNt4NgO2tH2/YM87nYdEVjkkgNZ/Ds0WxUU7nk+sEOzbzxo42RfwGw0bGZgA/c/yRegFJOtuLagGssaGFywmZdzeq9ibRn9DxXZOpzZuItlCrxDKjzFVFlp8SbmbssC1luzLfN5L6XlmoAQ+ckTQlYcKT3W+tlMPqvPkYxsLWVf8OXCBETfLWCUoofBu8HL+qiTo4QC0YwWdl4vyNQYGbZB1/XqJHTD3UI/n3NLz0KHjFFnGrzRtI49KhRlDMSKGLq45D5nVlcnh3dGNr7mya9dIltvWYQqTeJbGHDTc7Q== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6490.eurprd03.prod.outlook.com (2603:10a6:102:7e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 30 Sep 2021 13:49:16 +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:49:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:34 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [DZkMlauxhsQ92mp+Md9UbizahY0sUmGQ] 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-92-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:49:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 86c025e3-8bf5-4d87-87a2-08d984191827 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbMn9bKw5PgbHQcceFW1cAv+Ik1fhL4nsXQRHkgo90av2wegpKWHRdJu3Yjr2b94EWQbbjDbgxqau/UYlMZXfSqEmNdxsUdNTvCFzl/V8H541LlBNg1wBmGiDhlIIQJ9cOCSWMEXGF5vMZ5CCayfYXBVGXsLpfLVV5blE+qSFqE4aCvN2JwyNI2UBi7s/7grg4nzw0C5MICuhGR8v/v6uNSsCsacGIW7+WRkZZ7/IBDbnIRipAJ4o1JdwVRM6KZJXNDf2/VI850vnBV5Zh053mj35EwdSdzK52e9Bg+KZX08qxCOvI1XMLyOc2s/HtQGXtj0TCtrvlGQnwOJ+WDdgG4B3EyHJkoribFY0rPxM1R6oRPyXNqSd6EUoGjhQSd5D1iDE26MpXd4IczdzpLe6ZfOkmuBQ5ESxn7lqEJ3mPtxmoYPtUdZdMK5u0Q4ckx6NEPYDMUXHRgcHKNQKUWI2O3WN/51x5i0PqP5Mb+zzQZzmgHvOgrhf+sEKUmdk2tdGEtAJlkN1MUrAy/QgZAPh+/X1vNrJh8mn+g6oisxChHfF3+ygqA0seIzBkXCFbKFNgM1nyaC4DNVb1xdNg/sphN1X9MW4MHVGScqOVpGfnXx/iun00EtFRW0dSKUU9JkT+3jkGprn7hV7C9Wx1Ww9cg7Yvl559kh9Ovk4DC/HWG6cS4PeYrdQUwlAfFAnREyZQL0mgrj8QFO1wpJwNClJKGPLy8Q3Ei7fbU= X-MS-TrafficTypeDiagnostic: PR3PR03MB6490: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JgN0lBnMUOxZ/vLbyLZ2yP3p4YwzlU6PmDfJL017G+psM4hl0nGq7f8V8mqGsSmR8HcOo5yanLFWNsaagy+mkc0UYsW/wKnN2LiRPLNpSeh/Coi8iEKbUMLr1YmCasJIwcZa/ZqJrrv1LA9eELCAZGf6282LW8M6j7MVYNjKpWS1SHiSwI0H5PFf0VgJyJzPbAx7JjSoPW2tkULWIPeS8hgds2zb79EC329Q1F8SAiH//TLGWDabo5i8eZyZzQy8HnCCLxuFjdwetwEA9+MFULlQV696XdClkTCCebLyFYzOV2aTWOl+IA/xIgG11ilJ2ZZw9yNPFsrs12tf3mX5NXSqB1EVepaaAHoOkUG6/7CQ7qPfrXYX+w9WxEU4c4amFXWcLwcUHiWitDaJ3jAVlKDoAwQ3yvxh6LKun9FmYr5Exc2BRu2lh5qogqGDwTod X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AcoiygRs+ihyu/7pUFSlmBMZI0BVn052gbHCmPMfTjjPnMJ/QLFwlXBixxtlcad/bSWJ8O5fuVyTcvnGvMEcROsxR2c2iHo/mab2MVUcgAH06xIzCdAttGg2cMmVSeHCImLqAOb72QYxv15TIkHdQQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86c025e3-8bf5-4d87-87a2-08d984191827 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:49:16.6188 (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: PR3PR03MB6490 Subject: [FFmpeg-devel] [PATCH 093/218] avfilter/vf_vibrance: 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: JDelKyidODGf Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vibrance.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_vibrance.c b/libavfilter/vf_vibrance.c index b1f9ecba52..ea58bfc875 100644 --- a/libavfilter/vf_vibrance.c +++ b/libavfilter/vf_vibrance.c @@ -292,8 +292,6 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) return ff_filter_frame(avctx->outputs[0], frame); } -static av_cold int query_formats(AVFilterContext *avctx) -{ static const enum AVPixelFormat pixel_fmts[] = { AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, @@ -309,9 +307,6 @@ static av_cold int query_formats(AVFilterContext *avctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(avctx, pixel_fmts); -} - static av_cold int config_input(AVFilterLink *inlink) { AVFilterContext *avctx = inlink->dst; @@ -377,7 +372,7 @@ const AVFilter ff_vf_vibrance = { .priv_class = &vibrance_class, FILTER_INPUTS(vibrance_inputs), FILTER_OUTPUTS(vibrance_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; From patchwork Thu Sep 30 13:40:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30771 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp701203iob; Thu, 30 Sep 2021 07:02:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOwSbxhfyG11NrgItRRO1rysDbf6+MJ2rHbo1gOeIfsELzjqd+pVLoG2FuIYzXdirOt6Y6 X-Received: by 2002:a50:da0a:: with SMTP id z10mr7416573edj.95.1633010568957; Thu, 30 Sep 2021 07:02:48 -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 m15si3546863ejl.105.2021.09.30.07.02.48; Thu, 30 Sep 2021 07:02:48 -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=e3qpV6Ic; 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 7BD5668AF94; Thu, 30 Sep 2021 16:49:23 +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-db8eur05olkn2085.outbound.protection.outlook.com [40.92.89.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51C9C68A9DB for ; Thu, 30 Sep 2021 16:49:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gFExQ3MXv87VKvttxo2Hp79uQYge2I/3jdX3p6990ORMkNyl6rAg0GfA+hTts/1ZLsjQ9XVOCPsLBmvCapLz/C31UVvK57y5mFwwMG/qW7Jt7L0ilh0Swxl/7Ss1juRfulemujTkaIgzZ6KePO+vBP+odwKMBY66taGfSvFDItThNt88kPKud/tbJr33JSrjcfzzz9wO8ge4PDL3HraRxswNDIy58b8JpP8DpvWikYfjdpWOsM/GOVY14AF10NmIlvOXKFAcazlfVW4YZCVK/TrBwdCTixPVDBQ92h2rzYvbYsUeh4EaD25pX6EGS4J7rFbI5J1x6FXDD11q0nZOzg== 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=ZePhfsdbnwEwhW+AKWY/bN6B9TpTGJ4LtlbcE7qyV+M=; b=Nd7zJFLFx0eKJDs55ROwrdzSspuqBVpAi6oaAroO1dGi9FEXFKbAgJY2Wtb+tU9YtXjTTLw6sqegdt7fQ0Utz69RlyTLCYCGKHtaFZt7AeFIxThEnSXvA0P1Q8OqwLUIKtq2F0BsShddKS+wRCEJbiP5mWjENxQT1+XI1zMWeWUfYJCtf5MhSIGlJwelL/zZfUhGaKVlgMstOPAMKEu6CNIYv3ga5iycSinLzjv+v20GGnS6Cd5vfUHLj1Xc808fzboD3jxnui02w7mKH46kmjHocSIAOluieaBLla50T80Ouc2N7tEVmRDRLVpykXFz9XVCNUswWY/iU5f4ktiUkw== 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=ZePhfsdbnwEwhW+AKWY/bN6B9TpTGJ4LtlbcE7qyV+M=; b=e3qpV6IcQ3PWnqjVM8vttMeP8XnQ6PXiNsYFirwNC79CnhubXPsX1It3Z/VXaE/Ja+ArOulxO/e/yPkNdBSPf48f/mjlXumJSF7Qb9q+Ox2V2S/+ogxweNAPZbxBX6QJZkh9syY9b92EgtHJXPpMgboUK02bu+wKEn76eJsVV5cUNuEJgUGdDnPtwtLNW6cOh23k4KNRh6QL3FIkxt7ggxnVHwGtTcUm/PIz2PW3PoDrqlgtuZj0LyA2PObJJAimPR2qL/Ep1LAucM3aCr9P6VYnMQMNTTezaySlOrdd9cKMiHNN9gUS01umfE2H6osRw10anuJT0OXChOnrHOkAMw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5322.eurprd03.prod.outlook.com (2603:10a6:101:21::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:49:19 +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:49:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [U4nPr8ukOpiGnN0kVdHtUNN9vyVcCYj+] 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-93-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:49:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38fadf34-b0e4-4db5-3034-08d9841919f7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lXO3gUSwPHe1Sfx918NVtZLLAZHbmOv6rFxN1tbnXlfbcPgrbWly/+REF5LHdkLgyywIcDTM9BkLZV061j02CseS7EqrYLW8m9nxIdxWiyEU3kPLw8DUbczfiRHW5PN7fOLK+hCU8dAY1mk9IqJ9mGdLxrgrq1BFtZ9lIWIS0prg1w/xAGk23jKTFsNYdvivK6Gh8jU+gr+0hhVIER+RQYocVuCx44EbzZw86Uha54IOvEZw0c+KCSYBitY69U6e5Dyu3DP03tAcBml/XJie4mGTZipItlmSDbR+Lmcy3URxakbbYq/t7OYVJkG1LZixB4W3bTSwW6tV9IcwHjDyKoGDa7rBJgZvAAXi/aiUdU3/wngdZ0eCcWd6LGk6Jaa+TOG89a3xD5jFsM1TreLXshP1tnIS9PRedADllOGdQ3uHEu9ZHywQlSzf93hTxg3J41WyuEN1zOPy/hHhTZiT+HU8+wkmYP4CI2HDwrir6DZc44JjNaG6bwN9dj5ZRkx09Qrkoe8SWM7B1+MiQt7yTtIdlXTmiSN0+147OQisKK7cNy69gHqYIooj6aVu2GbITDAh78BfUqsH9HqPdsrcQQpvQWW2scdNSXAcCs4Fo8FubdzGjR1JU3Bn3FGGGRwT5kahhJXKpIvyuJR70yZg1R1/ad2Pkbw4x6265MXhItSOnJYJdqxVbnDGWQHl8vOBHLxVA3638QcsRFV0ksfiE/ZL+tLOojt/yCd2EJKVOK3c= X-MS-TrafficTypeDiagnostic: PR2PR03MB5322: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vlzF7MD8i3u+KrXO0MdcN59XXj00yFB4x5CNx8F0IuiCnyXANseXdYui7lLN0YP7VFH3fxwBh9o98RUn2ImubTup7pGlXudcmrDu48jJJUEk+m9p7I5+5cz/A1f28p6WvRCxL9iKaRQFS6s2kBa/+gHWYrlNOVKuV0Y5g7QK3GslQrCDOlbFc55ZnIxZ3V7n6ltYUSvbtgijFMr6qlFFhRRmUNIJE+wYLRf8bspE4yES6ySVmz6Js10r1dWtw7uVBkTFx4rW1ALePqYbVr2Gca6FK+EiPJVVgJucNkmGuOO7zBZ9lO3K70KyiDN/s9cAQKC9Koj2rSvGUnM2eSBhMOGnP8WgQ5vFQ9GYSb5jnrNmILnvzlYlBh3T2kVnTrM9B06gVLDn7pv/5DSkSx/0Vg3ZDzUg26h4eoOQXmkRFdjbsMQiGgOowEJcxOWgxyOR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: V9vBJlHV9tb2e8DUVLRPJyWDRxum2E3WzUUadcMqHYhVEKIP0iuCZbbh5QAgfTsTFaA44pM7OHjDMevvjmybg5HPw282svt8taNEEZmSsJt/u8NactY0C91QYwrYjV9gwBOXrc9mxOfMTVAxeXIXbg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38fadf34-b0e4-4db5-3034-08d9841919f7 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:49:19.6465 (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: PR2PR03MB5322 Subject: [FFmpeg-devel] [PATCH 094/218] avfilter/vf_vidstab(detect|transform): Deduplicate pixel formats 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: We6w4URRHXmc Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vidstabdetect.c | 11 +---------- libavfilter/vf_vidstabtransform.c | 11 +---------- libavfilter/vidstabutils.c | 8 ++++++++ libavfilter/vidstabutils.h | 2 ++ 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/libavfilter/vf_vidstabdetect.c b/libavfilter/vf_vidstabdetect.c index 278d0f15a6..19e9ca5a42 100644 --- a/libavfilter/vf_vidstabdetect.c +++ b/libavfilter/vf_vidstabdetect.c @@ -84,16 +84,7 @@ static av_cold void uninit(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { - // If you add something here also add it in vidstabutils.c - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, - AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUVA420P, - AV_PIX_FMT_YUV440P, AV_PIX_FMT_GRAY8, - AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGBA, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(ctx, pix_fmts); + return ff_set_common_formats_from_list(ctx, ff_vidstab_pix_fmts); } static int config_input(AVFilterLink *inlink) diff --git a/libavfilter/vf_vidstabtransform.c b/libavfilter/vf_vidstabtransform.c index 70fe552b59..338a5d4f8a 100644 --- a/libavfilter/vf_vidstabtransform.c +++ b/libavfilter/vf_vidstabtransform.c @@ -123,16 +123,7 @@ static av_cold void uninit(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { - // If you add something here also add it in vidstabutils.c - static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, - AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUVA420P, - AV_PIX_FMT_YUV440P, AV_PIX_FMT_GRAY8, - AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGBA, - AV_PIX_FMT_NONE - }; - - return ff_set_common_formats_from_list(ctx, pix_fmts); + return ff_set_common_formats_from_list(ctx, ff_vidstab_pix_fmts); } diff --git a/libavfilter/vidstabutils.c b/libavfilter/vidstabutils.c index 1199dbd56e..56fbdbdb87 100644 --- a/libavfilter/vidstabutils.c +++ b/libavfilter/vidstabutils.c @@ -20,6 +20,14 @@ #include "vidstabutils.h" +const enum AVPixelFormat ff_vidstab_pix_fmts[] = { + AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUVA420P, + AV_PIX_FMT_YUV440P, AV_PIX_FMT_GRAY8, + AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGBA, + AV_PIX_FMT_NONE +}; + /** convert AV's pixelformat to vid.stab pixelformat */ VSPixelFormat ff_av2vs_pixfmt(AVFilterContext *ctx, enum AVPixelFormat pf) { diff --git a/libavfilter/vidstabutils.h b/libavfilter/vidstabutils.h index c6d6cedb72..17e1668be6 100644 --- a/libavfilter/vidstabutils.h +++ b/libavfilter/vidstabutils.h @@ -25,6 +25,8 @@ #include "avfilter.h" +extern const enum AVPixelFormat ff_vidstab_pix_fmts[]; + /* Conversion routines between libav* and vid.stab */ /** From patchwork Thu Sep 30 13:40:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30780 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp701458iob; Thu, 30 Sep 2021 07:03:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6wlps9dTXwM1MAtGoTIzvN67pKaEplO57L4TKLTWfGPTDoMLU+z2oLn84jSa8Xh56LvNy X-Received: by 2002:a17:907:9908:: with SMTP id ka8mr7183699ejc.164.1633010584958; Thu, 30 Sep 2021 07:03:04 -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 e24si3300874ejl.487.2021.09.30.07.03.03; Thu, 30 Sep 2021 07:03:04 -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=EeapSUsP; 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 9337168A790; Thu, 30 Sep 2021 16:49:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2012.outbound.protection.outlook.com [40.92.90.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B639268AF96 for ; Thu, 30 Sep 2021 16:49:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZZjr3TvSGBiq5q5XvDy2kur08eLvXRJYap1j5nHTmiNMCqWkjzZBOg6//8jweynI5ZUac41ZnYH7Y1cNLGlwN8MaWYUqqV0Vb5+yvM20fLxflxNJ7F7S6NOuI7fjePv2KZ9+ThTJkl8Cy1I+2RiJkLxgxNGPD0T9RviWhdYsnUIk9oonMpjzOBUfulC3W1/YgMKIYY+sfIAqj+3SL8/Zq5Lr3iUvXw9oC7Y4mF8k4S9KTwUdNa2K9A2ZOkEvdhtUjd6gfgtUgo9bKSGyPA8Wv7oCTOmeeMqFwWFcfBqTsmNUnYb2kFjttAxRV0JluHV72k+cvP2+kEXK4IHCk9Cc+A== 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=zJWPzyEHPtzUNPb7RGHBXtHTEOQTbeMsFo4Pr561qCw=; b=XcDe7tXWF3dfucwEZFNSoTibPE6NmalcCKjBC5ta3aUmw0l6kge9MxeE5pqGF7ZiZtq/syyoujWfYNT6oTfPjoAbeKSw38MSPxOTNjrLqoDaQwh/arR93GdMroFmfwQYXNZYem4/AK8DIRXCw4164IyLu74AAEKykTIR/iu4OeD6YP/lZnD9iakDvpcepjrxbEcKTF5+dmxXH+tId59etuBbWQzaodBTNdl9z1bYcoTcGc7kUScqTPVPklrE/qUrx1ZG1ANq9NEcT3vJ+eHiPdsfLwvKxQMm2K1sz+HaePWTBDs9Kr51cagKhampaiLkSe2fp6GK76P+JZTEh10Ibg== 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=zJWPzyEHPtzUNPb7RGHBXtHTEOQTbeMsFo4Pr561qCw=; b=EeapSUsPaTJ6iDzzPGj0RxofVCAx/6UQ2M9UV5GOOBVLSGdfvT+IorhX+8hgFIzq7ZLNGp5FGm2Lhzpk7TwDMRydtJ/FDT4VBa7CS05aQuqVHmYumybpGLMDZTWgCVQPi0x+R3x7Q+E9MPIkNQzf4q3tdekNISZFFxnStJ041P0RGE6yZkUGRyLTFDGb3lyCNejz1cPohhKg4LVNKwikBj15ABzeLN4CvOzvDqI6cZYyancfS7kl7vzF5ZsjRcPTUGx9hlZpyP5k0+dLxhsuLZpwqvwN+g96GBiOXdSeugWNmK+It+92+RtE27irsuKoOXrSXFTp5kmvfnh0auxb6w== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5451.eurprd03.prod.outlook.com (2603:10a6:101:27::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:49:21 +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:49:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:36 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [DgzqrEhYudUyt0LjPhL4ggPbgkric07o] 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-94-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:49:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f863e88f-31ec-47eb-f0d0-08d984191b33 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbMn9bKw5PgbHdG7Tk9ZRzCuFuKym1IgGkhd6hOALJHCwbQSTTXykc2SnqZlEBhKaDTC8ca1+IXjv4yDaaUbAX3DORATJKkwg6zjmC7vq5xYCAL1qLWP0SC9rA1DrsWheJ+ygQvVvgXla0qtX8SwwGklIbU9ETWNycDEfkQqzgu8wD0xe+h7WTcoC+qvQwgVLsnyOx5OZI1Az2GXJQX7tYH7r6v50U75NJ5ZzTZfcOd3YgIXCeu8hq3C5SAMK0yeg0iLAr84jTORWTgeg8lV4tzZfABWh13QFzb8II9w6N0/aWotepGRWvUwy38Tr6VUpEqhlSe1rLLEv3mOS/Zq/qwFMU2PoNZVobfn/49c1FK9BdiE1Vd7PiJZLhM6ao6s0xJN4QnkH+jukBUc60sYDsJji750G4fGfnIM8eYrmhsdZeTXx8SiDiQoM5j9OJmerqb7AVC4GTRK20QuYb4ScQnu+T4GZiX8f4J6jQVT6AU17JT8REDmPNGKMkPupG2D6+NiwM2Kt67WXTd4nUDZg/WV6unYmgxYQFkeueOpwGXnjBxaTIo6g1HX7feNRzQAts/ZLew1NzLmAGNC4S33UsRiQaa6VsWaJCDKhLQbbyLtczQESpLI88WwHEU8jnQpNKCMExT/f+Ewbxe0ECHJIqg3JbWeH90ud8yzrbwzedv6kjkScKRflYwD+2tms/pZPfrTIXEE50U61yQaWT7G0uKeBvsFspc5ohc= X-MS-TrafficTypeDiagnostic: PR2PR03MB5451: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /YgrEXvkzwUzn9avnB1b/kNtC8SevATs7gvx/wfEbD2SsRh43kn88d64fYWRKTsKpkUjz4cW/b7FC4cgCcTpRAdFeS56NCXuWGSW3jbfuvD1s/TSElTLDPYBXpnAeUiMjbEH48cs2Q61rGSnGR2Jw6xUSWoop09oI1A20/YV0NxQuG8b7pKS6Kp/msIQuC41fo3Fb56ioyThZcgjkdA4MCf/sMwarvUSrE4X39HH4J9TqMCMRCJaZFdo1wgH9gfQOzjepoCrOtQh/fEZDRXJDxMy7IUjHRwnE5L1Xm+vG1wB1M+9vD4V8g8uCIQ6X8I7lSz0pop+EjPDcem2uUGup/BgW/F+0cXhwgAUgVIXb+MZlOCp8MQiU/S283Khqv0NVtk74IJOdUyNpODqSP/5VawtNHX8aioa6VQf0ld1MEhzXCiVmnLFTQpXotiV2DWI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9N3G1Z1ve/j5Yjl+zo3T/7GOl1hDW/OzFbJC6CpPgFmDaipWemMDdYFh/u0zh+27IEc+3SWpw/gRqo3CwqrV0pnsXc2K6fVPtTezDatgX3E4auPYOh3FNUHwpf6FU1ePhZEUs2zEZnNh1X+zrmkGqQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f863e88f-31ec-47eb-f0d0-08d984191b33 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:49:21.7363 (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: PR2PR03MB5451 Subject: [FFmpeg-devel] [PATCH 095/218] avfilter/vf_vidstabtransform: Use formats list instead of query func 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: u7dVG1GWQri9 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vidstabtransform.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/vf_vidstabtransform.c b/libavfilter/vf_vidstabtransform.c index 338a5d4f8a..4619e9b256 100644 --- a/libavfilter/vf_vidstabtransform.c +++ b/libavfilter/vf_vidstabtransform.c @@ -121,12 +121,6 @@ static av_cold void uninit(AVFilterContext *ctx) vsTransformationsCleanup(&tc->trans); } -static int query_formats(AVFilterContext *ctx) -{ - return ff_set_common_formats_from_list(ctx, ff_vidstab_pix_fmts); -} - - static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -304,6 +298,6 @@ const AVFilter ff_vf_vidstabtransform = { .uninit = uninit, FILTER_INPUTS(avfilter_vf_vidstabtransform_inputs), FILTER_OUTPUTS(avfilter_vf_vidstabtransform_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(ff_vidstab_pix_fmts), .priv_class = &vidstabtransform_class, }; From patchwork Thu Sep 30 13:40:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30784 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp701683iob; Thu, 30 Sep 2021 07:03:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRGgXE5GWJr2MzavXJkMBILqoU+pl8lRrj0UqJVWro2X/jURmaKx93z1SURWyqub2E0361 X-Received: by 2002:a17:906:401:: with SMTP id d1mr7119067eja.242.1633010598677; Thu, 30 Sep 2021 07:03:18 -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 zm3si4278616ejb.753.2021.09.30.07.03.18; Thu, 30 Sep 2021 07:03:18 -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=YYm2K4lp; 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 9106E68AFAA; Thu, 30 Sep 2021 16:49:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2026.outbound.protection.outlook.com [40.92.90.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C7F368AFA3 for ; Thu, 30 Sep 2021 16:49:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lmZBdSKJUCdbDXvzkWDX2aBHW2znvnTdzalnLwFC7f5JZyClaMiwiRH1RHMlS1HSmKoVIaQLBcXXWOn3tVS9HXbgVWpIklp+5aYw5PZPZFh8NY+1LwKPHKNFb/GXlNJzFIiu3WSfFzMWdXKfjNU6vhgLDyRZ/Sb+GnP46GUJ2imgcaFdW49J9cPseZejMfR97h6MLeH8XE2AJyVjUli7XMoD8QCq3M+D2Ak5QSchBcfJPFNyE9qbusPiLf4OenWyJaMc0Gh8X1/32LA6/veCBC0OE/rE0zxSLUP7AvXaU2FD4DM6tT2a/tkOVFiiOL1aM1GojWU22KIaGgZf/hfTew== 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=GBRZTGAUtbE3CipVsEk7mwLcOys1IA/O/g2aDFDJW/M=; b=PpjrESYaLkM9DbklZY4rvvBkvqxuyC/T+nkc4EsUqssRiUmNBZdM6RVYo2ylKvXaIyow/pfV6QJ7qmF0d9y0WxZL2mzRsQpkcOath/fq0AucOOP0TODf25kzzYbOi4mX7mZ/bIYCwCFuOASVY+laVEvsFTX8Bs0EpfQ4KsM9LXe+kfRiqCL7oxYPYDuW8M16C8i88+wYEPid1EhReYSHyKuxQ2aOMkoSZjg1xR/4TG0s3pegpvTf9dwXTMh7pfPfchZ+Vu5ElE/DMseGvIgtvAPxoBJ6C+8IB/im8LQcfGO9N5H/29kdwQPCc1XRWbSRr5gmcTthQpVbRGz+pdq1Xg== 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=GBRZTGAUtbE3CipVsEk7mwLcOys1IA/O/g2aDFDJW/M=; b=YYm2K4lpcCQDhUzk5X/xOQL4vUOGMlt8iHhwcwkIlF+Q/N42oaLIW4LwC1qtF8abSCesk96Dcx1PlXHZlMg0Xl647u+ftFTQnZe8rwwx0x7ClYpokMuSrdFtH6NXb3j5P9wA+6Lt2pqoAZKxWhHUSDL9vhtVxC1Yl6W1UTEbr7fVirk5HBXdx/669jclIm+4ci8btUYI29ljkcPVKwvsE9VyKzmXKb4zTMtwyLproDTJdSKZ97hY54DGp10TvQaWYhgnW1pXGlZFjIx+tuyIPWwLAr9mAIcMjptrBcrBMUrc8XDGWxoRsgV4iIan+KfeFxRMdVxwduZ4feBVtFORHQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6831.eurprd03.prod.outlook.com (2603:10a6:102:e6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:49:23 +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:49:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:37 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [NtkGuffr7l9dwtpCl2Tw7ODSSekZ+oEb] 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-95-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:49:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 261decdb-4c1b-445d-ccbd-08d984191c3d X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeRC8IpstjpwXKN+3fTD5FbTgKxrWHKGkd/Pe9F5vsboo0Cxx5udJqZdzNW86yCXUVLagEsbO6+F6OSle4ofyUQ6ryOgTSZPvI4JwIWYpXmLeSlKcv/wyTgiLsdildWXDctAzdcCyy88z++vl47JxokOQEZuZjEmw7ypkC70dKGSYuWFI7Bj0RPP60Fc2rQ2I097OwD0ntpklTw/AYVHMS7GNIW0wx45oWD+wDiWeKrrs+AwkidUqVahs3+mFfFb97FDytSjOd6QMtUZYgeTKs31vJub89SKIVhPgkK+oaVDmMDt4F/DeHuTmq9qIq28+118A49G0hBAB/Uk7LLXiHQLjgNadRM1EKJ0Fsh2AFdhYkjPowyIvf/A/amRuHRIBhGZiXLsIxgJqfd/v7g3PyzK52scdyWx3tWRgUdqCPq0V4m3XmCeiAAqU/i0EQL9ZfF+Y2HRIkmuGQE/K4qucvGBIcp61X0iJB/c7A+ziltTqxQBDV/Pwk9F95JpGoxuaD6k0qnPnNzAA9EUPuOd/4PZbetDLzvLJ8jV2GZD4gzYKWuTu9uu1McQ+wPSML+cR4f+KDQgLr9djA410P1nFN9BATcj0vlt67nqiC3lPymqFq34loZlAPGNl1aTNyL4rGvxpEDtu4oTAPppZAOkDmfm+TukvMcjbWg+1v4RKr7w6W3bk9m3B1gfrZ/OdwTOzXOBICWuLyKOE= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4w0+sytBYHEy5o2NoJYjZEolb+sNVXMProoHnHDe0lgFLnEh8lAf4XOkeUeHggXba9L/DJX+X6tVaivmmMXage8YUnxZLxeUyUijNDq966Tcpjyj6qcqq/AKn8f6naCVqYn+UN4Q5BBqRQmuYaEjM3yfM9UTnUBq7ljF16lFfGm3W0R4VlHnH0m4yQbJvwKLCNOrQfSdm38tIZJ/kJUPi/JefhrgGe8rsZPLzx0qAr9TGlH8pCBdFEqwhStH3SNAwkabGnqD9Ta+gSU/GZVWaFZ/V31lvIwse8Ov7Eb9WHLsu0Tcnn20EhuG3N/XAwa1Hbd0NMQG6cyeIrLZRu4VAHFgmKft47yj+RBzIavRDG49r0MxujrTPDc4sLKQTzoitgGIoP2deHulDzpcKHi0AKj3S3lbvi1OE3+m4ug6CwfaAdhBfPCxbOjXWIs/di7+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: coq5Y+xsW8GsEF5c+wJ+Fv8p7fJqczEpi0zE3ndpcLLdyWetN/naNgdJOpDZuWfg27e9hR7K+v+PxQvWflGUq3v4hpvZZfq6UoWSxAcEb+YSe8p7J+ZO39BtNCdAf9iOOXKyc62FP8D0ve3SA9QyEQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 261decdb-4c1b-445d-ccbd-08d984191c3d 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:49:23.4936 (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: PA4PR03MB6831 Subject: [FFmpeg-devel] [PATCH 096/218] avfilter/vf_vidstabdetect: 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: rtyqHHqPr2D/ Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vidstabdetect.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_vidstabdetect.c b/libavfilter/vf_vidstabdetect.c index 19e9ca5a42..05c95d0eeb 100644 --- a/libavfilter/vf_vidstabdetect.c +++ b/libavfilter/vf_vidstabdetect.c @@ -82,11 +82,6 @@ static av_cold void uninit(AVFilterContext *ctx) vsMotionDetectionCleanup(md); } -static int query_formats(AVFilterContext *ctx) -{ - return ff_set_common_formats_from_list(ctx, ff_vidstab_pix_fmts); -} - static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -203,6 +198,6 @@ const AVFilter ff_vf_vidstabdetect = { .uninit = uninit, FILTER_INPUTS(avfilter_vf_vidstabdetect_inputs), FILTER_OUTPUTS(avfilter_vf_vidstabdetect_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(ff_vidstab_pix_fmts), .priv_class = &vidstabdetect_class, }; From patchwork Thu Sep 30 13:40:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30775 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp701973iob; Thu, 30 Sep 2021 07:03:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw61lEdZNtuBYBOzPZYTgpEMt0AzFGn/qzS0f26aU6CzS+6PCkDmAPstlghIVcmNnjVcwlx X-Received: by 2002:a05:6402:142e:: with SMTP id c14mr7396737edx.121.1633010613378; Thu, 30 Sep 2021 07:03:33 -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 i19si5827078edc.236.2021.09.30.07.03.33; Thu, 30 Sep 2021 07:03:33 -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=ml8im1hk; 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 902CC68AFAB; Thu, 30 Sep 2021 16:49:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2063.outbound.protection.outlook.com [40.92.90.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0993668AFB5 for ; Thu, 30 Sep 2021 16:49:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c1D2RO8oWsJnv9yGdl8aJE35BXtJTNvzxO979SUxyl3AXnlPeNjXgpbQr+dcSsluap3BrqYgdqSYbqSEC61fFDLo5e3palXPAxbVk/Rvf9V7YUNYkCZ/2rsmfweahILFJmi0iRHjxiXbX21HIUPf2En9uD5GPzTgDrQMNxTguMUP69UVmZhFEFPUIe+jGHLGf34vWz9xiLvo8rIU62HYaIrawtgrMGvHxmWFMjhFuLUTbQ9bIPtB+TkdFGOZQ5S8F+7YjP5g6PCwG1O3xCCVyYCq/ouzzlvUdUcuBWdlbrN0krpKzswP/qHDfU5HraAwXNFV6Wc/3wpOPpdbMinwIw== 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=n9TsuVjFadkw/wRhQRYLEn9lHcok3k6Sow9l0XYMV/U=; b=RBaAU0HJUikc/j4xEpBqPeGDu6CNcZ/VDw4lO2ZI9e6mLL6n0e2GnOXqKrLNZ/oZn7aTRrMwo3+wm23hugTuqAiP24rnVlODTG5Aly2P/vEFQ+iAywdjlNwtIuZvRROFSr7qjeeTLuYSLnBkzST2VUaYXqNIfmAFkous7EHI8GZX+bTZ50dfpVKPncR8c5wsOvXbq1TxFtdjz+HI53c90lXBRW24+MH47FQdjkPO6AC/RbwX206CiPHmZlrWmmVz0R6VqXsCkSF1mkUr4wdtxMhG/2tjyH1Jp0ZJUW3Xqrd6qDRqqApU+9OMBAfkjLvAShlRQ9EEb+gG7WW0Rzwp3g== 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=n9TsuVjFadkw/wRhQRYLEn9lHcok3k6Sow9l0XYMV/U=; b=ml8im1hk3IV356BUh4YSpeIkSqGcRlD+ox0077bZmYgUY/5nWNl0Jvm3Bla7ipKhje93zjJA68bIIdRFN1G7ESl+O+kj/mhszLQ4a7RUx60ttGJRwUKofF1w/itr3331371e0xvyOQu71mBs//HPIrOLjzx6tvoCQek3ch6MLTOSEF/uKCQ059LEVUaX37c15KM7y5/Oc4WaVO0g055POA5mTbWrWUlyXiqxMKRsJ1YvwC17QfTVO8hIafybl1s5atnQvjqLGxKZ2/JnY3MAa3xOt8kemfa41H9dzhe64HmUXCCAGRG1OpeuwdmK8vQVrYd13IQq2T1Yy4VQXCxoNw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6831.eurprd03.prod.outlook.com (2603:10a6:102:e6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:49:30 +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:49:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [dNYMme3NPcmeS2sT2d/VUPJ3TP1SSlvf] 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-96-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:49:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 62835630-b66f-48b1-67cb-08d984192027 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lUSurEVqfuzr+I3JoLi9AyHUts2dULPlr7utgrHdIJws2/lSf6wX3BF0j5kCxLyzIak6L1H7lzdDCUR+xB5nKL5PEe7HO9wpddh8goeECNiFJXZ7ykDtp+RYF+vsZhfQOt6Ue5rjF0fPCDrepE2ztuOi6admAezgyNStdr/3v8IiUcYzMXkBGOKkZeemALwTAfkxC9qy9ICaVm7nHvvZOrlEDlaDweBp99xNMYv0rzcOkqaq5Tvk4ElJu8HLgyc4+FE8ONKo5DKQqgFLjDKAt4i8veYm7hjM0Y+OYbDDG9z8In2VxQdN5So7fvS3oQJA+DVwN4FiirHWNe2/TOOPZ3UUa8EAf89Zt63XnRn0txeUIEWJEWW5uWHKmlfjW8AzRSh2C6MKscYZBAN6Oz/u00RbACqqViXNzkTQVq8l6HmvzsQkwcwdHOZvWz3Hut+njGbqL/qq2CE98jm1hdKRKi/pDW7vKMzJlPrE7NuOGUsmnTg0R54/39lvZ+y+zV+869g46Smsv2s6Lr+RTBSPlbwdI1+Cpr1LHlyuYTWb/JMLoQnsvSC1x7exnTBLuwhgsM2QidQSwJKqJhOmkKDsTMPobDWHQIP+6Xjupnsg6PHDneo6PhLjO2hR6wXaev9l/+NC3Wc3Uh/bBMlL6p2F8OYW0vu3tIpGw/YXHei1+TwqX0HXe1zya9p0/TjM+tj4FtXskPvflJpxxn8WA9gt6l80Sr7qzei+EUQJdBlwZgIM= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dcUhVeCr6ls++kyU7I7UQCeGutKcpQDF1F82d75gBDVh3OPARw73H6Ea3PTecgjpDCyBMdXQoezKklfI1W69+5xcPAm6KkHvKM3Onr0U14APGGWb/CDblfyp/VhFJ/wyC3oly5C1NaDPh2FpfLqLhmPjMIwL1BldcxFe3eiDEse4vZQo30tqzDC932aJSeSxWzt/Bo8IvJud98+iC2TLeLD7XKh0lYVzPo6jUVgzkqgj3IfCC7xOgvOHztmpWfDsY8taCR7vHOQZwqaOefK+tb6Cz4Y9NZzzkNqvDjMTvv5M6uUGjt+RmD6CahmXLEw+RoCnfHLfDscrLhoKieLC0uzhQB4B5xEubG1uhvSCPhhDI5+4T2ry2gEr4L2SMv+hZAH6z5t7pBhrEG6XpjJiALRMzdTQYnbExj305BXzQOpJwm0E2T59svhPUWyEQL/s X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Z9wIBTAyp8dK48gTufng8N8eXeATN2cbOpVbE9HiNCI8Fxa2zVKSWpKIkV3JEA3hojsP9sCsNFMmRcJuFiHe+LcGP37VcqaOvxXS9A6xDjSI4vgMQHs62BkbO+8yuDTVLEqVLGkjEb5jLDFqxBpo/w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62835630-b66f-48b1-67cb-08d984192027 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:49:30.0208 (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: PA4PR03MB6831 Subject: [FFmpeg-devel] [PATCH 097/218] avfilter/vf_vaguedenoiser: 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: ho29N6cfiHrq Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vaguedenoiser.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavfilter/vf_vaguedenoiser.c b/libavfilter/vf_vaguedenoiser.c index cfb532ccb7..3442fcd9c1 100644 --- a/libavfilter/vf_vaguedenoiser.c +++ b/libavfilter/vf_vaguedenoiser.c @@ -105,8 +105,6 @@ static const float synthesis_high[9] = { -0.852698679009403f, 0.377402855612654f, 0.110624404418423f, -0.023849465019380f, -0.037828455506995f }; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16, @@ -132,8 +130,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} static int config_input(AVFilterLink *inlink) { @@ -614,6 +610,6 @@ const AVFilter ff_vf_vaguedenoiser = { .uninit = uninit, FILTER_INPUTS(vaguedenoiser_inputs), FILTER_OUTPUTS(vaguedenoiser_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; From patchwork Thu Sep 30 13:40:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30790 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp702232iob; Thu, 30 Sep 2021 07:03:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzH32GWLNDKLoDa1wNPgHDYdnw87CZ4j4tuDaLoq+FCgLIQLHi1lt504zX1oLWMXK7aoiBG X-Received: by 2002:ac2:4896:: with SMTP id x22mr6325621lfc.257.1633010628765; Thu, 30 Sep 2021 07:03:48 -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 a19si3322826eds.10.2021.09.30.07.03.48; Thu, 30 Sep 2021 07:03:48 -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=S79ElC3N; 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 B36C968AAA6; Thu, 30 Sep 2021 16:49:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2029.outbound.protection.outlook.com [40.92.90.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D723568AFAD for ; Thu, 30 Sep 2021 16:49:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SNIgXB4zFJnPt69dBgsCocNSOJZ5Aldr87DnukRtNjXOjXo3fGQvi0r77hkHmBCvWJJXzTLM0H76AadHZ1+YotfbJTTGl4td9sE8whI4ajmMGjvNqHAbYjhTNQTlVy5Qr+fVlmkYkt/KDqEapM6EVcTjbvOhVcrm+9DMAqjQpq07cwnOlymZBVs9BffnBAMaQHDY2jflwLdU3fFirgyzKfn+sOzb/9gATzK0n21bZ41ptEIZx7WnJM3tC3rkIEhmkUS3dEAAUlsRv7jGK/ubEYYYLQVKRgjyYvI/LeC4dwnM9qJwY62mhZkokXiZnhqFPjwmuvg4YCA6LG9o5EZC3g== 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=NMdNSoyvvR49OUTTLBilPKS1wSQZyqptZCZrgrtHnpw=; b=aAWcJntUrV2pQ8tJeLlXC3vpagylv6aN07pE4ufLp6muO4xW7FEC1FPBDu1Dbl2PkwyVVbRdfcoWany8wBmT8o/4Maxwr4uNXPvLHirNMXD6mC65uev05SRxIjYYj+14gYZGDk5phj82QKpDfIBFeeHtEbx3PBpxh8/g6tBznGO+Q2oM6WvYXkL0ysMyzvGEbll3MlV9sL4HbrMz6AME6YWhhvfBflBN8f8oUIHM0Tg712MQiqR6coMLBZ0vdR2Ja15NAiP+SObEGSGNgQ4qwTFSY4UzujHdQCl+1h9x8L35+Omm931mDBglxrI5SioQpPKghfVX7aUsNbJzo2ULVw== 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=NMdNSoyvvR49OUTTLBilPKS1wSQZyqptZCZrgrtHnpw=; b=S79ElC3NG8SMCocPr3PJ7s695NYH62v1wklE+65Z5rX0tsGZHowktd1Y10D7v65jnHCnmNCeUCheAp+qHY6YMAtdp/UaEwzHB3TQ/8nkiFCGZrNNiCFP+Ve8B9XBxalOpi3Y4N+DuET6Fi/fi0h38fEs2FhqFkKvRgVbs+eibmhVDTLf7z1f43eGkkRbz7lzkDjvjXigB24j3NGDqfatgYDircjYZGbUDtMDR4WTiVeP9XMQWU1vXQ4wIFwd0FiOooJ8w18xxAYgVcY8S/0PdEbLnl3vjxihgUeq6LcniejYckgTzezavzoQW5Ou/Y/OazQqx6E3WhGKqwnh3GsAxA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6831.eurprd03.prod.outlook.com (2603:10a6:102:e6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:49:32 +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:49:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:39 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [zvouhTkGAAGcw2wAmVl+QF7hltjrxEmp] 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-97-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:49:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea7b5acd-105a-4749-d4fc-08d9841921d8 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOzptFBBX5ROyARXT9cwDCtUsYfOv3fljYAq9YU1hUjVOwiAWtU8BOuyDwMPPCp5TUI2sfXoMfkuzY6w0UEGzkt88J9BRaqqnEkPhi4//9GHRNv2ThwEjhhjBGrBmD1XzFdoPSqFk69/Ij7QTONtavviw+UA2MFtJnitGGc25Scv0xRn3oF9QIXBoip1pZC2Zom5wWVRK8IZAYWjH29z8Li8jRJGN8R1D4j9inyPFBV4eYNcc3bimzP/lkCZcZ5emnQxFhZOiH0BohEU8eUFdMqBJbvdrmw0fZeSMMnozdo3S19ZM3cmeTRi4YEUlP1BedajxpTg4sqKDfre+MfcbtT07wozaJo3ABom/gWrLRpGWbI9ZD6JU7opWqd4FUTwYl4v0Mn1PQ6p88y2jUzCu7WRSoA9Rg1FI7mwR5ou1vo49REobqgSq+avjUh79hytki1yg/AwbWde+ELFh1a0Kt9POiP1r2aJvPljs7+atA9LjD4ymATnc6e47eufOUJylVzskfM8oDl6EdXuCjHEd+yfVAVl4320+mat/7sNrjABvs0hvx26RCD69+k+nvj0V9nCVtOJuWNs9pIpNUkQTJ2wy6RpjyRcMW2fn+EpPClmyOaZJccWJoycfIZ5sCZw3BwzAXVjMbbDIpc3C8dW7M9i5ug61tv74SSXGXLAX1Z9zpkCARyN+ByxW0EjHICe1FEFMM/nSC8LsJDBUTAOIBMCxbMi0pZbSI= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v6NzcNMTOmbb+vejLOIyxcb/EtNOcYAtIor5nAgNeA8fkL/ETvw5rYzqmtvF88qN/wz5oLIdOClE7sHlx7UhsRh+n2E2pjgWG0sOhP732kNPHA9uiGUnpqsVi90eYGHZ2pleaw0con3e41QuKQlK+pgcMTl6rY93PN9rng2jF+4cTK3j4Lg2xtgyTxFEhhalhPZLs32jwX8Oz4LG9QjHYCKVhpcEDN01z0ugz/hCm7vzABUfIEEgduT4YRWXMwdCgz75ZkIRvR+yYjofSZ7LeRPKlgZs/S48NHpNXcx2bHhih2qdAXiMvDOD5qRpnBGLEDq88QnznhXQOz4lyfmLkMj2FUFOpg318MEOZlTpUc5fIEtKlH2c2KEdKgXunRskKT03fTKs9o8ewfQDoZJt7Q/hYqjPm3tSaGLODugnxSKDDf00tacNdK60Thnpbvbl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cH2cgY63Tj0GjunrYQJQnY2yGcFFJ+2bGZKijmLijaGKnd6qkIb9h4One6qZSCjwuXhoFVfCBGjSneapPJGY9jM8m6chtdNLw43RFiRYqrD7959BPNORH8cgV5+927Tvk8/ahtVSMaZOEWHjaCst5g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea7b5acd-105a-4749-d4fc-08d9841921d8 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:49:32.8713 (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: PA4PR03MB6831 Subject: [FFmpeg-devel] [PATCH 098/218] avfilter/vf_uspp: 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: eAmLeisPZJyU Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_uspp.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index d9022b1053..c307ead7d7 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -293,8 +293,6 @@ static void filter(USPPContext *p, uint8_t *dst[3], uint8_t *src[3], } } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV420P, @@ -305,9 +303,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_input(AVFilterLink *inlink) { @@ -496,7 +491,7 @@ const AVFilter ff_vf_uspp = { .uninit = uninit, FILTER_INPUTS(uspp_inputs), FILTER_OUTPUTS(uspp_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &uspp_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; From patchwork Thu Sep 30 13:40:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30768 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp702512iob; Thu, 30 Sep 2021 07:04:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1dacaOe3xobN7CBNs+DeAIPENnmnCAzSaASDoW/8K6f2d7DtqfwmTlaKuV9C0sczppScn X-Received: by 2002:a50:da8d:: with SMTP id q13mr7606172edj.198.1633010643866; Thu, 30 Sep 2021 07:04:03 -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 kq18si3981609ejb.533.2021.09.30.07.04.03; Thu, 30 Sep 2021 07:04:03 -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="J/l7L5hP"; 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 C3B55680979; Thu, 30 Sep 2021 16:49:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066048.outbound.protection.outlook.com [40.92.66.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B76068AF29 for ; Thu, 30 Sep 2021 16:49:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CDcnNm6tqHhH1vbRQ8zvEawwYoiS6BaWMDnPB5PFD/u5B8eqxQxyt7AKHU6Y7tw37fx6a1vyCekbFTtsilg9pGReUueMNT0kgBF/HR28zoKeLh5wpAbMEcTAC62YXDtZT7EDHpOqL61JCmUQc2vkNyWXNaToV2tXxKif5IMZIkDnartPSVpLScUIWX7cOBTE+Ubkk7Y8+uHNdLeP4M1LKMBVirBNrcG/zgflnifd+huZ3IiWKUQk+ArwrtFW1HPzFGhJ2+tcmYkV/rvUaJZOFACE3r1lmt9xMdPcvlUTuYE8C3dCq1pEIkqVNtL6LbGDN0eZTSxbN5CITY7+wzSU9w== 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=hBXPek0yOO30HwpHGFMt/zeMx41OyZAj3rbYQvO0NQg=; b=OtCeCbxhrajp1tqWR5MMrGPfjHlc5mmsl65ueK9e1h3waj+o+l+QafdDgBziPUpHiEIOf00MqeQSY6BUidGTxagFFCZfObRhm25GGED15ye5yaf8blsy60OLjGsnOYwIu3t4IUEGH+ng+QLwkqppjAtCd7PMkzt2pv+sFyqtILv065/tAv7vSCX7BqLg3ej6PVQ02Zalq7wID2VPiWqRgRuKWBmvoYSqGGm/jj/XtfbK0tC3OlHAoBvztvzddRiuaxlUeSqoMF4KbanPMQTcCQeAZ4MJrXe6fJl+D0bjdMdhULpVPFrxyn+ZajUQI6vBWJHY/UE4u7PTW9LzvKI4Eg== 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=hBXPek0yOO30HwpHGFMt/zeMx41OyZAj3rbYQvO0NQg=; b=J/l7L5hPdJpXUTYuQ7pxILDzamdRU64CphjQ2IDZ+YjIa/PPoxfjTudwg71CHEjcgSAtPYLll4q/ViJveR1RethoFNGv4f2vRYpNlvnn7MbuEdj5bAyI2/jidmdz5phbVIAoQ1yW4KrvCanfkHfwGZIjIk0BH/NTRD1Y1u7U5nmd2ZDO7XTzbxjQYdw13JGJS1EDze2HSs5ZC7D+V8+twKAVlp8BDUw4Ob3B3rlaJiGHDagmaBJ2SZjwW3wkBpyGYRJ+VGilzBJgbHOplIAlOLkd6DRkIotyJ7MzCGbOcbAHWu7G0ui5KQn+mjv9x/EOzIC9iINUp6cJ0h7sJsTyIw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6831.eurprd03.prod.outlook.com (2603:10a6:102:e6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:49:35 +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:49:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:40 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [VmQ9lXzm0W/qENkXgs7uIH2tLPr9QEwL] 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-98-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:49:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6f2bc4b6-cdc1-48f5-a117-08d984192348 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbMn9bKw5PgbHeM2d6Pmp6D/VTxkEq7gjBlrq946QuFgcvV3vOxVnuMVsjYsPcztT6ghEDrsoOkObf74xTwrRnh/GSTV3l7YLjImkXiN70kh1N8GC+QQoVZwSKYL2zKzIo2R+QOignoGtGF1MMLWV8j2F8VTYOJLXrh3/BBwvP9OOsmrgbyJiBFMGVnaZRcG1uZw/99D6u4OIueZwtIoz18no77iLZs/duBU/axO9NeVEDyKNTzK5TrnRw/O0LkhxcI4s7APeISQXQQxM5W7tsjtVkEFOjfLpgW8PpVw6HS0FYaY5CGa+6tjNtHc9u9Yt80w6sDjCTyAgRB4VP8pP5aj617qBhpm06Kmwz7hJeezZAIMMnUGEFHI/MmBw90ey/wIlCFSKi5yaDc1pq0RckUVlGkbuSd+p20+QsKiNtbSATFhF2po4fqVoEnZsO30eSxvgoy/R2Y9LmoQkiE7POwD9LCtuBcTwU9bvjL0RKLodPv5NLf4tk+lC33Klu6wcCPJKaYpeCmPs1IXhIl34hQjoiUfUqbyUIqVci3i+1WBeJTAw+PCPSe2flTHRoLxHHmtxuUAdB3UNoCCseezuB0pwERoFs2Qd3Vg8vjnlo+Bb5Ijvx2X/B0jEfoN4iKXtBxcdYPiS1UAF0tXp4mqjFpm8fAb3QCT7LQkbjXBP+p53rii8tIY9ORWjMhIUjT6rTKJdnmacRhYW2T4kf8H91wWbHNvlf6qXuk= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DEelBsNqQ8Wlp7jYCOtJZmHecMokTpuClJaAxBERDwO+eo7g3UDY4p+eTS3Yg8P72cvKOeqiJJ+cAvBX59LJRQ21BwIggm0P9f4phTrkwd4YjIfvlV1257l/3V3H0tFYarBDEq+LYKbZpkvpVNF4QOBpNoRnG9br1JoWgbuhNkbqy/h2Y1ttZU3re/GYC8eqBbCl8GuBNPspnqC0hRyRWJjXcwUMOJHL5x2kyQvpP0HTKsF8vKMWePFNHl+qEJCN4IsqrQPibkxKsEFQFSOpoOtSAVoE8HPLmKNEhAQYzRWPxkYSngkFjDSQGjjTMzoh+fzLKNSYnv0HPGE0UK1ipRk+Ke1LDqWIhJXNT0M42LuqTUNvGGHxCQdYtWzN/R/IDOVKF+mXNNlsbutC+a+CbEM0J4CvltxO4z4dj39yUVvWllnN8F4L80AEFSWSRA54 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7XNuHZvX2l18MfBOJCb2qMnInVubNTj/jsr4qmFlCpoNJ++7Pk9uQZM69fHtl+vrR2avsxms2HzGERyLGdRsv5Z7pIEGdMbvbvIyZJ4WGrN6yXc0YUXHam0z9oYqamYpmI1RCgU51zoTT8N8BkfMjw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f2bc4b6-cdc1-48f5-a117-08d984192348 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:49:35.2827 (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: PA4PR03MB6831 Subject: [FFmpeg-devel] [PATCH 099/218] avfilter/vf_unsharp: 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: HvQ+wR05WGJ0 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_unsharp.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c index 85182910f6..ea230a4508 100644 --- a/libavfilter/vf_unsharp.c +++ b/libavfilter/vf_unsharp.c @@ -197,8 +197,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, @@ -209,9 +207,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int init_filter_param(AVFilterContext *ctx, UnsharpFilterParam *fp, const char *effect_type, int width) { int z; @@ -361,6 +356,6 @@ const AVFilter ff_vf_unsharp = { .uninit = uninit, FILTER_INPUTS(avfilter_vf_unsharp_inputs), FILTER_OUTPUTS(avfilter_vf_unsharp_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:40:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30769 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp702785iob; Thu, 30 Sep 2021 07:04:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJKAP7IeLJIuCGyKmQYdj8SbsSyaItAd777SjdYxGbZjggRGQntxK55s4pP6r0pejgmz5f X-Received: by 2002:a05:6512:3b0f:: with SMTP id f15mr6078431lfv.67.1633010659742; Thu, 30 Sep 2021 07:04:19 -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 j9si4120390edw.598.2021.09.30.07.04.19; Thu, 30 Sep 2021 07:04:19 -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=lpjzzIkR; 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 01EE768AFD4; Thu, 30 Sep 2021 16:49:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2070.outbound.protection.outlook.com [40.92.90.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0500A68AAB1 for ; Thu, 30 Sep 2021 16:49:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qmu4Y1luPeVm0OJWJEMoQPsCGXykB/sYTBgwSMih1hYLmCPXgUOqP2m6Z+FELR24CMZjr9kLaeKoqNxW4DtJ0cXn/fKTHJAGVNDlZQLexFGu/X0xk5hcrawc0eXEfhSWOSdPB557uys8ADJQJVPhKXISVpQxxi2nrex1CvSNx1ZEtouLPBLDA+Or2nq/+fbmlwFxZs8kWkOCMmlTXKrEGx6/YMHyms4QVDEYv3rI2cfDVo5SJ5gFOSgpL0N0w+DxJZ+Hkd/JkWNWfq1WDyTbNY4TKOJzgI8k5DG3j0Pf2VOOZMBRVNQkfCf+mRCSpbxv8UeFhx4z05kSkjmUmUD8tg== 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=LxYaY7ka90LxQ4qtutVrMJM7o3NumKK8N2WX1m+1WHE=; b=nNcUVJNBIU7Br9e/RZ3CF81z4lPx3FwrRTLse5hzWPtvDOcBQdQxzxJX8mMy4lvd7J5AqO5mdSZCuke8uWrD0G7ArPDrgADvdbWu48pFd7WRPWTBB3f39tXP1ccAv3PexjW6F4VYftydMVrGsTXiEOv18sai6YOHXclicM4tMI8oyEIgUA3bQxe/FNZrMjNQHBC6HVTa6KJ43eJSiOtOyGlyepvVoDaAaWPmWk0etQ+TKHnMpNEVljtTO3NdeQtgUkZvpMaKktiIPzrY+bDaMhIOqGJdQs4kHxRBAWgwMi3K6FdahZGolXwSiJjuFFL2D7pTEvFXbDw1seDVlnJXqA== 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=LxYaY7ka90LxQ4qtutVrMJM7o3NumKK8N2WX1m+1WHE=; b=lpjzzIkRITxsoHnKJaeDAiDS4BYB+2g0efnrRbSfXeZgQCZYXviWZkGqmHTKRla3VLPy0bVz6F3nAHP7q959yUJRY1DCMYFXpSyMZ2K2IGZA5+svVveBr8ugAvWrVqeLVP2yeKw8Q/4aNAwScUdHFVpwHZ4p1b+K72yXCiyQGLsgCmrIjAxefrEVSBu+c3UdXHP4y8leNsSzlnnO9lDHxDF77J6IPB5QkPc0jzAQ9iaZuruXdnRlhpULeNuLU3fLh54bzxBU5THyZrMF0JTc+lnFGxmn33UffztF2yI698Mdf3lxKpUp3ZLTdaClQyZwZ70DNiYrfjgJbLST25FBTQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6831.eurprd03.prod.outlook.com (2603:10a6:102:e6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:49: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:49:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [H3KBwwzKWImPVLHgMyjtc36W88PU73e8] 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-99-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:49:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 37733eda-bf35-4172-2506-08d984192d4a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lUSurEVqfuzr+I3JoLi9AyFgMZ+pT6LKU53y57hgGDlGVHZAM2hpMdg7shi/hCiWeWzXJuAWqyfmnAySJlJ1nqnGP66D97Mqr1JuuIZRYXmB+dms2V/QYCFiyH62wp0gSd86HVMqmTKvNaUyWaUr1fxq8bRf6TcWA3rOZ3B6fHSlL/PMQo9u9Q8EiQt+yWtbmGL6GzuMMzfYYGx1sD4GQVuyu1D2Gxr2Ww40uAEmQwmMan5j/jgccvPv/mvLZBebPsmKhjRt5XeR+0Ghydr5bEbFvMNbyFMo6MrKWkZfuvGjUXCc/4wI48zvMFSJHrg3mK48vl9vkUr1fKVXNwhkSqydOsBwx9e9jtca9P3NbVI/siChwp2VNV32+kZHV/UTGa98TFC4/pw7c+qBhbcYaBDVpFkhPuh0+0S7PVBl/hqX3xPS4I4RO9hC5aTzjRhy0OW4wgU0Rouo7BbXDwg+SdZp2IRJUV2UPLxP8XctMdFxEbDU0lWBxUPOB2T7xKjrfSjR5o61nOK7c2XVQg6YMbHnfCdig2CL9Mj1Fw2Ybj8aiLgNuCRH1xs3vglRiomjKFgK5pM3S1FoG+V0+1d78bb/j71eFY05Em4c4Gq2J/jgtROkQXV3TPZGAUtFWbAXZEnKf7p+DaUnIDicK9NTPxBj2PD5rQHaTUeh+qgKyDD7vGTZZY9GAWKyoHV5NyvEah6eZMwpz1UIRNOP3O7c6JyK+IqDk+qtV3T7G5gd7p1Q= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: epDjSmoq5xtbKLkRxCQr8II8lgJiHTlehxgSavaJexe78eOmbwz4QdM8qrLnJIwcZkVUvEfzIarWACakjYKmnbzpWhDgpKo4ANMv8cU/A2petj2Kxaen1CK560ACzfVs1uYsYgLjE3L5np0/ucxJUpcgXTtIWFyZmp4Fz8x2HXYSlp4iKTlMBprl00IdMjoQTjJ5Tf5nHWJ0Sw8WP/wACMjBIOBhHr2dLi9b2hmQuqq9hDHjd1/dCAd/FePxsACGRWjbImg/4QDZKHy4VRevfsX4Wg3OCP3mo2TmDinQsu/QNYsKYBoSag4UPaus/IWHF1cSzJIKBN2o7ac1D3qGQ8JGzWcHFqCbSjtAt161gYQb/xsdZ3K0lpWqb2jmezb6uSs7uP2jE2EEaIsR3ohcVhf+BkgBN6eC1QJit3XUZDP8as0jwpqUgnZmDQzFIbGw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ulDMnoAauic+02W+HKruqfWfIgQ7CbSuSTS7tear+EsbsPY1zbgzTVG5K5H172fu7J+22+SIX9hq231wzHIpjaSrsksAmIlASZclCczAjw0BXK8AADvMdPly97T/JglgV/3fnB8qraeUgGarOIm3uA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37733eda-bf35-4172-2506-08d984192d4a 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:49:52.0479 (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: PA4PR03MB6831 Subject: [FFmpeg-devel] [PATCH 100/218] avfilter/vf_tmidequalizer: 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: jVGwpQzbGulR Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_tmidequalizer.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_tmidequalizer.c b/libavfilter/vf_tmidequalizer.c index 96b12f11a7..a51b88cbae 100644 --- a/libavfilter/vf_tmidequalizer.c +++ b/libavfilter/vf_tmidequalizer.c @@ -67,8 +67,6 @@ static const AVOption tmidequalizer_options[] = { AVFILTER_DEFINE_CLASS(tmidequalizer); -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, @@ -93,9 +91,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static void compute_contrast_function(const float *const histograms[256], const float *const kernel, int nb_frames, int radius, int hsize, @@ -432,7 +427,7 @@ const AVFilter ff_vf_tmidequalizer = { .uninit = uninit, FILTER_INPUTS(tmidequalizer_inputs), FILTER_OUTPUTS(tmidequalizer_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &tmidequalizer_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; From patchwork Thu Sep 30 13:40:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30765 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp703090iob; Thu, 30 Sep 2021 07:04:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWBL5BUy9cic/2RbOb9swqDXC3Qwf6khLysj2vxa+NY1t3DZDIRFRnZohhDuRM8VsvAXje X-Received: by 2002:a05:6512:2184:: with SMTP id b4mr6076753lft.288.1633010673893; Thu, 30 Sep 2021 07:04:33 -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 z3si3270417ede.156.2021.09.30.07.04.33; Thu, 30 Sep 2021 07:04:33 -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=ii2dEwDq; 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 1C58968AFE0; Thu, 30 Sep 2021 16:50:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075092.outbound.protection.outlook.com [40.92.75.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 614D768A8B9 for ; Thu, 30 Sep 2021 16:50:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EomqlqEQp7v+WTjC5hqfIjcviFPF/Gbf6gmH1ShJeHFUUDYqJkS10ZZKf1ifWW/eyuoDZ5NfNJDEUdrAwinmC9XTC4A/71FseTuhiNl6Mk2X92UMwG+aM0oSaZz+8zFY0rbdrz3BLBaXQCwwBIWqbGh0krW79hdZEJaTEzdeZYmi0kcWOvzXQ+4tb5/W6+KXibtKHLKOS/YDfzGxRsWUiBTOfc/6cMZ8Gf8doPiZhvoN5JLtJP82mtG8mTK+ZZKktfEAM/c7F9Rekc8+xCqVUDB9dp+XsThguTr7p1sH3OWWXrorymAL/W0aO6E5CY00N260dn16+RjmcxY613kV7A== 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=jI2te5psOf8TqOEsJt9/xELdUNGtVRJb1aEMGCqYfsY=; b=ZDfXdBpAMDHGij9ckMZYjwdKoJpzagmiX6zn8DC8FfBND4b186k/gB6NguUvsv2dwMaHi3STNh1uhQvHsT4nhHqiunykOgm9PjKS+UeJZKKnKFHwtqSSe6LSg83kh7bBLLdZToz4CVHnF31cI3d0t5NqF9EKthSxKLlD+531aB3tPmVL0350kVfegya9mg5yVfJojn/oyGAWgT1s0DhoGFmmJihrFrPFOYVii4u9lgGKIrZ65SN/T0FY0Gs2uFSuJlWADn2sPQPemjWp3giGzqZ7qQjZ4pcjjxDALfMC2K5tftRrgXSAw+j+hSoTgRwqgD81t0vuheRNkSTxEqKM8A== 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=jI2te5psOf8TqOEsJt9/xELdUNGtVRJb1aEMGCqYfsY=; b=ii2dEwDqWsj+HkARV0NRsexiyTwpE0cT/J38RewMEh9EaVVxVNedXUOFXqa3f007317zmIAkL74Qfr02wNE0QFLFe15ALPzX3tMXT4p19zpQnW0MiuyXyzdL3zXQpkovxNxnNd/9yoyRVM6dwQOLNQ4PtoguN3nge+IHk3MnRFXTQerN+BXP9SQxqitm4pX7/PjA+SO4Wyx9TROyAwst3UoIAe8UrW5zoWqkfrVP40Z7akNOPAPlBCn8dHl4ckY3YRNvaj7dQt+UpygXITLgqgguoQLf6/fIq3ktorG1H1/13P+49Jc8Uk5GQOuFHNzpcVbcFe6gO4w/aFdfGBepQw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5451.eurprd03.prod.outlook.com (2603:10a6:101:27::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:50:13 +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:50:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:42 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [9ITzoqdyL+8nygImxcd93oJCI+xzam5V] 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-100-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:50:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3f3ea523-a497-4394-1a24-08d984193a2b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbME1BhkaaQ+LE1kgMsfN2GYrltqgizIoqaE5I5Rx+WFOnVsUTUXsQtyfWNL6j4tjR0t9tAjtiwqN7fM9e4EfejXH+1kbaghK7+U2jQinOUfOBJwMeZHPbIgn8jnZtFnARBS0wKuX0U0I9EIdYIyVUc9jkghR+Kz3EemPB+1fsBZt1FJ09hUAYCotruAGWfxYNhXGkwPc9EUG2Q031F5AUS0qX3Bs2IBLPOuD7JmymUWxAmfjDT1P0Fx1WtWbzW8H4o+V1ZxqK9u7k/9cH0FVHtEpUK7LgmZ1EfVEU7FILOEn6x/nANGoLQymZipMkoAyq0/aHrbTyvhjjrbSIADr0M7uPcIGCr6miwcWfX5SyiJK/EM320yAYy3+TYSwXFOQ2mlk/D3UI/Tlt5N2j05X4pnHY5VZw3gNZvDEhq+tMBrprdQFC691/hUHPrSiYB7YSKRm8mW8CbuqFlzRHJiUKoplj/S5rfM9aZXJD2YXQNiaxMdGehGwgFFMRjnPRtbBPn+R45jBD9KEwKpCBcqkViJSWPP8dKCALTosDQLr3IJOKyW3quNGGnVol5zqYVyNU2sdt+Z+1fYJE7OkP46R/0XIwpASzOu/KabvoAWSsxc4hpvqaB6L9kTZpKesIkIKyE5Be/RU3ole3TnI39FRbWNTuwnli+V9t1IQuQPItXeFrER8ydvbL66qGIjZrWtXSZ11e2oEsiy1NTn90INijU4HcsiCv9YrXU= X-MS-TrafficTypeDiagnostic: PR2PR03MB5451: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m4d93VMoF760YZ9LyzvjzzIe2fS/6t9ABSJv1uPA1epj0KdZuT+LPNvYbUclW99xv7ZdvZO8UXlvBAskpBvgbp6OvXbMLv4uXG6Vsro+Xs6mgJEvMBFxMB0zg1f+bMyA0tS5M5lN7flh1gBwrM+pOZm1BR4bGR6viQhIM/opjAfysLJHwYahmq/um9d1TnQF/xog4dS622fB4lqtkbnoB19xYZ7eJveP09pFBtR00+t9YiGLs/Tl/39Ht0FM2J5bhou7k0IIW69Lk8NXJqSBnPjk8NzkZxhwEGML2kwKuYXbHuYbHjf15iiwPlt/hsO4sOiPsuVu4XN/gOI1/E96AeEDxv+vHsGFmRMhz55CA8ht+upj6H09+fG/TViP2aUWFSCIm4mpE1My1CqaakWyyrVdQnmQ/zHgb3NL9mKY9s2DXlTHivH/LBUwGZ5LtDK9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dl3KeUKdxxzGS4sYZkIdBduXymiE6e9XiyAarve/ESKxj8RXvE+E8amu5RL5fUA9dZazJVuIiALoF644uO0xCosA/FELtq8QXDrEwzV6argaIHovLaZxug+VPPRhKJmmxD0IMaqgXJA8BrRfl3niCA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f3ea523-a497-4394-1a24-08d984193a2b 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:50:13.6778 (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: PR2PR03MB5451 Subject: [FFmpeg-devel] [PATCH 101/218] avfilter/vf_tinterlace: 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: GtPfZZ+vPWQB Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_tinterlace.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index 91626192e0..d458e32d8b 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -87,8 +87,6 @@ static const AVRational standard_tbs[] = { {1001, 30000}, }; -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, @@ -103,9 +101,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static void lowpass_line_c(uint8_t *dstp, ptrdiff_t width, const uint8_t *srcp, ptrdiff_t mref, ptrdiff_t pref, int clip_max) { @@ -557,7 +552,7 @@ const AVFilter ff_vf_tinterlace = { .uninit = uninit, FILTER_INPUTS(tinterlace_inputs), FILTER_OUTPUTS(tinterlace_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &tinterlace_class, }; @@ -570,6 +565,6 @@ const AVFilter ff_vf_interlace = { .uninit = uninit, FILTER_INPUTS(tinterlace_inputs), FILTER_OUTPUTS(tinterlace_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &interlace_class, }; From patchwork Thu Sep 30 13:40:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30779 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp703297iob; Thu, 30 Sep 2021 07:04:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyg+5JYiSxq+hF5P+Dk4BOxmMJotE7NZYEvhbNNH8+CcEyzvx8wLbdtfqZpABfQRY2K4GJO X-Received: by 2002:a50:d8c7:: with SMTP id y7mr7430191edj.133.1633010686571; Thu, 30 Sep 2021 07:04:46 -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 e2si5240979ejs.346.2021.09.30.07.04.46; Thu, 30 Sep 2021 07:04:46 -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=B9xNf6d+; 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 232A268AFED; Thu, 30 Sep 2021 16:50:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2107.outbound.protection.outlook.com [40.92.90.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC4AE68AFE7 for ; Thu, 30 Sep 2021 16:50:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iCLkbbLGeQQjXg+bAOl2GP5+4P41rL0XZOCPdwIGhTbeSb2iqsI8+VuL7/OA4wbiuFwBjUsOnxDDRJf2XYUXEBijfJlVo/JJoX95nNjoPzVTr3kFgGjzealCX7iL0W94BWKzczekhwkQWgtog4cJlypzWEX8WqBVREuDzHcbOfm4A62K6ueEXArj9+wZGW3P8JVC0rqr8DXnI7rmM9uDNnvJW5vlQ/azU5ky2wyHI5fVBMzFUCaRcHexuKrZDN8kdZpgjoO713ylXXKaSZCw/kvShTMXTkJ5QvLxjI7XR2kgHRkAcQRBMAPNeW6eo/Hw5vDPPgivZDAZUumfbUm7Wg== 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=P5aD4UrjX9RrscAOXejm84ccGNKFEYD+NzqqB1vi9Ao=; b=HnlsRyVmao9tP7UQdlbhCNSsMbiYfe/3jlk5OAtvZgBI2KbzZGzwYkvdwk8JgNOefCmJ/4fl8zOBdAX8yeBoG8n1q7vxAyx4QWsn54+chLVR81glzQRGWMaSLYUVNc9zE7GhuTq0Ws5nAUDvY+NrX2IehwAhQtefwJu3WuJDfdE7ds/9h+echpaZzeoPP0h8huZlf82WfCnIlt2DsWB+p47rirxR6FQNrFc4LBK9kynojKfrXbOxRA4oc9FwWJpzNd6cP0IsEEQSXn2N5rTUmwp2hVOhBIMtvn6EWtxd0tvpS1R/japjDpEem5oF9v4TyrR1IVIl3I3ZgdJ422Q1aA== 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=P5aD4UrjX9RrscAOXejm84ccGNKFEYD+NzqqB1vi9Ao=; b=B9xNf6d+hIjYrRsnn/JnD2nJIVmROinESE9+R4hQeMLwkWlWUj6sbzqak2/h9WdXkeqIja2vxad2xL96xY84t85H2dVcE4y8bRlHDbU9oU8o6aSuWMwumMVfwJ+wCoy+fOyYAWXmQ4QSBAhc1wDhmtIFPISRpoeyBaDhYMmyCVZRfejssgdnl2SkZcK5dhyjY+4tReCTPi4pvo7D89piS/gllqA3JhXaoQ3ML6LW8ahAHH/ClrCmhzNfecRDEdHqqvPCJpCyUaC3uRWz+CKYlmzNaxmnYPqsWViUl412ogS8gAv/EKYUytbI7xRNTsFAepRNQJyot8TkSAwZNi5QyA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6831.eurprd03.prod.outlook.com (2603:10a6:102:e6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:50:16 +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:50:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:43 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [6t5O6OYLCTnv4co1+lyWApL0707/zdRp] 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-101-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:50:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a6348aa2-235b-4213-49c0-08d984193bdd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOzptFBBX5RO5ghXaa2r3NLzR2q1nkjGJnNzNxO0Y+QE4QAVTqGO7M08MP35K772R238mFqoataS44DOAxHL55x6Ckz4pE7ya3UQ2voXiNQfqPg47EtENC9vKcJ3Q2LgyLnWBc/9hHJDwff+97DzQdwI2AeMpXEMsW7o1HMRoerNYyRNYo0taXSk7QJG0/w3fAlLc/mq49GM5hyywSYHU0ZTM2L72x2IFgGZRn9ksTo3PBiI4X5WZ25TMhbJ3IJ3M5rUvWMZQi65oFxTm3ikOptifcLi6ZQL6eZDkU0USRLkJwsCmTYjpvrnGiOeybX01rbDkXeNHaswdodDxSiaJAW2qkWxUwbj1Z13tUo6rHkJnBuNzdu0bDCyA9w1Hhj1DVGJdB1N8iVPcxVep+iffCT2QY3ORZi/1z9z0ZwhcXPxqPcM4xH8sGGhiem46R1Z1rVUqsf4XlAeBsU3oGYM+nJ2O6+usF0N6qLUZ2nJ0JwCYFBHQdhNIe0NsAT5i05uTFTi6bBiNdOuGfvKy/S4DVxC9JMRrBWFjR4hy6DS4QjZVNMyCjiJ6CVlB+bRZcUsWFj4P1z0BaTSni9Lbzbp/8MBJTxd/ndqCzXlmMaXjgohJ4vIDlfPOe0SYE7PXWtnf6VDq+wA/DA7pZCnHLfw2hqkaACmizDYWAGXgig3Cp4EYC8+oiVXlMMt28JCdcaHcifjHpcnPF74LQQN0chGFhoxmKvaiFZieg= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cn6ufIiSh92iz6EIcdJv2Z2kivNAXMYZHrebDkaDmuzrSDh5/ImxLpR/bhm1qy0yaUGY5GwiABuX1LpnS62B+BCQABMCg3OXwyfizF9OvKp6iHtdohF3PVEMqIOnvTsRUtRvoaS0V10YTktmgK0s/sc/RXkcEZHdUBjTNDB1Nu518EyCUkZsHnMuv4FGg76y9Njr3OHryLbAEnjRZasnN+taiR7y3LeBfaYotnwUyoPxMWFJlI7bexBprUxD4YHLfkfwk85swk5mgZTNNaQxaLDKoB7Pb4D6pQWnbtB0P6fXJ3tMwuKPRNf0VIxHbI3L+G6l+RYWT861WwcSa162ndAS2poS5OOwOLpg/xysZZyo66axB5YvSheAWwvPr1G/rbL62gGz076DcaWKfWUBVH59HVY9/M33W8IJ2Q0NAtA0TKlGfvW7jtGaf8JH+ol0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fn9+eWP+a5gsoemvqfvYGOzVbeAgHE8YJYvXi0SvcQNhIiD0bTRMXeOVgVyU90LGZl/Ll7PFcA+yMvfASM3X3CL+Bf7K+z1ZYtmiypziQ4bFLKWUYAnX+4xUcAwrzZrLDBho5fRplNzuojoykgppwg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6348aa2-235b-4213-49c0-08d984193bdd 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:50:16.5611 (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: PA4PR03MB6831 Subject: [FFmpeg-devel] [PATCH 102/218] avfilter/vf_thumbnail: 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: K0UtKKQq4AW0 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_thumbnail.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavfilter/vf_thumbnail.c b/libavfilter/vf_thumbnail.c index 0d3de1afbf..b6d6814e5e 100644 --- a/libavfilter/vf_thumbnail.c +++ b/libavfilter/vf_thumbnail.c @@ -244,8 +244,6 @@ static int config_props(AVFilterLink *inlink) return 0; } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, @@ -262,8 +260,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} static const AVFilterPad thumbnail_inputs[] = { { @@ -290,7 +286,7 @@ const AVFilter ff_vf_thumbnail = { .uninit = uninit, FILTER_INPUTS(thumbnail_inputs), FILTER_OUTPUTS(thumbnail_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &thumbnail_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; From patchwork Thu Sep 30 13:40:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30781 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp703510iob; Thu, 30 Sep 2021 07:05:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyGsW2y+SUufNBJnx/Mxh5wVWYlOn6WHc4dBHYEKkP8XSZQ8tciWEelAjQ3hsv4egJXWp5 X-Received: by 2002:a19:4344:: with SMTP id m4mr5803056lfj.155.1633010700774; Thu, 30 Sep 2021 07:05:00 -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 e4si545389edq.91.2021.09.30.07.04.58; Thu, 30 Sep 2021 07:05:00 -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=DSQgnqSY; 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 5602C68AFF3; Thu, 30 Sep 2021 16:50:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2010.outbound.protection.outlook.com [40.92.90.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B74568AF6D for ; Thu, 30 Sep 2021 16:50:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aB52mfa24RYLKwTM3Ey6c4LTZsDd9PR7krZ7CI7VcFOyUbzKiy2/nwQXUvvzkzn5fQJtWcqcajwiR8tcLVCPjknmBhGvpp5z3ETfpIjuEkYvlrzuqQ4PVByl+w6VrvgcCMNjQoHXE54stvRnR37FSe4jo4sgr0la1Rqp5kKXNYhh9ji9sWWGaSkEM/pw+Iw/ornZBusn2Q4NZ7Mfmc+kpeTH1dIszqP5QKckVOCM0SyxUV5pOytkxKhHrWFfjrmddZKA3h4AkhegAlVstDsjM0ezdbOoTochqPXJzRmiRaWUy83n4Eg9gGND+MXyKIMsbFKTYoVZ53c4bm7Z0UN8Pw== 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=0L9KE3vT6j/L01Zu8/b9qWIqCRxTUeGewwsKZDrTjPs=; b=kzaSUDumTVi5RpFWqqEfmzzhcJtm5Wi9S+h8SpARJhQhwlwn4ZHx6iFYAvHADcqZjedTtd2aIcB0Rfnvp2BhNSI/V6fQCQVFspWMBDnZOWgXbuRjnwEao5P8CDZfiReeiUIbIFugP/4QEjmPIP7/3PfrCGWVgRUZynRub87S/xy/8Ho4+DumYhpHvZRMiG8iA3UK4zVncPmriSKtH8MuoS6rzBlIMBcbzFwKrXkE3A+8pLxbWfuMHqdT6mUalaMROycYoKX4zTnRGxTGlZojzVWSSfzbm9NdBc5qDlL2LzRISXcFiwncpkcP3joJ7rPBvfi7df8FgNzFd7BTx0KJGQ== 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=0L9KE3vT6j/L01Zu8/b9qWIqCRxTUeGewwsKZDrTjPs=; b=DSQgnqSYJJzN7eX4+DkqEj2Vt7K/BnX5QegT9IDxw9knuXlqKNhfWoAXGiHY9dCGajmtew6tkhTyhAL4LcSwUu+98kDaN6RKCkkKty8ORNJ8aEJqhoUH4jjAiqDfXbJwMag4lIFYF25ezL5o70Pa3lQcBreRO1e36l0f+v0/zifVwMCKiHmKh4rIfU89panK4zz/0Jjsm4Zs70aIfi9kcKop3BfUDj3qizIS0G+lRp2VmdhypvzBKN38FPUHr8ZNrSffjs8QQZzSBPPHXGAS2c4fXXWZ1KTRgzoNCsusAxgBjPKT8aESbRXE8AfA+OPKEeYmD/Yzwels5cZcxaBrVg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5451.eurprd03.prod.outlook.com (2603:10a6:101:27::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:50:19 +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:50:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:44 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [MAyMMYCvEQH8k+JdJlvW33607uFmYMAi] 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-102-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:50:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ab1c498-311b-4b38-08ed-08d984193dac X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Na3/Yp5vS4YWR9BecF4lQIlpA9NhUhYw2FgtUYqKSnRJB9+xaSg31ZwVm63wF2u5w02yBf13XI+LPwxo5hT7Oh5qb0jB3tAOlAiMbyt3HeSm1a9B3Py2AcEaOXTzeX03KmAYd8W1KPgjM2z7b32uAoCv18Lq+6m3CyrXWLSjlbmREUpRZzpvFkV5Yxz3y7UdQ1oqGwanRLbh4J5F++ssL/E3B4Hp3P4QccpFGCqYYrHhgC4jnTcWb2j7m2/dIce4OD/+vLSaYxUp0qPYqyTUlOkiQqkvXPsIAdVHALmjSnVXRRCKzOv/GfuatwU0/+MxaQWqsBe0NT3EhxS9R4y7u5UgL13GHeA7Ev3uTsVMFfm7KGROXMNFCZXXc1Oy/kCIEZT+L5H1cynYdWti93ADyJWWox8ytJYEsoccyQGOCrhW3qRR5mLbqFmci9ehxShw/J28AFIyGRWAH5lB/TaNDhW8F2Qz9ix9OkhrubglJSc9Opi4vN5ssm0KcoYIgUn9K6RPS9mOFpbPEE1935n/s6cfwEk2AJ9OL5TfIndx2j6IY5mVUG2XX+uu4gmmURlMb8LTD13MFaQJStT0YdMp3/Vlj4O2ztRhzFlmb/VQh7v91KNg2Bo/T4j/G9pjtgGQMdjT2ROVEFfjhdV4PP/G66pzZm+/LP2JGG/UhYErnpJvLXNra/thTWKAJf3w7jKhTE= X-MS-TrafficTypeDiagnostic: PR2PR03MB5451: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rOM10JR7fIlQ0NjleOakWlQcIc9JjVtMBXHLD0X4T0x+3ALQbX31lzNwXn7eZkNuR3Iw8qF/LR8Pn2rY9RTrZKzbL/OKMFWq7uRUzb60LbRHVbcINJ/VLOwYyPvzI9jC/jEealYzp9edntfdp08lsjML0kbOiIlrAzw202rktcoc/3oJZmDoXzcjMZMVnosE4KYZplRDuQ5SlojaKtfGGd5pa8gCT7Wj7dH7MVh/KuOLOyJ1lhg1I+OZtEnocxDgBpY0OUcm8WE2rI+RiJiKsydQcB+qHNqw8SLvT/upGE8+qZ3YI4Mr8N49Li28xdzMh0buvHu2Fvsv/EQiG2zSEWXAOlsnl6YpzFQL7/vnR4iO71DLJPBdZY2Y8RnG69XEIttqtZUnQ8KMfBVtKF/hWT2zvO9yw9cHHLRAy2Sfnceb35vgUVm14opxUaNlwluM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dtb27W7HBOiaLB6+yHTgu4iSx2kTSJHLfsgqYTgmvNF7woZHr5S/F6LspiGB4DoYH0bQHi5LFEgZDiKO/Zbs6VaFYKlGhSPE+vHo09FMrnSMuImDfp+p2lrTnRryrcF/k24N/lt3CtoU8yN8nFK0mQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ab1c498-311b-4b38-08ed-08d984193dac 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:50:19.5569 (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: PR2PR03MB5451 Subject: [FFmpeg-devel] [PATCH 103/218] avfilter/vf_threshold: 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: MHtHdRzhs2zq Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_threshold.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_threshold.c b/libavfilter/vf_threshold.c index 65da3734b0..1b8fde4439 100644 --- a/libavfilter/vf_threshold.c +++ b/libavfilter/vf_threshold.c @@ -43,8 +43,6 @@ static const AVOption threshold_options[] = { AVFILTER_DEFINE_CLASS(threshold); -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, @@ -67,9 +65,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - typedef struct ThreadData { AVFrame *in; AVFrame *threshold; @@ -355,7 +350,7 @@ const AVFilter ff_vf_threshold = { .activate = activate, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, .process_command = ff_filter_process_command, }; From patchwork Thu Sep 30 13:40: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: 30776 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp703726iob; Thu, 30 Sep 2021 07:05:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDjg8JnxCfHAYEdrS1PO34mwcSIjjoBFdGyqvl89405auCGxmj1laJCv0Cm1NJmgWbFBee X-Received: by 2002:a05:6512:96f:: with SMTP id v15mr6179835lft.455.1633010711883; Thu, 30 Sep 2021 07:05:11 -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 q16si3516196edc.203.2021.09.30.07.05.11; Thu, 30 Sep 2021 07:05:11 -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=Ud3C6f6X; 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 6F7BE68AFBB; Thu, 30 Sep 2021 16:50:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2069.outbound.protection.outlook.com [40.92.90.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5F7E68AFE9 for ; Thu, 30 Sep 2021 16:50:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MIjaQZFAg7tgQC48hJ4fYGwzilkC6yjemlwMAp6odHfSPtRcHku7kc7yr4zQ8aGpgUmS5h/5rHlBnjyfR8GQfoBsT0zQNlivFxmgZguay0nkSUB/nCLXNJ6voYNO6x0PTi8glQVCdlMFkrgyEo4Nqz6kxjSGPXogWdf+FV0lOB+bj+4fEOBfInHRoXlP4+QGk8AVypsql9EQPSsxBN8oE7sQ5pESb9o6FdaD2sNp0LFjeBSc9MdIcEJ6cJqtNYJlOXK8GjOxJ/bLuBT/HyP8uafeiPbVul3tM5ZU/yDpmZ4WOwGnUd6QgY0cQ7J0mlsdAdqxrWAC+jvr6QnI9RE/Ew== 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=Dz1gwyEqjaasScjS5FuUncUHtIjB81NOHvC52vhx2UE=; b=JXXLK3xpKvRFgiZ5wX76Dq31+h6KsCVz1txQWSz8NFX1qTF02+KPBXK5U8thGKcMkWg7JYru8CRqKPTJj8fbcERSzx3IftsDHFBX4b/Y3/GU5faUu+3jXnZ6Glr7CvJF1P825fghnppTiOrElAmY2iDpUSDDDYTvJfkBsN4nC8nOXRKEh+RRwVUlu0VC74MDRXCyaBNfu5OkA31JlgTW+Xq44uKQ1gN2rvHyD0fTWTBYzgx8azXp68SGdOMFMDGanpoiXVxHiYsbsORrfnWJl7aK0a4/8ytvzYhf8nX/bx4THEiSJmt75ftr6O8+gijy+DspYMFSuh5MFUkKMvG/UA== 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=Dz1gwyEqjaasScjS5FuUncUHtIjB81NOHvC52vhx2UE=; b=Ud3C6f6XxDQjJRG/2NbIJRKTG6G80ccK4WTwNQ4C4EHuE0bNq/NG09cM1OAHwa4N1NhMLLXW/3FMKuE5+ggYkFbsks/6Yn2U1goaGnqGXyevMXm6Uf/pVr0d+27WJW5XF8N/G+UCf3U1LaU/IkWiHRq/0BrGujnbw6vBFS9rg9Nv8LCZT1jBONbywrEYiN7Wcyo46GbEYPUS6pAcazmXupg7kls+k3iqK8Tch9Nf7opKZ85Pqa3xSVGNhLNnnJECWu+7MMd4s74Fgh5+9qsM30aaXEydQHeCwX0z/uMac5QpcE8VaUuEM8NmxtjNxP9+Df1rRyaMc83Q1ORXyaJVkQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6831.eurprd03.prod.outlook.com (2603:10a6:102:e6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:50:22 +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:50:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [M2ALqEwNoDCQUkJqkDJ+ceLA6DoRN5WI] 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-103-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:50:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e61b7c44-43e6-43e4-a966-08d984193f4d X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Na3/Yp5vS4YWRHSxxISHqDD6xRo6y3mqxTYtjWVRZ+uCcIGW3fooMgkvDc7UlTaHD+Pp638ctbpwLodmUTDGFLrvWdCsEL5sCto7R72IcePmLkbGTpfRFzabRuFuaaSjHP2wqq5SQ5ViSbDb898e1cMiyjfPEVxbly+8Pr8kvgCwXMQjyW4iOi0pYlNqnAvqg+0n+3nrnpG7ZII7emuI+Adsy/DfZkclZNN+ogw1QTppHLChN7zntrzZTCOMAxosfNIWEZxNNBTofLVDNZCxrL0fRpHvxRR++c1pbjVh4D16tX73TVL8MSg778q7UGJr+TJNTOTmjt7pHiM073jQ0ivVQrcPPY7Hg+JOL/GwBeTCP3k+sopkh5O+JB1t0DNBGDYGPY/6ZDpgnD6LLakco2TsSaQHpnXLu9mmm8BwMq3XYxdwi+NIvv+9+BWIEYsNAnLyW35A0AyCZGXLrWyBgJuGAm1Da1vC12CoMc1kp2Vd410kquy38ljjQXu39jwO5IxE0oiNEHk0O9UA1pXYwZBn8+wUY6ZHJ/c3bxkG7Du5SZoQ6QOOfHjiABhkB7HhffjEXinuYLn0UMBd8ydqo2hhOhQEDcNcMrgAPvOtpQ4jcl8odtz2uOl8PVohlg8Lp1dfvpLVkPy4NPNllAYgNnV8eVdi++NYGW+PW132iEWO/EnJ0HBpMOCpOL4vFzJ+w8= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WUI7YAaG8qsVmDta1D7S53nAObDDBJ1n2piKV7/A+o3QWOKeiIkBnvrRikZSY6YCGn7TDzPgkU/4wOeALFKOvyXr+BTtc/S8qykVyNZiuZrVex6paIeFjppUXjbiA+lseX/xHmLY4z9KamN/DXSfMhsA0IPPU9TSUaZHxZqw7ehrvpnjwGThAx6Ro5OADnzIxukeaDxD0Sf0HgFnERkDWHOnL7P+QkKApLYr3OGoPRICqwK2hfJF9KvnErNL49UNEuqawzsNwFhMaYAUd16pJv0l9CWJkhZTIU5nsunu+F2L3MTSfu68S1dHC3Sm+RFL5YWTjyXzcT+leJypv8Il9BWuASwPKz3KdlUFduRUEjIhPpbGeU/pYA3nURopm8nyqqSiyRlFjpyjvDFV2mUmip3QtDfMCMvG8I/FYlUT8nmLfenXSzQwOEH3IqNfuR6K X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: p59OAbe5mA3FI148Hw8pz3SpnJHqwMzbeEFSSQSZwPFGSiEv5F8/DmGcAhWCRQ6goqUi8mMNtbuuOMJ1x5W3fmzfnWsx7AUQB0IFpap/j74QZrFQLC4YzYHfztGlM1p9wmx8VyDP4UR+tRbQjvI6lg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e61b7c44-43e6-43e4-a966-08d984193f4d 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:50:22.3138 (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: PA4PR03MB6831 Subject: [FFmpeg-devel] [PATCH 104/218] avfilter/vf_super2xsai: 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: jJ8ph61tfjIy Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_super2xsai.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_super2xsai.c b/libavfilter/vf_super2xsai.c index 11532925bb..3fcc035803 100644 --- a/libavfilter/vf_super2xsai.c +++ b/libavfilter/vf_super2xsai.c @@ -245,8 +245,6 @@ static int super2xsai(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) return 0; } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, @@ -255,9 +253,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_input(AVFilterLink *inlink) { Super2xSaIContext *s = inlink->dst->priv; @@ -361,6 +356,6 @@ const AVFilter ff_vf_super2xsai = { .priv_size = sizeof(Super2xSaIContext), FILTER_INPUTS(super2xsai_inputs), FILTER_OUTPUTS(super2xsai_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:40:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30774 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp704022iob; Thu, 30 Sep 2021 07:05:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9aSWxPAl/Vow89AHA4esv5OvGh1IuT5VAxddWE9SYA7/FCRESLdb0C6FwLTzSC95A+lLn X-Received: by 2002:a17:906:d541:: with SMTP id cr1mr7297631ejc.81.1633010724664; Thu, 30 Sep 2021 07:05:24 -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 u4si4520299ejy.271.2021.09.30.07.05.24; Thu, 30 Sep 2021 07:05:24 -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=Pr2gXV9c; 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 7587768AFE7; Thu, 30 Sep 2021 16:50:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066075.outbound.protection.outlook.com [40.92.66.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DD7E68AF7F for ; Thu, 30 Sep 2021 16:50:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bRRHEw5UPGxt5U5EO1NxU1eSAIei/oaIG5UO5UpTWFTF4QrU5cRqRAb9mCjtsD5JUnJRJpkbgAfjNpxhPROQwBF07akAL+J+oOmJpoLGvPUjaZ6xcWaUuOl5Dsfs6UAzUMlnSTDWIUVABl931EjJr0V8uwo8v/D6XMrWmgciLqqxmAPjImBEBztBQ/DZsA637EY6ZITct2UJWjOYWYgesoWjP+UJqLHhbrrJ8rg0A0sPz4O7UL5sMw108++fVlZpYs01AG1yNuIKlqP5v6a/J4qwfc17TmqU4gnwxGYhhTPkuds5J0XT6OAtLhTLZ3ZxUTgcSWH1d5nNvUN7tGtMWA== 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=tk27HBniglHI035aDg0qHwLH2VoD7lqsbpJjvHTr8nY=; b=OyvCQBxm4hyqk+o10qNqs4Nje9ZROsXdsTizNCAfdU7qwcKq+ZxKDGqzS4eW2ajYzDjO/Z9psiTYFevibkZQaMliLekEwOXtRu0IxFO/q6TtYbSSnf3ttwY9N9QL/3A6LnzzusjVIQnGVum825L1IDzzFOrHOEBEiTDmB0NcjEdTg9JqqTzb09HSIgn/WICBwTHtd0oYo/m4M9f18U7z18ts0dLc6lXxrvGAeUD2aTrrIZ8p5HQHukgKJaJA86piu8v4V+gG4goov0vaUEvCfd5O9eF2BZFXIpVoE7wrGVNDlAXAMGkZKelGgKrUdhCv7yFRZ2annUL9gj0RJxkr8g== 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=tk27HBniglHI035aDg0qHwLH2VoD7lqsbpJjvHTr8nY=; b=Pr2gXV9cyvTGPneNQUYMssL0sXWuw2qbjTyNjB0/r9ShuyZYLqCrpT+uTaQcdp5RFB2kK1fRoSKds+zM75eqK9r/Ho/6o8YmjFKUkv0FiqSjCpfeC+x3i0e37OGtKA47W+P0vqhR4CI3wY3Bw/yTfvgWDWqblEPqfkqF0jTxrpRNMHwgEbZerjdbxmqgUK2rPlRpM8ltAnjZcNqPRX9bY/aX6eA7MT7fZyVXwQ58BJb+xnoTZ07aYIqMUfzPNqIWqB4gHkYlOew59gYuFHMDhc9nE2UGjipsTAcTGU6yOXRioTOxx5FfJuwPYHRaK5cxlbR59Ij5/M7xpYJw4cMEPw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6831.eurprd03.prod.outlook.com (2603:10a6:102:e6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:50:25 +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:50:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [eup7UnlNJBPgadt12PN0eQ+0GsDsyxup] 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-104-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:50:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 74e4de94-7f70-4cd7-26bd-08d984194100 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Na3/Yp5vS4YWZqVQRo3ABRx9KVndURxiTRuvFNdHm/4USQzA6My2mlGp+eMNm6RCSb2DJcGFf2Ta6dj0TnrFNKi/prR558NX9E6IZzl+a6I/82IN7ZMsrSkXBpjZYwOwV/Ou9RLfaDSllQ43mK4tSZnGlT8UMefI1JC72RctBZK3wwU1VgE8dgUs3SOJmITXBJqrFqlmqdlY5mFTTl/nSPu4z4V9I4xCUIzXO30jaAvlIxOP+MRnUviG9LT14+3++O1eqxAd75CBWsHS56p3icQZli0UEG2nqZ0QJmm7inNQCa9T20BADuv6102ac3psh28s+CjV6h1I0IejD3CemReTiv47LQhGdiagNrMpdplJaTiL/4UI15XiWtKglqi6vXg1Z0LxCUuaBAk6qDm7axDUAGW8rnQvsTwxwaml5B/6nZHZSFl1In9GwUed/PQoscdDHVnxYtwG/0vhASTX7ep0tdsnHtn2NdRKxbV8aKh1jWM5Eml7YYOt9opXOgm5y0PVLbiY8PrLpNmQ6tigRXALcPrelkQ8UdAwqMkPqTpMdNZUlk6HDcmn7edNdEZWzSux/GGAlEh+TcSgnfEDp9gxrKSv69Q5xR6JBe2T+ofqHGz4k78ILmDRpIlN2DhjCLXVPhFaGtL5H5JxEBRhR33AWR98v3jmYUF8D/6/RVdIFsKRmSbmVJtQZMW8/IW/8g= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oyfDrd7DHK4JsyEgnLBJr7xbQ9Bn0N0BPzKJsSNsQwIv15/SdCHkcqBIk9RCTtPAtjx9I0KUS2NrQ3tDIHfaY0hZWa0ASDmErhUKpIQFEQbK1K8zpjw08VrGbUVzGdsLC6hPWb6y5VAug1rKSdX5YKBo9dAtD6rzqW8oKy1DkkVsX19jaWTENPIimsYQAd0+8cGwUb2B5Q6JjtiobtW4ZMYpmd9dYIHDoDLTrLIqShAYCpPxX3Yo/JeYQrvEcDaQjuML4gojiM4GfFzsLgG+2tsf2+r6Js516LL4OK0OC3uj6shzNExxFStgLHg8PB7ObQjRQh4mwxkPIM/Q8bGgK/rMCWxf1F8F/cvNfqM4I6/pXTOQEGpsVOn9YhvvhooV2hwA9I89IzI1zBuyTB7ty5zwMN+2dTk2R9xC3284eUzhuP5zjaubhD2V7iGcHmnd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rTZ/oVZGEI7QIlKOAZ1XYjkH7+s2Lz8TRNbfU2cVXCfo9GExB3CJ1T4eaSiyHbbyVLlLw5km62uUfT06yKE/VVbzR/5IjgRyWXc5ZKIS+k0ceXjLUtrIADQnDmTeUe8EdQS0p3qEAewDfTJCQBkugw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74e4de94-7f70-4cd7-26bd-08d984194100 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:50:25.1583 (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: PA4PR03MB6831 Subject: [FFmpeg-devel] [PATCH 105/218] avfilter/vf_ssim: 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: 7MV5hZ/jW0V3 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_ssim.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index ba0f18df8a..bc6671e49b 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -420,8 +420,6 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16, @@ -435,9 +433,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_input_ref(AVFilterLink *inlink) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); @@ -596,6 +591,6 @@ const AVFilter ff_vf_ssim = { .priv_class = &ssim_class, FILTER_INPUTS(ssim_inputs), FILTER_OUTPUTS(ssim_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, }; From patchwork Thu Sep 30 13:40:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30766 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp704256iob; Thu, 30 Sep 2021 07:05:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyf+CKGGAwc0fBc+gihoyaBTQIGDu/WK0vfj1MGgaJhPw1lWTpiPLmn6ZabE4qbY2Z5cbt4 X-Received: by 2002:a17:906:144b:: with SMTP id q11mr7376308ejc.78.1633010739246; Thu, 30 Sep 2021 07:05:39 -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 oz20si2263186ejc.688.2021.09.30.07.05.38; Thu, 30 Sep 2021 07:05:39 -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=UIeSFmiv; 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 60E0F68AAB1; Thu, 30 Sep 2021 16:50:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2037.outbound.protection.outlook.com [40.92.90.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD9E168A9DB for ; Thu, 30 Sep 2021 16:50:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W2WIR28yaIQsJVv8VmSUTgAnG9MlcumZSiKcUT5wt94b95UI9k/uirNWC7G39PRWliz66RF/ZCeZ4oKR91AwMuwsAKYZn3oT9ojRj4r1FesfEQL9hCaEk4LxnCXqXpAJ2bUXalUl/rrBzWz7LoZU0QrrF850Ab2UxfiPdLn7KBnbTyz2GMU9vH7NDnCWt3M3JOhSujTpTFPsR6R8saKhM5FqY3VWwsrVqo/smsYnhESqePs8wl4KwBtVqTTlT578Ln+UzMLiLyzAQ0j4icnab+zYh+LGlK0SxD+R7jU9YpWf1sYtg0eLABlTwYwZw1io++EJrLWKhniKDxC159GMLA== 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=q2O2pk7HoE3D8EYmRX5pA8ol38XPsdgC5SKXj9GZ4vU=; b=fIiaC84DHzbGFzNe8zfi3y8BJNDtV18FHAXsLV22l/I7IxEDf6WhrFrBPsje/TceqMauM7T8r10GI+gqxn82wjRMyDL3sgDTNVLcD1vY2tlDNIToR1XF4kS2FWlHn0RHqDt6HKIYRDqQF+RosWu3EXp5cuCMt6wmZ6lXZ93vg341KM/frRXJscTbJ5orCq7lwpHNqfYZoobyc4HPcDy/3jltIuw9LVWYp1L6CGauhllMnXkRb4VbvqNaBF6obFH1bjx7JKmZ0JYGRSL4nTRaM2xAjraRSIoanWqCHz9acZA8SwSB27knXZnNSNbIXCk3w9F1Ud47Qw+oFJpNNmtI6w== 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=q2O2pk7HoE3D8EYmRX5pA8ol38XPsdgC5SKXj9GZ4vU=; b=UIeSFmivnVGwUObI+q1pIzly055dj1ZgQYZbYe3WBm2Z80mKWmiTukhNgfD4aU3gwh3/2kaGPDwigpgc6Dy+nG5woZcgI9Jl3kN0uNoXOWrL5GDMOjc/JgYwhBdLUyY2x4/6sgeEST5FePHJ4fPAn/TL+8eVXlkaCqkI8+48vy9OaPHzhIBSQmQlr7lvWI4pXkwcFr6gKEQd+NoFPEZyMnYD0DVPcfog0EnsYX9m9PsQVv9/N0ub+Kqb8iTG9auSoYIDG/HnjCmzNEZlLk6UKP+/cgavM/jEGfmiAuQCxHo+uZgBj/MODQNA7AH1P7ryHIpNNrYbDeuj0/9JnIRRVQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6831.eurprd03.prod.outlook.com (2603:10a6:102:e6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Thu, 30 Sep 2021 13:50:27 +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:50:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:47 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [7DSab0cnXVyNPhNJ+vUO9BGX5b/u+6nZ] 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-105-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:50:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88bfa7e9-c4c2-41fa-4173-08d984194288 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTeFbSiUZn3s0ZvVltC3d/coff6IrDjSVhS9k0FxPPW4rrtujIzS60qHwpD5sVLQyRBkBAUvCbIQO+ZzFIXeCbefRgUPIAk2Wa5/Iw2Bs9Om32t3ZQr/auM1H9KwUtjCYFNU/Q1/oEkUGILsGUQpF5mkTfdWgSPRxSka/WkX5AtSvfljeztjEY3HizHOvyFLnpYPZSd87gt9DT2h0jUQ+jOJiX0F2EEdkQlGKI0TJ+Samw7Tw0uBxk0l+qmi4MR/0nwA1lW+acjDtHLve1CfgcdTa/K00XTn57SrQY2A6hgYx0JLTWi6S8GMVb8+wGJLusf36ySZRRFY9bq+VRw04lwowA0pluMDtH+XYBKrTwHFyWff1MIXlMvmsI2xHecrG6SCdKtrTkQJtF2aBM1HFwGXeSRnzon1BUjnXOdn5JUdquf1Xlk/06c837WNejz1bi9mayGYdLw/4p9ab4lNc6FgoNcjxldOUSqacwxEHJALOCQ79k1fsPrnttPc6rbzLPLIt2MHGhY0XE4CUEYVmYMgx40CADUHB+Xhjgzdpp3cFuHsCnr4okKpS6refUQivxF3gkCQAiZ9KB9SCyWUGTIXV0sH8imhkrHQw17Q61xzhTWcjgBebwaV2LnKXv+Xe2GzhLiSR8bV80goV2OAPqZMJoPz0sPAyvODVRP/FCTni+hMsBmMYrkr0xJLaVN77+7rhaHVfQ+2PY= X-MS-TrafficTypeDiagnostic: PA4PR03MB6831: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E0/VYohjCBMRcJtLJIqagjPfbj3CJJ35qcIjB3F3SuD10d7b7Q6s28vFCmpElTTpSIgyY+tgaknCEjrSNQtFTPyEdnyynnLE0/IKDIjScD+Ig/oZEQIEmQGZAZYJJKVOzGCcOcVFFojr8bbMxW2zKld6hMjvJTqmTcNRumBpB/PQ6eN5ge3QwBcjdkSaNYopBDFAsIQuXSJ6sgbxUrJEz/zJjxhHd2DX4AbQyba5+FTuwPj8jn3IH48AngbXNKkk1143o9hoFvKDKtJogb3ON5XKYDsOcAfnuoVrocJDrNDL0/C99OvoBfLKgwzXp1QpbPmuVNPH0hUqFU4mn29hnArwjYmKoTnlmKfC1+sPkSDTA4Q4MKEPR3RWOl2JtMh0CgODCKW1PSqVBKChn1XzbAzGGPvvYZoN73bJ3t4M4XP6ELjMeUxLM97Y60VsnuZh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FTTRTGJq6pXoUPfKiSc9b8EbzzJ+8c6s3ieDuT1g9AsP4lYTcEAYyxJfMvJEWcM8c1xUG8xvTCcKzmdbxS1SBgibeyDOSYdjaa6qBQjK3oKiUDwy/xpCafm6G6s4I0jwBGftPeQ7B5W9aojM7Gbi8A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88bfa7e9-c4c2-41fa-4173-08d984194288 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:50:27.7280 (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: PA4PR03MB6831 Subject: [FFmpeg-devel] [PATCH 106/218] avfilter/vf_sr: 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: PaiOHF8IFpVL Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_sr.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_sr.c b/libavfilter/vf_sr.c index f528fdcad4..4acf9508a3 100644 --- a/libavfilter/vf_sr.c +++ b/libavfilter/vf_sr.c @@ -66,15 +66,10 @@ static av_cold int init(AVFilterContext *context) return ff_dnn_init(&sr_context->dnnctx, DFT_PROCESS_FRAME, context); } -static int query_formats(AVFilterContext *context) -{ const enum AVPixelFormat pixel_formats[] = {AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE}; - return ff_set_common_formats_from_list(context, pixel_formats); -} - static int config_output(AVFilterLink *outlink) { AVFilterContext *context = outlink->src; @@ -200,6 +195,6 @@ const AVFilter ff_vf_sr = { .uninit = uninit, FILTER_INPUTS(sr_inputs), FILTER_OUTPUTS(sr_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pixel_formats), .priv_class = &sr_class, }; From patchwork Thu Sep 30 13:40:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30786 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp704506iob; Thu, 30 Sep 2021 07:05:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfoDWWCnIApADxBdhToltvGS9XsvMTCcbg8gQTdlpMUPVZkuCf0Si11Twu50Ol/B4+PjVF X-Received: by 2002:a17:906:8a6e:: with SMTP id hy14mr7059015ejc.366.1633010752621; Thu, 30 Sep 2021 07:05:52 -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 b88si4350654edf.312.2021.09.30.07.05.52; Thu, 30 Sep 2021 07:05:52 -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="pFm/aUSC"; 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 5D26868AFE2; Thu, 30 Sep 2021 16:50:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2037.outbound.protection.outlook.com [40.92.90.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1281E68AFF6 for ; Thu, 30 Sep 2021 16:50:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WAMnQkpa+ftt2Q0Zbi8b5tzkJ8L2ibnW3hyX7z/28UV2z4XAIjBszNYBSitj4eAAr3e0EvNRQgmjJVJHsGTpvcKwhP8lg+WrCLkwuXoRQx+CFWUsjOV/hwUOhmTuR/6r7QrEybXONTvCNIGrKe2QBASYIZxly4bQ77wfcezWhbxVC9Ct3sWtzLbrEft7DEFvwof1YVfyoFXHGAZOsBEJwHY1Y7vEzz03JQzbLaXZ6+RJWzul/ELfTbX+yMbj2Yyy7dWsRCnK9b/UWDRsVvnow648zJ2wUwc7iRFXsDhdGV97r7eX+k3rEcXvEQVG5WJ6+cvTkuux7rYQVt3lpkutGw== 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=ObQWtTIWLh3RStSPz5DeVfFY7kc8552pO6vUNumHZz0=; b=T/iufkkXCvX7sXjOy03kSxwve2kULE5zQMjmisqW1nfGmXUUtaqzsfg3d+horr50DNc0sERbT+34KnNq9P8yvf9TBQ4Thdnov9fSIlUt4PzeDR65kbQ/0Al2LV6DV952vfEcn+Ba/TCYYFZGNg9AmuZX16Q3DkL1irmjdFPDeiAnUqDe3enYYoGsqMZaFJB/j3GPH4dybavP+eWpOJIBigri2nciTTxUt5rqqXnZDEgWZD1wSuZQy6dSh4beXYtaCgAkkB9cslPdZjAq3xW59aPZMR1l10BRUt3a5DyHLDM1WerkDBxKDw+9lAIDcHMSfUBhpCVU21y/JSxjeN4DYw== 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=ObQWtTIWLh3RStSPz5DeVfFY7kc8552pO6vUNumHZz0=; b=pFm/aUSCJQ3vM/eKvALGQKun/IKhPZeMVWKjT7EtdttNedGVDY4LC+PdBYK+Lz5c+c9P+Wbqt+iYfQGssk+w48hqJ7K4SFrq8lfFxlt854xST9B6BUe+37EkL8WgameBEVMltLRAFcK9V6KyYxiMa8HwtOQPDUJYKx3GkdcyiWtzuLI1RBWq7yMoLNQOt8KeBYFSCnt2b0ttv2ESIf2onm9p/HBD3YHwkqvZSm2ELAqA611csdWTAOZRgPZHp4MNIStImpjmM3fJpfz21J5m4EAwpZK8QM6l4IYvANBKF/ReDIpSqDNBlEQHTTHjmGKsLyuaEDFCfxfli61rAxH8Zw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5451.eurprd03.prod.outlook.com (2603:10a6:101:27::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:50:29 +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:50:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:48 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [IeLtqILAvS6Pw7QngBQv/oUxGzGxiRR2] 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-106-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:50:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 461aa99d-c3b2-449f-73bd-08d984194371 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lPPDBH2EpymItZ3qNjiR+DZ/8qD9+Q5ZZU0jIX+V5e0TxfQQNGYRVBF5hidezh/SCGToo7qq21Iu6t64tTKJ7YC7zh3T8+b3ymQ/7lmAF/XKqlQX06G2klSjusBEBAB+9NMbhLCdKggHthIsOg8XnMhR9M5Ym1uQo0vluzyoAHVlso2q5zqqRa7YAhPe5bKzFhUlj09UtjmbSpa3GZ237meGDQzWe+R3X8uo5gSPWd/owTj3UBluWIi8Rygtje2RwMd/EtG01CPGM8jHUtPY5Z70qDyaUzfPv5JXh81xneL49VR5rs22xruDDPIfNMn8/4/9OMA0vVk6fQamyyDzhbkk//PedxRrfAyd86IFKEYgZ4V/7zLA+ztKoTmXUSHzgv9YM23ie0xbiffdV1Z7prY6A2kAex9YTJglIaNVUHmr3erNIm7Tvdo4k1SfL+YLenXS46SjR3rNAqDc7Z9ha9QNpoyAeebDwqTBE+b27/a0h53sURUjscm8i0FA0SCjV9/5GC4arBeV+47U3tiezk7qgA+ZwElNNX9RTfhq6m5FfNe9uU3x9gldTijunwyGg2Ib9mQK8+S6z6QNR/OTIhpAH2NC0r0VV48TZAIk93ZJGQcsCbcTuqg1lEplnQqRXMmy3p6/6jpm8szbaZtL4K2c5472prUVSSVbbr57kMdtwJqljZG3+pf8go0PGaDigYWrIST0UDBvdOMclkUcDEf3+SrF9/izREHrMT7fq8n8= X-MS-TrafficTypeDiagnostic: PR2PR03MB5451: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DJJwIZSt7xYHRfF8wVOQx3rd18Hy+yfsNJY90W3y4Wwbw6i0sAu/0oyB5IkyF982qml48RuCmElQW6B0sImFDMBJTrAETn7kKCMohymLAFzpnrW+tofvDgTOZQ68LDsoWx46VGQ8FJapE8g5M0I+da2KVBd2kbnL8UlTYnHkE0Pj3ij5QU4TbyPEYX2KAvCyt4ylIEWaheJsbq1C/iTdhiqFaRmMvqJQJ4RHxgFNIsbr0iJmZvZr4XPViK3YA2iawP25hVJEBPBlxuzYOu8GNn0LJaWd/AZMP2ZgYwVDui92NYFArQF00JwDZM5ETLVTJunAht42cWFRteHzfS3i3OiKJD4UiySBuxMvgBwtPYgdabNpIo1wS2x3iqhVxXtUJZs33X106dZ2YdqnknUBui+3wDIM3UVE4JLvQalXjGusztSM/t3VzfeWYmNmnE4Y X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0oCrQJJBjYh/BrBzE+aUISUhHebEPOi1m2HrZw4hrhvbiNjJ0PpSKdGlt9oIMmzlkQPqfy59rAtSxCSEj305jvfPNAuo+erepEI/iK81W4GXvzYibBwsU9bB3d120xJTPTR7ECx3t2mJWdym8ZvFzg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 461aa99d-c3b2-449f-73bd-08d984194371 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:50:29.2552 (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: PR2PR03MB5451 Subject: [FFmpeg-devel] [PATCH 107/218] avfilter/vf_spp: 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: Zkeujgxa3apa Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_spp.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index 32a3c59987..e0a02ea65f 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -310,8 +310,6 @@ static void filter(SPPContext *p, uint8_t *dst, uint8_t *src, } } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, @@ -329,9 +327,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_input(AVFilterLink *inlink) { SPPContext *s = inlink->dst->priv; @@ -503,7 +498,7 @@ const AVFilter ff_vf_spp = { .uninit = uninit, FILTER_INPUTS(spp_inputs), FILTER_OUTPUTS(spp_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .process_command = process_command, .priv_class = &spp_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, From patchwork Thu Sep 30 13:40:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30788 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp704715iob; Thu, 30 Sep 2021 07:06:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdFVQewNEL3MUYHFr+eF4zdtPG/Tl/s0d5a4ct1IlgW2c+GoPMf1W64bq8QGdhjs8b1DwL X-Received: by 2002:a05:6402:5ca:: with SMTP id n10mr7449847edx.335.1633010766700; Thu, 30 Sep 2021 07:06:06 -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 n1si3698669ejg.619.2021.09.30.07.06.06; Thu, 30 Sep 2021 07:06:06 -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=tk4Ojg2W; 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 58B1868B00D; Thu, 30 Sep 2021 16:50:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2044.outbound.protection.outlook.com [40.92.90.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAF0F68A8C7 for ; Thu, 30 Sep 2021 16:50:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TXVsb2vrvAiHVIacb9xdy01wVBduD13i4cWnwVeduC8IjLZ1fTU5jcdsnBqTZXrNGv89J+eo1kzvXoWW4cgotEYJyMOrJuzu2+icCKtn4yW0e2vs9v7BHL7DDmx8RevO0Io9zn2HUlIai0RoN5XnVE7+n/8+o9zfjAi8VyC4fvpZERPdUbBAvCqAhoWAZRcmenchBRB/Ks0VUW/0b8FOC4ZVUuiKTUA0Sac9yFzTDP+NNQ0A5hqAYQL4sNnDW7Af/FiDsy0iE1hyx+Zx3b7ozz9MbDbHC/5ghJkrs5JqmO2aIS7dtfnM9Vf0/9nVGB1AqAy0hihLSlYDCBM62PJSnw== 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=1PVR5sgHKTkXkdhJ9qkue8aGH7oXOutAn4qMoP5j8Po=; b=f+tkvf7zduFfw59Ll8hDzVzwwrsx/l39dnVMHte3IyVoMSc1YpTmjhwv3EzAtChpR/X3e0r0JEH8+KBFbyJy7+Ni1Ms127jzfMJS4VEWkQQr0GBTS2/tcv8xaE439rV4g4Ft1PyKOeP6KeZeoZ1LprIOPz2r2wQWsW69LrZ6WUbYJIwUq4NZzoarVKUh3lKtKnMTkLhczhKSSyM+7gKbQTL9zLp8DIhhgr0mp2o9v8bNAeZpUQ5B5hv0XqOnEtDP99VQm6mRLZ2D972BTHtTZbe0QowTSTQsxF5wD/v7LzZBPPvTwJfGi2slA8L7fRkgu9vyZ3eq/dHpm4Wd/aHUgA== 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=1PVR5sgHKTkXkdhJ9qkue8aGH7oXOutAn4qMoP5j8Po=; b=tk4Ojg2WqhWpL/neyteKPG/df4vG23nJOk2hvOX0Fhl+z2c+4HeK93VAmCn/VcSZnLQSoCAzKzYU8Xj47ufS1jNzFmB/gmAEoPhDat/eI+79LT/GWtBQPJNxUTggcmmRqZtq0GqmiYageXjdZgDOWyVnuR9NEkDL9cykvRTbQ6Sp5+Lu+u6A34abh5LRCqmB25D89mAhcQgipg6xHBBMGlBf+b9fxmkux1ppU5N43eSiPGaLfo0AP4qzsfsUZz6Nujriqvx9cSNgcjf1CV2ebS+MI3U9cO2JCgsNx19XQ1Ic/z4bTSBOwWaLY4m6jKsgrjKTCH4asFINCKHo2gBaJw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5451.eurprd03.prod.outlook.com (2603:10a6:101:27::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:50:32 +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:50:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:49 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [d6o7j7Y8DxakaGUPHzC8N7sF6pz9A6dS] 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-107-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:50:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 40a27e34-326b-4af5-1a20-08d984194505 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQEFGYb/YN4yvKEtCzw5Q2lK7Q8FL92qbOzptFBBX5RO0lSgR+XcJ57HQE24VXT1k19jSyEh0mTMnwClLa2PEvr+EZdXvgOvYfV3TaUu+KGOJzed38RzfraQG5K3R8nUzTk4C+JO4CorDHDWcI1077eua6mvW+3AbGfc97LsTrSnGt7kjdBM4uISsDuChDE62XJ+Zyh9lV4hu+U/gTsFZqB/YBmBlgjWpjLYILQC81NHTQZL/VMcgfBIcy/cFKiqm0glzEkTY0ilJh5WPZUfdvuU00PCYx5hh1/X+hmVUiA05xXDrsATyTSrxTd95K1/G1CNO9q+IHM7Sn8GvAFvslLyrgGIZeiMgt9rGkBgwf7rCcEbFPVj9lE+kDb2k8jWSfPYtKEY/p9wgYYsM67EzaZ9/1F7VK2QBu6i9NTlCxVoX3sj2n82lcGpS3Q52tfRxZL/5sIC8xxRXLHKKyh/RPdfNCBV6XqeDfXI5Tuxh9Z3D+hRMjJ7GOW9MpFJUon8hglHVmG6YPP7C0iU0N4s8NgrkfssOGS7CcAantlwz4yDe2kPbXrCOvdeDwVbDLeA3Mei2RmhGBE3CqjyLoYbDgJdYCOMkh3GT6XZ8BoBMr1rGmGLh51qELIoYAXqRf6OY2LR+FvAkqcT9q3st17+by5BwKGHpJD9fupZNBrIwBztvts+bSPUHqJXN2If6z4n3SvjEvJWU7A6ENmUo1UF++Pf7xDAVS5QHq6u9+tlbILx5QfaP9JCaXUjVVuGACg7kA= X-MS-TrafficTypeDiagnostic: PR2PR03MB5451: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3DeqJ+uAtBeqT9UkrHPB4zkAuhBidwCjIpYuza8cgzEFSZhFnxJOv3kAyC2baOQDKRzjfIEGccdMRyeQpT09QGsM9uWH3vewwXbDD5iSp+w0kkMnas9MxxqajAUqd1KWU8S7O6VVHgyrcT7HukMOKrpiLimdzsyIJUIf5AN9jJH4tugGzsi62KdGdq4L/pyA8UOHu1b/BTJ6p9b2j9xJceHriSJ85QUk5mt2dkrom7/ZUjtUliDPyCTd0dH2iN6aFNOKBtEcweciUIuK/wxOteE8XKNAxSZgDLYozLEFTt7VS4k5X62J6P4CwmkDMNxAV8TNWeJvmWZjkO2O1LMb+mqgLjEVrKB7iTWddjlfXSnlvJK/didbrecLv2glWG48IkmmQ14fez/UsDsUqwLncFIKzeebS94FZHH2xXzoLwDVmDYQGzcVReCk3sxPbe8/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tkq95OaM3Z8cvuj5qIT9vRFkZ6vnWMNe7UXa1CUnAb6V3MXYCC/UBIgxzenIgf7rjeZ91ae589otKr+tpcakDmLbh7JsIki22t8Se2omOzMxNZihiauqv1kmYlcQWsKDQeq7OjUtzdjd7F/tY3Z8YQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40a27e34-326b-4af5-1a20-08d984194505 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:50:31.8837 (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: PR2PR03MB5451 Subject: [FFmpeg-devel] [PATCH 108/218] avfilter/vf_smartblur: 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: mX4l3c50PKnB Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_smartblur.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_smartblur.c b/libavfilter/vf_smartblur.c index 6737f60c9f..1c454e9f83 100644 --- a/libavfilter/vf_smartblur.c +++ b/libavfilter/vf_smartblur.c @@ -114,8 +114,6 @@ static av_cold void uninit(AVFilterContext *ctx) sws_freeContext(s->chroma.filter_context); } -static int query_formats(AVFilterContext *ctx) -{ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, @@ -124,9 +122,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int alloc_sws_context(FilterParam *f, int width, int height, unsigned int flags) { SwsVector *vec; @@ -294,7 +289,7 @@ const AVFilter ff_vf_smartblur = { .uninit = uninit, FILTER_INPUTS(smartblur_inputs), FILTER_OUTPUTS(smartblur_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &smartblur_class, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; From patchwork Thu Sep 30 13:40:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30767 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp704951iob; Thu, 30 Sep 2021 07:06:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwAXB1jnE0gYsh2QsSvO52CZ1j1mIVNXBMdFfzIjIsGn7u6cWwhBjjUJQ/kNah/SRyZxrYq X-Received: by 2002:a17:906:b10d:: with SMTP id u13mr7162793ejy.135.1633010780497; Thu, 30 Sep 2021 07:06:20 -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 l7si3316145edk.342.2021.09.30.07.06.20; Thu, 30 Sep 2021 07:06:20 -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=IPNH1XWH; 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 8098B68B00B; Thu, 30 Sep 2021 16:50:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2044.outbound.protection.outlook.com [40.92.90.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 088F868AFF1 for ; Thu, 30 Sep 2021 16:50:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FZQsQ+/mvyLBjyJWzOJhv3Z6WhGjs9iKN9lDloG8TeMVp8lMTF11dpeplrGz+ZwzFrlSeJIz+9XmFLZZC7/ryqQ5LVZeoWMq3ANUgQbPKLcUON5U6y4GL+K1I/35ScvLofoS1l2gvS6c30dWoz/GkM2v+5ncDYWPiEaxpbulFgnita9pBvBBXNK/PFUmDZz5AP0ExWRmtsYDpSXcnbPgzvQHLgGNXEoBb1rXCXd6Baf1YqpLl2FQ2dpnb5OdkDOD1tfysmUcRCHhTJx7swV4IKq9YNAhwXuUPgQiJDhWwf3CoSwy0hWHb2SCmI/l3TJRCv6RYsG4cR2bWA5pXUCaIA== 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=5/foj/987QeIvXK1nPMHN8anA9XC0Cm0iMqkDmJKaF8=; b=YrHKT4R6wHWezEvibS25UZphgr6aVfRe+PBlMgXDkV0WG3vyIWhO8fOqYe6Kkf6KwUhgpN3kWCbP/73xksuljC808NGoE+YUUK3N+ySyqzlyDaRmih1L406Y2hOitUB4gZBq0geXdCpZyERyuaL/c1PVkvITyJddjy2snR4JvEQucRAa8GFjDOKHNR24o850X7d96bC7kHFIvvQgnHeo30DjZ2K2bMOlccmCfnOiuRo5Jaweh27kLrzU7z8AtwBCHimjpV/bMKz8tle3u0sqr4ojOJMNGdHceBswUEIvKaP2un4o49ZYdbLWQWtFFXprFUXRJLt9AOONIFsMlm/JMQ== 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=5/foj/987QeIvXK1nPMHN8anA9XC0Cm0iMqkDmJKaF8=; b=IPNH1XWHLV47tgH2zhqH3D/sN3wJB9cJ4k3vGKw7Z1aTCaxGTyx28ODVJb4YpvFJsE5oYH7kC3ZmJ2ZECMnrY2YA6MywBFTyOc0bFpOFCG7ieuhV3gI6yUmzCaQGVL7CdfzTaVtK6nSJAD1LpdcYzC0T8vRe3+gePouY83vBU6p10qECZjdbvf6Xr4KGsgdj6Jifc3NN+R3hix6R/6DHxreSu40KHVfYt8NhR2cl3w0LrOIMUo0h24uN+EInt9lNmdLv/fnlxF0tT8+S/ppK/8VqGAat/L8kTofOQs6BaIFp+47I7KaxW+gK6TuTncZRkhmhO6gvh76RQwaQf6SHKQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5451.eurprd03.prod.outlook.com (2603:10a6:101:27::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Thu, 30 Sep 2021 13:50:34 +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:50:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 15:40:50 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [5U9mTrcmV/b5cmE0qpsu0zDPpZ0md5/7] 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-108-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:50:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f322284a-1255-43ee-2be7-08d984194647 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZLmtPNeeDNv1jHth/FTejQCvEQkR9Na+riQ7jMwwY6CFtBOm5ktvT2aghGLtsKfXJRcX+qBHXQSsgVY/23DvzLuxOyta2YmBrezlSK9Q227GnKSSxg4YAUGNBtM9G7CHnUDyl+as7VSK3NSyWpLmi7JJ0kZK+BW1Z1+Ss2Y/GinfRcbSpYAZ3gBL5GXt7n2DfDxsTf+M5/U1C2XPY7xv1SRo1A4+RHfNz2jlmmxcl6p0cBLzBM/Qhze071CLcbhYu5jlhFIuSW9gfZC5rHSBsrtTPWnfFRF1hbEncVK9Ca7rA3H5kia2QcR4laJqDKtpf9bwBFcjg2wnGUzDttwMKpQMABGNK9gHzyj0xklLR1SK2d5uI7gSBYW1lFm3EM3CVQ6e7HmWOEvI1Y3Vms9MLxcTXQoK3pfbCoKRWzDgIJF5WNrLyTE18ef5nH1BPIe1JdKbhpGhZjeh6Ybgn6J1dYOxJ6zgfREhOLA/dtSL+RNeiuaNE+id6a33nQBfmBBP7BmfHyU2Uj2cC2Tk0j4vn1LNKsYmOtdLxGMMGNF6pWqQqyBs+QmhQYljhWD/y+JIovqWZdEqP3s/PLdLDTzjcxeke0PAi9BrjIwgTcGiwVnqmjP/GnqCtfBR2C17pFwNFsesoEch9IVTRogJcGqACuWG24Mjzuhi7RfHOY4A/3bIOdaD6NYm7sbOLXGFEZb+uo35Ni8HA+dcUpFuxmNjFz1nGUgxRjo= X-MS-TrafficTypeDiagnostic: PR2PR03MB5451: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BBcKxpnvmA2ulaT5e9fpuUt0Unn42yP1HS9bbBcAiX0CohbETepAFJzd732pfQctyfJy92uQN2E4//7BVbJ+rkgQ43sYDPRhuqhUpBbX61kxGF6Njv8S3ZCfa8JuKzKWF/tl0kbBsS1rYtlXi5CmBYd0V5rlHUnp0/H5ZE/lbiKZGyrwbFnwL7hPBKdCDGAZ+ZfpfWI5y0TFtyndVJll5249sxKsGa1xLSW97BF36JDsSSCo2HWuiZwv4QsIhhd+ElelDvgLB8xtJDHJw1b07yULkhsEvJ/2UCc2h0NLZH6ATAKyAZ1MDQ7XBMUuseTVV12l8Jsh8fWyl8eEwwpBUfEDGTb5RLWiEmFbA15HeqxSax5gSvNYeDVVKenWq60u1owABz0nidcioCW1y5ppVQYXoA+wdFgKN1hjaE4gm9NQtzQtn3OGxDW4zJFJ3i5M X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SWRFpO/c9x/HRm6+x5943FBwyGl0/oxlO+09XaHJcNAwTz//L/2mzrQ1xpuZDkzt3GVLOGy6q69VhZIWp/Pr+MjLswLeDKo6z5XomunV9yYgGFX0Vw4MiKi6u5ujbaTq3Viqi4lI8UAEvxvCQY0GGg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f322284a-1255-43ee-2be7-08d984194647 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:50:34.0103 (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: PR2PR03MB5451 Subject: [FFmpeg-devel] [PATCH 109/218] avfilter/vf_signature: 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: VwO40+/E5pXr Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_signature.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c index 03b53f9a4c..2b55f7fe67 100644 --- a/libavfilter/vf_signature.c +++ b/libavfilter/vf_signature.c @@ -69,8 +69,6 @@ static const AVOption signature_options[] = { AVFILTER_DEFINE_CLASS(signature); -static int query_formats(AVFilterContext *ctx) -{ /* all formats with a separate gray value */ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, @@ -84,9 +82,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; - return ff_set_common_formats_from_list(ctx, pix_fmts); -} - static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; @@ -762,6 +757,6 @@ const AVFilter ff_vf_signature = { .uninit = uninit, FILTER_OUTPUTS(signature_outputs), .inputs = NULL, - FILTER_QUERY_FUNC(query_formats), + FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, };