From patchwork Wed Sep 25 09:38:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51819 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9548:0:b0:48e:c0f8:d0de with SMTP id t8csp335302vqk; Wed, 25 Sep 2024 02:40:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVagGs0oWSljtNykpknm78N76FJDu/RWsw5WRW46HbOVZdQAROJ2kGfnf7Sbkgf8gIBm1patggN7jNhKX6TGPGb@gmail.com X-Google-Smtp-Source: AGHT+IHdnqABHAWiUKXVRu20dlZc8O2sGKpcKzJCzx/k0zte6q1S7209hEMrCfFtVzePRgjeB962 X-Received: by 2002:a05:651c:554:b0:2f7:58bc:f49d with SMTP id 38308e7fff4ca-2f904a6fb1fmr14652641fa.0.1727257235077; Wed, 25 Sep 2024 02:40:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727257235; cv=none; d=google.com; s=arc-20240605; b=c76X2s8sH6A+Nuq8meSrf/otFL+PdqcXBH2SbQsq41QeyLJtrI58r57YmCUdaA7Gzc Y8znMPiK/7dPaGw+lEjEINV3UviJYKaqwm4jQpwLAONh8hLdZvgd/TU6gfmflqog474m cSo8IdUIxlMMboHPIHcB3uSt8d0WOVO0qSvpDuTmww02OT+HaV6Q8OE5m4AXZV2vKeup yIG8gbAM+yFaRSRuIu0qHQgqPtkctxmynkkRHR7s/2262b/rhMStrjC4E2XMpNRgqV3y /RJrIkcWdIXfUUbjZogTlwwAxcfJtu/Sb1Evjud3x/Z476EFzNSmv3C9HEZVjhQdlHpg l7LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=OP/R1+UoKONdUCrLMO5H9/9iN73Mqxp+G2yNpbi5EpQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=h4VV2f19z6+HyvAqA/t9F8SwSTm+hKU/JVz/ERNOAT/9vkOKJWWTSuFKkBrLhpsPYT +01ZNU1U1KVQy5Ks/JumMV93ou1lA0Uc8sYjUIHU0HOuBQ/ceVjYwyx5ZoUeZaQeOT2x lUwGQ1I11e9kDtpzm2Qj7PjASlg3AGitVdNg7lT1yKCGFDw7ed5eSupgl/xDPZwI0W72 c+ntV8OJRTc3Wb+v9pLe/JmwGGYyFK9pZ0kzQ/SFpA0Bl9mtjeaO/9BXfy9njGdW0bhV 17g68aZu1hZ6MotulsK5J6G180D4knjZbPLmizinJipJUh5TlPPViavRvfeylvFq3vSP OBpA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=PKJ4cjll; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2f8d28b4c83si9276611fa.464.2024.09.25.02.40.34; Wed, 25 Sep 2024 02:40: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=@khirnov.net header.s=mail header.b=PKJ4cjll; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5CAB168DB65; Wed, 25 Sep 2024 12:39:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A91FF68DA1F for ; Wed, 25 Sep 2024 12:39:42 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=PKJ4cjll; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 3E2764E07 for ; Wed, 25 Sep 2024 11:39:42 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id ZJ2EJf8eBrvi for ; Wed, 25 Sep 2024 11:39:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727257179; bh=3N2iCMyRDmkD7XpHWvY4lF+WdPd4S9i1VDfsQKGKXu8=; h=From:To:Subject:Date:From; b=PKJ4cjll7Gdc7H2i/38GIY/8Cwdzw2DJHPnh0aUE6pUE9rrskGOYeuQYRlBRM+DOo myw7hHm9XqvlEPI2axFnjz24MmrN1y5MDiGzjwEpr4SCV7QvVgrw+KQtxrRIIq/Qdp 2V8xGXm00w87O5aADgDFmtkh5DDJrOwQCfeS3+X2OVIjla1PxeVrRdhoRp3IBLh6O2 NkUHc2BCGQHAqo+F8zIMjS1PJ/EhTiDFpg9LqZ1nV8XRrKZmzB7KpnwrVwyIig2cwJ nnm22JmUz7dVpZ10YhKwxPlOg83oYGRq9e0jLOEc7GIxVBwO/oFw9F6eYr0WnwJ3q1 48y3AeqSVsNrg== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 225384E08 for ; Wed, 25 Sep 2024 11:39:39 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id B574B3A03CA for ; Wed, 25 Sep 2024 11:39:32 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2024 11:38:58 +0200 Message-ID: <20240925093919.22929-1-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/22] lavfi/asrc_afdelaysrc: convert to query_func2() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bgmjX3t4PMHL --- libavfilter/asrc_afdelaysrc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavfilter/asrc_afdelaysrc.c b/libavfilter/asrc_afdelaysrc.c index c235f0c27a..cb6f236ba6 100644 --- a/libavfilter/asrc_afdelaysrc.c +++ b/libavfilter/asrc_afdelaysrc.c @@ -80,22 +80,24 @@ static int activate(AVFilterContext *ctx) return ff_filter_frame(outlink, frame); } -static int query_formats(AVFilterContext *ctx) +static int query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { - AFDelaySrcContext *s = ctx->priv; + const AFDelaySrcContext *s = ctx->priv; AVChannelLayout chlayouts[] = { s->chlayout, { 0 } }; int sample_rates[] = { s->sample_rate, -1 }; 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); + int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts); if (ret < 0) return ret; - ret = ff_set_common_channel_layouts_from_list(ctx, chlayouts); + ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, chlayouts); if (ret < 0) return ret; - return ff_set_common_samplerates_from_list(ctx, sample_rates); + return ff_set_common_samplerates_from_list2(ctx, cfg_in, cfg_out, sample_rates); } static int config_output(AVFilterLink *outlink) @@ -146,5 +148,5 @@ const AVFilter ff_asrc_afdelaysrc = { .activate = activate, .inputs = NULL, FILTER_OUTPUTS(afdelaysrc_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), };