From patchwork Fri Oct 4 08:42: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: 52024 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp261587vqg; Fri, 4 Oct 2024 01:54:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVgjZFd0Cb4FIASDzXOyQn7A6vYX0rrXpp/UU8fXASsW++Rt0QTTfF5UiOFiPD38eq/T0pk6C03wy28ZHHZEEaV@gmail.com X-Google-Smtp-Source: AGHT+IEiC4kOr7rCnlfB5HXow6SD9ziMaJxWdZ1uGkE4Doma04fcVJRScUCWYYRP4IM6YkJ1lE7o X-Received: by 2002:a17:907:e8e:b0:a86:851e:3a2b with SMTP id a640c23a62f3a-a991bd79ff2mr185766066b.29.1728032053473; Fri, 04 Oct 2024 01:54:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728032053; cv=none; d=google.com; s=arc-20240605; b=Y+5kgR19kqNMbnifDbszZcyvQ9Pdsg8t08l4LGZSr12U1cRB31FOjqLcBnfdQXeb3J 0IicbQ4rV6AGC4580ndUfn5Z+Kke7bUUzW3DJbwbC+jAgLyxM5LXK/fcSfBw1CubmwKr /OBOfwEXGcy3lsH+yMvl6cE7G2OCvrH3r9MmekIdeWqCiv0V1fb+dfJX9hyDPiFN8Pt7 lHCeTm0PHgdBhCPeQ5fZyeTbaYsZM2Nefaq70Kg5b1NoTy28PfQCyQwLC1JwLNuiTPXb k9jhymFOntqRzFnTRF6E3GPz/T8Ep+O1rRWtYY6X0lzWm88+2fkBWN+Vz87ijS8GgnQx pfSQ== 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=UwIIpq05snPf1OKiF6Px9ApgEPE/9ZRQAHf/LWhqhZ8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=g6SQqTwelWhWjhH8mv6WqFAtW8X/AtoyRc82KCN5MsHmMx3Sk9uE8yf7brC6sC/63e VxWivM2gJr2YR+50S+i5LJiB1AyJfnD5QnmDgYuX1V3yGbJUVKZkHDad6wt2dKcBTg3H ncO4r1Nf6+obMIz1AHw2I8qVJHMsBwLVTMi1d/4TuObXWkWuFYuIZvr2SxUQX6RBsHRx 3e4T34ep/WLk7iB4zgONJG86mYOCfWHk0EmCZOi5IruYq/v4C4O90JRnjhAA3BBDLLNS B8QUHdFA/GKXq0+kdoDO3coptkorRRJXphW8+zir8cVbH9tSJugULI5dBlqa5vre6mee JDSA==; 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=BjtNPOHX; 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 a640c23a62f3a-a99110fd3b5si182889966b.923.2024.10.04.01.54.12; Fri, 04 Oct 2024 01:54:13 -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=BjtNPOHX; 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 33DF368DB91; Fri, 4 Oct 2024 11:43:14 +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 477A468DA61 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=BjtNPOHX; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id BFD5F4E2F 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 jagg5VrHNsjl for ; Fri, 4 Oct 2024 10:42:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1728031370; bh=bjemylvpb/ej4Rm5Y489IsLyP1gAKKnNo3mLE7ZD7Rs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=BjtNPOHXlJOx94QP8Tbn7E1SBLD7LsjY4zXsuPYfRF4f5gV6ZrXte0IYxeHqyOVfb KM3hLHouj4lMVx3zOs9nTWB0EreW0K7G8TDazlKumTbEQZ9blZ2/JkVlHa4jwmeRKs 33GDnBq83wHHoq3cS4DPMumxHlU6WRxiuuPjh/oG07lZ/ClnMNJwbV/uMZzWrH+vai ne0i95SULflzTTBT413l16ZxKeNY7rT7WnbEBU/gCuB9a+Ke9QDnokbJmBycnlhAnR Azao6KsSzADv8nSf35kTBU7fa70mnk5cVk/T9BRxK/lznUzlB8DkXAS7Mywel3qUTV K9hRGZrnJmB4w== 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 E1AC64E19 for ; Fri, 4 Oct 2024 10:42:49 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C28FB3A1E08 for ; Fri, 04 Oct 2024 10:42:49 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Oct 2024 10:42:17 +0200 Message-ID: <20241004084230.27419-7-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 07/20] lavfi/vf_datascope: 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: ivRDLQRtsueY --- libavfilter/vf_datascope.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_datascope.c b/libavfilter/vf_datascope.c index 7b4cb52ee8..a4f6c69bfd 100644 --- a/libavfilter/vf_datascope.c +++ b/libavfilter/vf_datascope.c @@ -77,9 +77,12 @@ static const AVOption datascope_options[] = { AVFILTER_DEFINE_CLASS(datascope); -static int query_formats(AVFilterContext *ctx) +static int query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { - return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); + return ff_set_common_formats2(ctx, cfg_in, cfg_out, + ff_draw_supported_pixel_formats(0)); } static void draw_text(FFDrawContext *draw, AVFrame *frame, FFDrawColor *color, @@ -455,7 +458,7 @@ const AVFilter ff_vf_datascope = { .priv_class = &datascope_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; @@ -735,7 +738,7 @@ const AVFilter ff_vf_pixscope = { .priv_class = &pixscope_class, FILTER_INPUTS(pixscope_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = pixscope_process_command, }; @@ -1134,7 +1137,7 @@ const AVFilter ff_vf_oscilloscope = { .uninit = oscilloscope_uninit, FILTER_INPUTS(oscilloscope_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = oscilloscope_process_command, };