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), };