From patchwork Fri Jun 16 09:29:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 42139 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp1391224pzb; Fri, 16 Jun 2023 02:31:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6mIkKiexRLIDoI9olp54azlJfAkNq1U3CaQfj3Qmw23DjaAts7QFB9ruSmbrDtlsLL2HoT X-Received: by 2002:a17:906:52d6:b0:982:a198:29ec with SMTP id w22-20020a17090652d600b00982a19829ecmr974261ejn.39.1686907898948; Fri, 16 Jun 2023 02:31:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686907898; cv=none; d=google.com; s=arc-20160816; b=0e/tW/U762y+B6aW/2WJYEaPqDZ72MZQr+BO1QupqGXgnCZttFiOFXP4J65ytuqa2O z91/o4sfcbaZr+tVORtoiUcug3zhiUbmjSk2RfcHRd/zJnJcWRYDEg0lWDVzS27WGd6M gD4LA6aVfnHkYZxPQMRPD2dy6C0Novq90ET92uTrIYLDppLKhsuyOUgvK7tQLnLATowB lqY03or34vJuxxq+KRQBSPmo/JPdi7zYuV3MzmCp/wcwIwV9Tmsat0C+g1CwdnXdqfXM Ku96mEO3WvXLX3MQMpluamDnTz4fWBv6iuAIpHfMTNzZ7/KHkCrY8PBJGKY8rjmGxA2X 4G3A== 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=FzWbN4iONy166M50fHXmN93whQb37pfiDz8tYnR8GGk=; b=ZDPD5twm2s+sT2GjlyRHPVa1OZoGFBMBZciI6yrwUfvlmXxiLzrlE5MdYuQ+j8h7Qa dz7ZnWoypsPGep7WnwqY4gMZ+skOJmJjAMIl9Ucz3o7pfjXFb1l0ca479WfKcsmjH6R4 6KVDBbjlnOr3mMVwmmE1AXsk4hD1NpKAQmNfwMSzeKdUyGK6XZ4lX8Ze1X/yjqAXkBpj XSB30IHNz9M2JumRv2FUuQKSkPD1nORdz64rJxfKVPSiC5lyvTm/huC7haHP2VElRi/E O50NlYrKYfbDds96LRN0IrX8bQ8BjO76O9WhR3XogdsXxyh0QVZiVIzu2LVVYpLXCKcM NyyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=tb3zqw4D; 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 a7-20020a1709065f8700b0098285fc55e1si2383182eju.340.2023.06.16.02.31.38; Fri, 16 Jun 2023 02:31:38 -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=tb3zqw4D; 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 55AA868C5D4; Fri, 16 Jun 2023 12:30:34 +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 9A64568C5AD for ; Fri, 16 Jun 2023 12:30:28 +0300 (EEST) Received: from localhost (217-74-0-168.hsi.r-kom.net [217.74.0.168]) by haasn.dev (Postfix) with ESMTPSA id 76D72424F2; Fri, 16 Jun 2023 11:30:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1686907828; bh=4F4+XGKPudXwutHjxAfPxr+1Onluwdo91LnTRbdp2tQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tb3zqw4DxhOrjOgrlvGWxBiXw/hiWPobh/TAtD5gdGWucCNCJ6aEWrAH8LHrVgqG1 z6fkvjGuHeZIBQS9z4wRQiHy/P6PxirT3j6pV5YDO/QEhDu5+lABxmwf95wsip0Def 4J0wAZMS96el2wKhZh5JYbIIxtTmkRgeY4a93xDw= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jun 2023 11:29:53 +0200 Message-ID: <20230616092959.5247-16-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230616092959.5247-1-ffmpeg@haasn.xyz> References: <20230616092959.5247-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/22] lavfi/vf_libplacebo: make input-dependent vars dynamic 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: tl7+mBtGMqMf From: Niklas Haas Because these can differ based on the input, for multiple inputs. --- libavfilter/vf_libplacebo.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 5af8167bb3..f86493f4e2 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -739,6 +739,11 @@ static void update_crops(AVFilterContext *ctx, LibplaceboInput *in, double image_pts = src->pts * av_q2d(in->link->time_base); /* Update dynamic variables */ + s->var_values[VAR_IN_W] = s->var_values[VAR_IW] = in->link->w; + s->var_values[VAR_IN_H] = s->var_values[VAR_IH] = in->link->h; + s->var_values[VAR_A] = (double) in->link->w / in->link->h; + s->var_values[VAR_SAR] = in->link->sample_aspect_ratio.num ? + av_q2d(in->link->sample_aspect_ratio) : 1.0; s->var_values[VAR_IN_T] = s->var_values[VAR_T] = image_pts; s->var_values[VAR_OUT_T] = s->var_values[VAR_OT] = target_pts; s->var_values[VAR_N] = ctx->outputs[0]->frame_count_out; @@ -1191,13 +1196,8 @@ static int libplacebo_config_output(AVFilterLink *outlink) } /* Static variables */ - s->var_values[VAR_IN_W] = s->var_values[VAR_IW] = inlink->w; - s->var_values[VAR_IN_H] = s->var_values[VAR_IH] = inlink->h; s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = outlink->w; s->var_values[VAR_OUT_H] = s->var_values[VAR_OH] = outlink->h; - s->var_values[VAR_A] = (double) inlink->w / inlink->h; - s->var_values[VAR_SAR] = inlink->sample_aspect_ratio.num ? - av_q2d(inlink->sample_aspect_ratio) : 1.0; s->var_values[VAR_DAR] = outlink->sample_aspect_ratio.num ? av_q2d(outlink->sample_aspect_ratio) : 1.0; s->var_values[VAR_HSUB] = 1 << desc->log2_chroma_w;