From patchwork Sun Jun 18 11:17:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 42202 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp57364pzb; Sun, 18 Jun 2023 04:23:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ76RA/kNpQ7NRFO1ayMtueJWNYAL/QgiKA9gmktZl1qt8HaoTc0yvBET6yNa1wwn7Q6I4RY X-Received: by 2002:a17:907:7f2a:b0:97e:ab29:952c with SMTP id qf42-20020a1709077f2a00b0097eab29952cmr7277486ejc.2.1687087393417; Sun, 18 Jun 2023 04:23:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687087393; cv=none; d=google.com; s=arc-20160816; b=Q8KsoNOJVp+0+arhf7+NDbm8Wwdenw5gORIx2B3nYnvHvUdVhBPSO++F0a8tsZijLM S5GdKRzz1FEA9d4vVB/zpiGB398FdU6g2o6mzEEQkWwO7k5uJ/z32UBu7SMB67JnK/dD EvDx6AIicv+c68upkl/UW9r3igWGkS2mafy4qeTyAcjk9IeQFwa93hIXkJEIY0cd7gew XXjW3CUqaPs8dP1EbVwnUB570ZG7dN2h6hHV0RVVj3gl5vw78ZxAdO+e0psEKz3+4z95 RxKTDlJ9pK0wRrEu3Nq9GOW8xhrqFoFkpOcdV1q4p4qRhuKjD/yreyYI1NC2vWSLVVj8 sZdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=5HbwLuzCFFaQxy+e0NlOIIY68NRHl264UUtB18mxOrI=; b=GGHxjIwavCXaa4Ww7DuMwoNi472TlmBfPuTJEl5Hr1+FXg6V8pnraQZbuCn634bZH2 +MaUKDo6RLJ23jqr1HC51YkLb0t4Afk4RBxQsK0UUKAytYotXIpzXk1K73GlFHcpAkm0 1zDp3oeGPF16L1Rira+JaU8aH1i6o856J7oYyhGMA7Wl1xq9QqzMVu+7N/Ip0DLhx6mr c9ENJnXAwy4Hs5CGz/PCJBrihXzO+Wyin6ynHntC2U06JcVnCJOg+07B+ir1YUvnVQyI scOOwn8TcAlZafDmtKvB7GFyPMHc3TuZV2UjywwBEiaXg8NLymrZKBzxgfZuCXRVKs+8 HF8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=tWyQBcse; 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 a5-20020a17090640c500b00986508566eesi3197293ejk.272.2023.06.18.04.23.13; Sun, 18 Jun 2023 04:23: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=@haasn.xyz header.s=mail header.b=tWyQBcse; 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 0E50168C24A; Sun, 18 Jun 2023 14:20:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 76F0F68C081 for ; Sun, 18 Jun 2023 14:20:14 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 4FCA54B109; Sun, 18 Jun 2023 13:20:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1687087211; bh=6u5dwguzMyeAqG18mSnnkP4w8eZex70BjqKi3PtU2gg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tWyQBcseDPxdLUQr/0soOn6yA3WUZrVEfVvTwuMsCL1CcuFTwZibZrhODEzY2svkp qakPb+Jb8biGC1UgzLMbQdhdx3qh2xUc6W0sS0RjqTbkd/HTfCbNL5pG44A0PDFlet edrmyq7kKatf2PjNEuf8CXtWnmbugwCEekDm4qZE= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jun 2023 13:17:04 +0200 Message-ID: <20230618111955.40994-14-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230618111955.40994-2-ffmpeg@haasn.xyz> References: <20230618111955.40994-2-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 12/22] lavfi/vf_libplacebo: handle multiple inputs 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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oE6olZUIw5kR From: Niklas Haas This commit still relies on a single input for PTS determination, to be changed in the next commit. --- libavfilter/vf_libplacebo.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 5ea6fcd7920..a56ebbf54e7 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -979,11 +979,13 @@ static int libplacebo_activate(AVFilterContext *ctx) AVFilterLink *outlink = ctx->outputs[0]; int64_t pts; - FF_FILTER_FORWARD_STATUS_BACK(outlink, in->link); + FF_FILTER_FORWARD_STATUS_BACK_ALL(outlink, ctx); pl_log_level_update(s->log, get_log_level()); - if ((ret = handle_input(ctx, in)) < 0) - return ret; + for (int i = 0; i < s->nb_inputs; i++) { + if ((ret = handle_input(ctx, &s->inputs[i])) < 0) + return ret; + } if (ff_outlink_frame_wanted(outlink)) { if (s->fps.num) {