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