From patchwork Tue Oct 1 10:54:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51968 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cb8a:0:b0:48e:c0f8:d0de with SMTP id d10csp208741vqv; Tue, 1 Oct 2024 04:51:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXWADg+n6DQ9zxx+rKSlH6fWXM1/iELvxz14WdYZhumIwPCeGxdcxm2ohR/FzryAwLyauX4lGWVtK6gn2NuURNd@gmail.com X-Google-Smtp-Source: AGHT+IEbchFx/A05KZztnt7hVrRS1ZKYrc5T6blNDjw3ornJLP72eiu29U6SwnjHRaj0g2bkCHeA X-Received: by 2002:a05:6512:3351:b0:52e:8161:4ce6 with SMTP id 2adb3069b0e04-5399a27a13emr714885e87.25.1727783476721; Tue, 01 Oct 2024 04:51:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727783476; cv=none; d=google.com; s=arc-20240605; b=VhrQnZUYS7mfgVqHINvysbfWPR1D1/DlHUwK4OPXeN/00a2oOGF44bdrGI7xnbGfoN JH/lmAXJAlYxufJv6A09uZ7AiYV1RPJAjZtmM4aHxDs3u1n+iiFbreei0/neE38Gfc1b zytmbKm351n29i5TqBSRZ8Qa7DYHqhTUNLXdlCR74pOM1L79u0c9GIv50ls0UhyAQT1M Jf5AwCwAFksMsJ/UitFmP5UFnaj3AV2KG8eGdm3OaKUB+eK+xdvEgd9kBbJva6fJzrGn VkQwqITg6Eh1iZxDcIlX9M629SdN/wqDZa/feIRmBUBEEyok3aj4rBuLucntdjHa03CF Ue+Q== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=KKCg1pLest2ApCXIIxyzWtMmdrgRKIHSNB66c5F8uTI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=d7flO1trN3bgH8rg+mIax4Lcv0W3ye3M8862uat0mTkl+X8i3mgPkzGeYXzUit1IUB kUP1WcSI9zDkIt1iRy+YERBeuqVvBQQo04JnvpiSuwId9ljVdERfAojw4YWE40Ebetel WrZMq2nxmvppNCXHps3+PmEKNQqa181+ICwaXIUwbZbZd5g2WC450rvi3TLeBvsQK+yS lyG7n6SzYpViV6zEZwt3cVSoaZ4T7fsyMBCVXSWUGFY11JX/0r531vPrmvUqzB4T0tmV fqm5JVHUMm9AYjHJfHZAIgylqr257U/j/Rwb2vLqDINKugrPSKiMZJWohkJCihJBKbkq HBQA==; 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=Ha4eJHhZ; 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 2adb3069b0e04-538a0461c89si3348788e87.634.2024.10.01.04.51.13; Tue, 01 Oct 2024 04:51: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=@khirnov.net header.s=mail header.b=Ha4eJHhZ; 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 18ADC68DBEE; Tue, 1 Oct 2024 13:54:48 +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 DADE068DB83 for ; Tue, 1 Oct 2024 13:54:39 +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=Ha4eJHhZ; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 1DAD84E19 for ; Tue, 1 Oct 2024 12:54:35 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id sTY9PZcHa6P6 for ; Tue, 1 Oct 2024 12:54:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727780072; bh=3D0mia7JZWF0P3fRU+iP1vspEq7122GS2dLrPqrZd3k=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Ha4eJHhZgdTYMlQnqeXmGVG0M1AZKpc9RVRs/6aXzlgAOtfKHDCSSobe9No7uQ4KX CRXnOuEadibPEz++D/RfRPZBYG8zcJ+sqXJ6sPzjDAcCWO42a7HL2I99+mZbnWACG9 ueK0BEPOlWBRr4PHgSIKd6+9HGO8D0t8/voZQRi5R12/ZrUIl3jBuLcvb3tpcNwSkx xs+F32JC95CjKa57Rmrifmha/WCC65KdWyw/GsZGhYNsZvTrkQRLxy3BON9SFfmy4x iF4QC1M8MfJXqIGpLD5FHp5ClZGaQ0QwnwYOc92GVzBErOaLu2Msk8fxNeA3/sCynx rozfqzbYWgwjA== 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 D7D0C4E16 for ; Tue, 1 Oct 2024 12:54:32 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 44F213A25F9 for ; Tue, 01 Oct 2024 12:54:26 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Oct 2024 12:54:17 +0200 Message-ID: <20241001105421.28967-12-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241001105421.28967-1-anton@khirnov.net> References: <20241001105421.28967-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/16] lavfi/src_avsynctest: switch 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: tTcDTopyFBLa --- libavfilter/src_avsynctest.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libavfilter/src_avsynctest.c b/libavfilter/src_avsynctest.c index f78cdd1dec..c46281c72b 100644 --- a/libavfilter/src_avsynctest.c +++ b/libavfilter/src_avsynctest.c @@ -93,39 +93,39 @@ static const AVOption avsynctest_options[] = { AVFILTER_DEFINE_CLASS(avsynctest); -static av_cold int query_formats(AVFilterContext *ctx) +static av_cold int query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { - AVSyncTestContext *s = ctx->priv; - AVFilterChannelLayouts *chlayout = NULL; + const AVSyncTestContext *s = ctx->priv; int sample_rates[] = { s->sample_rate, -1 }; static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE }; + static const AVChannelLayout layouts[] = { + AV_CHANNEL_LAYOUT_MONO, + { .nb_channels = 0 }, + }; AVFilterFormats *formats; int ret; formats = ff_make_format_list(sample_fmts); if (!formats) return AVERROR(ENOMEM); - if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.formats)) < 0) + if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0) return ret; formats = ff_draw_supported_pixel_formats(0); if (!formats) return AVERROR(ENOMEM); - if ((ret = ff_formats_ref(formats, &ctx->outputs[1]->incfg.formats)) < 0) + if ((ret = ff_formats_ref(formats, &cfg_out[1]->formats)) < 0) return ret; - if ((ret = ff_add_channel_layout(&chlayout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_MONO)) < 0) - return ret; - ret = ff_set_common_channel_layouts(ctx, chlayout); + ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, layouts); if (ret < 0) return ret; - formats = ff_make_format_list(sample_rates); - if (!formats) - return AVERROR(ENOMEM); - return ff_set_common_samplerates(ctx, formats); + return ff_set_common_samplerates_from_list2(ctx, cfg_in, cfg_out, sample_rates); } static av_cold int aconfig_props(AVFilterLink *outlink) @@ -404,6 +404,6 @@ const AVFilter ff_avsrc_avsynctest = { .inputs = NULL, .activate = activate, FILTER_OUTPUTS(avsynctest_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .process_command = ff_filter_process_command, };