From patchwork Tue Oct 1 10:54:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51969 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cb8a:0:b0:48e:c0f8:d0de with SMTP id d10csp208768vqv; Tue, 1 Oct 2024 04:51:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVL+/8eKt7US/kAQvlKg7rBGCm80rB3TYFoTC9DsvteH28EgJVaCfb8J1o4Y3syCGwF2BJejO/WYYp+2zL3ai73@gmail.com X-Google-Smtp-Source: AGHT+IHAyEgW6Bxy478Aol45hJeRDQaCTNySmrmyMxNOwBgKJHbAoDu6qU+Uue2bsKnlO9oeO/S+ X-Received: by 2002:a05:6512:280e:b0:533:d3e:16fe with SMTP id 2adb3069b0e04-5389fc774b4mr7995257e87.38.1727783480356; Tue, 01 Oct 2024 04:51:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727783480; cv=none; d=google.com; s=arc-20240605; b=FI0cqXNB217Bc0upnpedcPCzwaRugxGryeJvGO+0UghJK9iTwWKni1j5e3k2UTyCDO dcuugymjST6UsplwU6nwqiWF8XquKqn5Z0JdyJns/r29xY2O5ncynvVbhTsc8znx1Lvr MIa1e5Js9YEnipIIs2Ge4Egsgxq31eMLs3oRr8CIJycrY1Z5Cx1r64RNDJwWsjhx+zJa MCjLo0x7xodahytWIPVto/RaudnSZ98jBj0YT0d+cE7+iRi3QybKwUVdsqcTNqacc3uw xPML+wjuA7cFRdYGUHMe7r1tr4DDNDQS9+lX8fAZAesXlC04mtV0oQfwjsZKAEmbUGxJ M5Uw== 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=mB7nx/GlIN1PysGSTqOjV06jrAhBK0UdQxg6OZ0+6bY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=EooW0/6TFlLSZO6YOEIhe/Jen7iXwUAcXWXREyUAgek1h1+boKnhAjfEVW5V9JhuT1 zbUdwXKiytEA6pucbyzFd9w3eHqOCD063/Iw/iSjE+bxgIOcIb1pzycJ8qD8YwhLPilb JQj6ukKVLcPWL+ngAvhZbJ0BOTSXSzcjpKc5q2IK2ZjFQE1LzPCHInbrsvsAxkWshf2H I9FPttxIH+98jVHyP0R7aBEwc/BkA099i3CLq7p34WMVtFA5EpmWMsXZwXa2AGU9gyme FgDQ5y+E6OTfDKlXmGNxVjnkMRu0RGnNcixN+lJ0KuFcklkwcFXitPyRZJYs0nISQ/un TmzQ==; 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=AX6e+tpV; 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-5389fd521b7si3423566e87.116.2024.10.01.04.51.17; Tue, 01 Oct 2024 04:51: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=@khirnov.net header.s=mail header.b=AX6e+tpV; 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 C336568DCD2; Tue, 1 Oct 2024 13:54:58 +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 8D8EB68DBB2 for ; Tue, 1 Oct 2024 13:54:41 +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=AX6e+tpV; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 789244E1B for ; Tue, 1 Oct 2024 12:54:36 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 1GGRoIBOg0Rg for ; Tue, 1 Oct 2024 12:54:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727780073; bh=ByBgU5ps1mvB8xqPQdJ95cJy+1HcvvBkBY9S/vWTrpg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=AX6e+tpVJVCgXQcXJ46nancKSBgx6sOME9C5/bM/9rGo1sgN/1wUwPO7M+YxEYraD C4Zz7XErZktYdtjn6iDkkmhVu1DeXr5LIkvm1GyBlsjaDwyJoMUnovFw8YCGsnMBOS sMmwSxWLAtqfqYWn5+0RHyFr9vFOXYknZ+xx83sQosg9WxqqlYoQwKB50XQen1EIU9 4SkDdj+kLxybU/k0gCPC9a4m2wehy9EwZtJWOfYYrhj4caIg3FzELrj4NNohDptUrE e4jPX7dbMQELpavvnyYXXjkvnpx/l9PJ4Ub+CcsfdvVHbnVauDIyPeTguiF48FV7gr MYL+dLP89vzeg== 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 060894E29 for ; Tue, 1 Oct 2024 12:54:33 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id D15633A0F41 for ; Tue, 01 Oct 2024 12:54:25 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Oct 2024 12:54:08 +0200 Message-ID: <20241001105421.28967-3-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 03/16] lavfi/buffersink: 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: 2LJT0Uu7VdCW --- libavfilter/buffersink.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 0eded68b55..b0bcc26432 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -367,26 +367,28 @@ int av_buffersink_get_ch_layout(const AVFilterContext *ctx, AVChannelLayout *out #define NB_ITEMS(list) (list ## _size / sizeof(*list)) #endif -static int vsink_query_formats(AVFilterContext *ctx) +static int vsink_query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { - BufferSinkContext *buf = ctx->priv; + const BufferSinkContext *buf = ctx->priv; int ret; #if FF_API_BUFFERSINK_OPTS if (buf->nb_pixel_formats || buf->nb_colorspaces || buf->nb_colorranges) { #endif if (buf->nb_pixel_formats) { - ret = ff_set_common_formats_from_list(ctx, buf->pixel_formats); + ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, buf->pixel_formats); if (ret < 0) return ret; } if (buf->nb_colorspaces) { - ret = ff_set_common_color_spaces_from_list(ctx, buf->colorspaces); + ret = ff_set_common_color_spaces_from_list2(ctx, cfg_in, cfg_out, buf->colorspaces); if (ret < 0) return ret; } if (buf->nb_colorranges) { - ret = ff_set_common_color_ranges_from_list(ctx, buf->colorranges); + ret = ff_set_common_color_ranges_from_list2(ctx, cfg_in, cfg_out, buf->colorranges); if (ret < 0) return ret; } @@ -398,7 +400,7 @@ static int vsink_query_formats(AVFilterContext *ctx) for (i = 0; i < NB_ITEMS(buf->pixel_fmts); i++) if ((ret = ff_add_format(&formats, buf->pixel_fmts[i])) < 0) return ret; - if ((ret = ff_set_common_formats(ctx, formats)) < 0) + if ((ret = ff_set_common_formats2(ctx, cfg_in, cfg_out, formats)) < 0) return ret; } @@ -407,7 +409,7 @@ static int vsink_query_formats(AVFilterContext *ctx) for (i = 0; i < NB_ITEMS(buf->color_spaces); i++) if ((ret = ff_add_format(&formats, buf->color_spaces[i])) < 0) return ret; - if ((ret = ff_set_common_color_spaces(ctx, formats)) < 0) + if ((ret = ff_set_common_color_spaces2(ctx, cfg_in, cfg_out, formats)) < 0) return ret; } @@ -416,7 +418,7 @@ static int vsink_query_formats(AVFilterContext *ctx) for (i = 0; i < NB_ITEMS(buf->color_ranges); i++) if ((ret = ff_add_format(&formats, buf->color_ranges[i])) < 0) return ret; - if ((ret = ff_set_common_color_ranges(ctx, formats)) < 0) + if ((ret = ff_set_common_color_ranges2(ctx, cfg_in, cfg_out, formats)) < 0) return ret; } } @@ -425,26 +427,28 @@ static int vsink_query_formats(AVFilterContext *ctx) return 0; } -static int asink_query_formats(AVFilterContext *ctx) +static int asink_query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { - BufferSinkContext *buf = ctx->priv; + const BufferSinkContext *buf = ctx->priv; int ret; #if FF_API_BUFFERSINK_OPTS if (buf->nb_sample_formats || buf->nb_samplerates || buf->nb_channel_layouts) { #endif if (buf->nb_sample_formats) { - ret = ff_set_common_formats_from_list(ctx, buf->sample_formats); + ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, buf->sample_formats); if (ret < 0) return ret; } if (buf->nb_samplerates) { - ret = ff_set_common_samplerates_from_list(ctx, buf->samplerates); + ret = ff_set_common_samplerates_from_list2(ctx, cfg_in, cfg_out, buf->samplerates); if (ret < 0) return ret; } if (buf->nb_channel_layouts) { - ret = ff_set_common_channel_layouts_from_list(ctx, buf->channel_layouts); + ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, buf->channel_layouts); if (ret < 0) return ret; } @@ -457,12 +461,12 @@ static int asink_query_formats(AVFilterContext *ctx) for (i = 0; i < NB_ITEMS(buf->sample_fmts); i++) if ((ret = ff_add_format(&formats, buf->sample_fmts[i])) < 0) return ret; - if ((ret = ff_set_common_formats(ctx, formats)) < 0) + if ((ret = ff_set_common_formats2(ctx, cfg_in, cfg_out, formats)) < 0) return ret; } if (buf->nb_channel_layouts) { - ret = ff_set_common_channel_layouts_from_list(ctx, buf->channel_layouts); + ret = ff_set_common_channel_layouts_from_list2(ctx, cfg_in, cfg_out, buf->channel_layouts); if (ret < 0) return ret; } @@ -472,7 +476,7 @@ static int asink_query_formats(AVFilterContext *ctx) for (i = 0; i < NB_ITEMS(buf->sample_rates); i++) if ((ret = ff_add_format(&formats, buf->sample_rates[i])) < 0) return ret; - if ((ret = ff_set_common_samplerates(ctx, formats)) < 0) + if ((ret = ff_set_common_samplerates2(ctx, cfg_in, cfg_out, formats)) < 0) return ret; } } @@ -533,7 +537,7 @@ const AVFilter ff_vsink_buffer = { .activate = activate, FILTER_INPUTS(ff_video_default_filterpad), .outputs = NULL, - FILTER_QUERY_FUNC(vsink_query_formats), + FILTER_QUERY_FUNC2(vsink_query_formats), }; static const AVFilterPad inputs_audio[] = { @@ -554,5 +558,5 @@ const AVFilter ff_asink_abuffer = { .activate = activate, FILTER_INPUTS(inputs_audio), .outputs = NULL, - FILTER_QUERY_FUNC(asink_query_formats), + FILTER_QUERY_FUNC2(asink_query_formats), };