From patchwork Fri Oct 4 08:42:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 52030 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp268886vqg; Fri, 4 Oct 2024 02:09:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXzLDWnqsKZv3XPvi5Bwnn+s4AJm4g0N1rqA4rkC+fn1ugRyOIhHtKaFC+GurnXdxMfEyZLsftUaEKshUWrxGgt@gmail.com X-Google-Smtp-Source: AGHT+IEPR1aHrkFa1ZI5Dm6qu/r3SIGpkIaXN5FCr2XQNKwj2pD3vxQWo7GXBr4FAPsoOL3v77LS X-Received: by 2002:a05:6512:3d23:b0:52f:1b08:d2d8 with SMTP id 2adb3069b0e04-539ac1433e9mr683602e87.7.1728032952162; Fri, 04 Oct 2024 02:09:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728032952; cv=none; d=google.com; s=arc-20240605; b=Li/XanUtK0ipLPi+aBEyBrG4yrDM7X3QnqAcaaO+6fkNz4as3jQNe1QMlvYzl+RehY ooBNZ/ARDDDgZmqBjysEde8s3u2gsTswaKQvbPIJfcyAEXkfL9q6PHpshlqEAhHqPPHq EkaTESd5LZ3s/tAryapfwjPGzfB2eErEu13+9rzezr8rdTKuKg1pqmnoeZeZAQSXoFQv NV9bBtwd9K3kvoPoDGmJvJICPffv+KRtGZ3EPrjccjpdBP6UR12IXuWP3zxg1AJLFxzS fQ6twKDfPe/cXkEbCgPrEruo4Pj+sN/mnPzUwnLnBjtcxPToqMnTj3fQof0Qz+fou78o z9ug== 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=Zw6IceP1enkIWRNOVzMlgH5WFLv2ZEdeIP6jocb3Yv0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=CmDXoMN6swQttUiZXrBC+o77PWoThAqMcvU7geD8j4ChAUlSgGWLgK8AMD9BvZIWi/ oJVgYOeu/uyDtFWW6TNNpm3X6VID3U/qTsxMaWDe6L9039mFVSvEMeSkLpjwXViM8WeH BbwaQaKNOrN9jbYLwWAkuXpBHWTiPbSbFvole8EKdNSH+EjMUkx0vLtsj/RTi5Xi1JHQ 0nG4T154gZXtgCzxtoCj5aXbJkzImQ3yBg+jPAOh4UE+C+tUVuyU3oj2gNVHlnf0rZas PZlEMGc1pRHDsSAkm9D0OMhB0sEDhNPM3zMyo6Rex8OEMHuZcfvNDrwiVmoxSB/SHr76 1/MQ==; 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=i4QRnfnL; 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-539a824e809si1096785e87.20.2024.10.04.02.09.11; Fri, 04 Oct 2024 02:09:12 -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=i4QRnfnL; 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 19CE068CFEA; Fri, 4 Oct 2024 11:43:10 +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 2FA8868DA58 for ; Fri, 4 Oct 2024 11:42:57 +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=i4QRnfnL; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 33A024E2B for ; Fri, 4 Oct 2024 10:42:53 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id P1pzba3dCFc2 for ; Fri, 4 Oct 2024 10:42:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1728031370; bh=MhcVU0fLr+TqPjbwG0wYbFKODWpmV9IqsPbx9bUsmO4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=i4QRnfnLROber8hz5O0okvkPAnHK1p4t4V05AwsAoX0e32Q+ImJ2vWp6KOEjEpL8R GL32B77uG3TUXPB+UiimHX9GQ4deWs8Z32+MG9PNWqaZ4dE+8UdL6CSbIa191LIXYN FMTFrQXnJ26PTclTGj+WkdCtBrctLoSsGzeRF+QiFUsRotgV8jKKLWxQfQEpC7+FzZ JRk1XMMRFOSekQUyT14XRJgm+NLjjfhxRrPZyyVTpqL5qfE2wz0PWY5MU2yvVXF5ch 9WRjDYzCD3n5z3ltIA9eOxOxD9UBE6USWCX27QqPy1pikQdVRIF0ysANXfFIgZM8qK /l6sUQ3JdgObw== 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 52FC94E30 for ; Fri, 4 Oct 2024 10:42:50 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 46EC83A0139 for ; Fri, 04 Oct 2024 10:42:50 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Oct 2024 10:42:28 +0200 Message-ID: <20241004084230.27419-18-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241004084230.27419-1-anton@khirnov.net> References: <20241004084230.27419-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/20] lavfi/vf_format: 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: oU7ozCu4xFgZ --- libavfilter/vf_format.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index da39625fec..9dbb174c42 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -149,14 +149,16 @@ static av_cold int init(AVFilterContext *ctx) return 0; } -static int query_formats(AVFilterContext *ctx) +static int query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { FormatContext *s = ctx->priv; int ret; - if (s->formats && (ret = ff_set_common_formats(ctx, s->formats)) < 0 || - s->color_spaces && (ret = ff_set_common_color_spaces(ctx, s->color_spaces)) < 0 || - s->color_ranges && (ret = ff_set_common_color_ranges(ctx, s->color_ranges)) < 0) + if (s->formats && (ret = ff_set_common_formats2 (ctx, cfg_in, cfg_out, s->formats)) < 0 || + s->color_spaces && (ret = ff_set_common_color_spaces2(ctx, cfg_in, cfg_out, s->color_spaces)) < 0 || + s->color_ranges && (ret = ff_set_common_color_ranges2(ctx, cfg_in, cfg_out, s->color_ranges)) < 0) return ret; return 0; @@ -197,7 +199,7 @@ const AVFilter ff_vf_format = { FILTER_INPUTS(inputs), FILTER_OUTPUTS(ff_video_default_filterpad), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), }; #endif /* CONFIG_FORMAT_FILTER */ @@ -217,6 +219,6 @@ const AVFilter ff_vf_noformat = { FILTER_INPUTS(inputs), FILTER_OUTPUTS(ff_video_default_filterpad), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), }; #endif /* CONFIG_NOFORMAT_FILTER */