From patchwork Tue Oct 1 10:54:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51956 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cb8a:0:b0:48e:c0f8:d0de with SMTP id d10csp175028vqv; Tue, 1 Oct 2024 03:54:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVMj2IFyNNxTXi40z9eXBdartnWulL2+jDoIdR8eZFt4eQRlDbw9+PhCviTmgfq/QraUuOuDSfVjVpNGX794k4g@gmail.com X-Google-Smtp-Source: AGHT+IHJzMx/M7Il6lrzKstNUQ0ZEPv6gReSts5ehzT0Gh2sLyA7vEBXBhhzJvZQhnAgtb47Fapb X-Received: by 2002:a50:cb87:0:b0:5c8:7915:4c7e with SMTP id 4fb4d7f45d1cf-5c88260f0b3mr17802204a12.36.1727780095709; Tue, 01 Oct 2024 03:54:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727780095; cv=none; d=google.com; s=arc-20240605; b=kXklTPo2BztP1hF553Q1T2Wn0beaiALBYACMlrxfH+zcoa/9xBsF3V+iEgU9gg1zrk u1ZwxBRVjaez/DdwbNf8VwtggwAkMb92/sTOnAV0ZIDPHK6ZYqErYBVkLVz/lSWf31UR ydOO2lJI7Dksyi/ikhufoqJkOeUQHGWzk5DZ34Rn/iJfKk+r9ykVAmrDH7g1Tzw3MRMz 7vKcPTjdlqGrm5QBmpfN+SdjJVkZrA0quHV0V9OkcbItjfI3dL7JMzY8r05E+oWRaYpX 7xYMIBJki0BYPC9Vzw1bGO0R2d3UOjKtYQuzgOa6ce/rJaYv+kg/fU50k0WK9jkM/Abs 31VQ== 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=qRe+MSjhtqFlntnyE8RfCwEu1BZuSwNIAUx+J86WX14=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Y993MEOgo2dxeUS/8ufXz0ya5cjzyBy+cQADbQpsIqt1U6Y7arThphFAHb8N+nJs4M XZ4Equr2FDuNHZIYNCbe+S3Ln99pJl9jdO/O7JK86de9QIsq/4GVgJSn4WucgDOEaRUG 60EQgZ2CzaBcraK/O6+eY1iXM03qmLZQzQycS+FEuAiw+AGxjw81NH6C0ODHQ/wFrv/s TY47eNzl1CcJC4EIFhK76KPioZ7k4SP04bBK/1QA5WOpZY0elLzm4CSthnmgDJ/n5AwM G2SjOKXJePhdTBMqvLMG2v6835VXT1a2tntrYIx4Vxh92t3UMorvtG9b2/3o0ThKbfrA MVAg==; 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=A+1YHZkz; 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 4fb4d7f45d1cf-5c882490001si7290917a12.233.2024.10.01.03.54.55; Tue, 01 Oct 2024 03:54:55 -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=A+1YHZkz; 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 BB26068DB35; Tue, 1 Oct 2024 13:54:41 +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 81B3168DA28 for ; Tue, 1 Oct 2024 13:54:34 +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=A+1YHZkz; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 15D594E02 for ; Tue, 1 Oct 2024 12:54:34 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id dJCy1L_FVT-t for ; Tue, 1 Oct 2024 12:54:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727780072; bh=W90oDqBVt0RR0WOybVa4lqwN1y6DOzdYuE/VlvTgdYQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=A+1YHZkz0ysy0ZJTXHQ/Xd19/3TTE0q1ooGthT3ylWMy14OkzhyaEHfALjsdHIc+Q yCfwqZ+vDhwa6xvOW2kudwMIEIQReBAF+fJcEpHg6D8m1RIPzGp7p0CNB54TcmFbml c/NhHd5ZckXE2rb7+SJz8aKMQm0VJrPzf26eGKGllj0Lrf+F6E4xR4tIpbEx37Mrat N1I9pocCXJClKMQ9qq3la81ifuNoZiMosqhppfjhHWhbeltvWmSSi2Ew0pDqf/49bI l1f1MRnxBYEQgwBXz95aFyNxabG9Cl+8szyFWSL5xt9h6Wi0hAFcwDEJWX2yzlImQ7 mnOB7KLLhFmiQ== 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 CC7F04E0C 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 161E43A1E5F 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:13 +0200 Message-ID: <20241001105421.28967-8-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 08/16] lavfi/f_graphmonitor: 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: Vg6qCvZgC46i --- libavfilter/f_graphmonitor.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c index 0ed1085610..453d1e82de 100644 --- a/libavfilter/f_graphmonitor.c +++ b/libavfilter/f_graphmonitor.c @@ -146,9 +146,10 @@ 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) { - AVFilterLink *outlink = ctx->outputs[0]; static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGBA, AV_PIX_FMT_NONE @@ -156,7 +157,7 @@ static int query_formats(AVFilterContext *ctx) int ret; AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); - if ((ret = ff_formats_ref(fmts_list, &outlink->incfg.formats)) < 0) + if ((ret = ff_formats_ref(fmts_list, &cfg_out[0]->formats)) < 0) return ret; return 0; @@ -587,7 +588,7 @@ const AVFilter ff_vf_graphmonitor = { .activate = activate, FILTER_INPUTS(ff_video_default_filterpad), FILTER_OUTPUTS(graphmonitor_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .process_command = ff_filter_process_command, }; @@ -605,7 +606,7 @@ const AVFilter ff_avf_agraphmonitor = { .activate = activate, FILTER_INPUTS(ff_audio_default_filterpad), FILTER_OUTPUTS(graphmonitor_outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .process_command = ff_filter_process_command, }; #endif // CONFIG_AGRAPHMONITOR_FILTER