From patchwork Sun Jun 18 11:17:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 42195 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp57042pzb; Sun, 18 Jun 2023 04:22:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ZtCFABm3u1s1ji4AL4FWSit41fcisBs1vFeZZDWOIelDyIrAviRIXK9+0zzVs2fB76kcf X-Received: by 2002:aa7:d317:0:b0:51a:52dd:d050 with SMTP id p23-20020aa7d317000000b0051a52ddd050mr409792edq.24.1687087332736; Sun, 18 Jun 2023 04:22:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687087332; cv=none; d=google.com; s=arc-20160816; b=n7fG0GbkySUTW2fAK3L8apNucl4ZNvTrmDV0r/+eqdU6R3xBhf+B1MzNzxtvW52VtW pfqJl/UpfTjWnuwTzJIG7rp4E4spWoNHC7n7McoeFRq3bMk09JWOJlGfMLuNpRIpLoCd v4GmUS4sJzrpsiQRUBZwYXfQG9cSUddUHZ+Y91RinxDH/jUtHW5WCFopLjWPDzUNtVgH gaVfmWoB/rUB+5K0sOk5Zz6qnHWEE79YpEDVXz24yAA12IgBVbtP8StEsWSbYrvUq/IJ OcmJVAsfJ+bxXOoUf4URrRCCoNA1wLdztQe9ZJRJ9WQPclwjWST0pzGoQX677o1qutnm Chqw== 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=lY3HVzfTgqFzQ1pKIOXnIjrce+Fv3g5NOMU+EkqXx1w=; b=SbvrjyqhQ7O4ZwG4jA5EpgMos/Z10+UzvvpKw99DVW1mXxoN0Z5cd2FGyRN8/yNt1u RtRvI4YL+G5vZiAuu//vQIqhrpoo/T82bdCDwBZ1IA51N96RjT2/W6vqMj15HYN2qqZK iwGyFFQD7u15SWWds2XOPI3RRlTOsn+uNrKDlqlPbh4y/vWkaxI76USUflIdeQ/UkwOu TbbJPNeh0C2psysIR6sw7MTHHq6u8euk6ktMzEs86Ai1Vw8UHCUQVUrZua2J0v6b7bUJ vdMCB0/DJAIA4Sy4fZJGFOMVcA0Xj112zHzGrHvkxP/it7/1cm0jkhdXbra8KVuaT9Dn Bi3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=q3z6ZSQQ; 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 y2-20020a50eb02000000b0050e53b970e0si13409397edp.127.2023.06.18.04.22.12; Sun, 18 Jun 2023 04:22: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=@haasn.xyz header.s=mail header.b=q3z6ZSQQ; 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 7411568C176; Sun, 18 Jun 2023 14:20:26 +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 2E5D868BFA9 for ; Sun, 18 Jun 2023 14:20:16 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 4A3AF4B884; Sun, 18 Jun 2023 13:20:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1687087213; bh=xMzLoJSpFfHQVRRxVm2BAfmU2jPjL4uTl4JqW0xZcSU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q3z6ZSQQZjiPAXmJLqat0vurBbI4NhWyYltNUqz+qtOJi8MTcagwEUH/1VbhY/3AO v/2AjAHVx/5Z7OEJ+5xatj9KcI83Y5ZQDq/5TA+XaCDcXpJJd3Je6tlkBqT9eDLk8x ak7VVnRQ9DFqMiDNZFCASOrV1gzfJSSmFpuTab9k= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jun 2023 13:17:12 +0200 Message-ID: <20230618111955.40994-22-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 20/22] lavfi/vf_libplacebo: also skip cache if in FPS == out FPS 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: IMisMn1nUVRp From: Niklas Haas Fixes an oversight in the previous code which should have been >=, not >. --- libavfilter/vf_libplacebo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index f7b9bdba742..1085b6fdd0a 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -881,7 +881,7 @@ static int output_frame(AVFilterContext *ctx, int64_t pts) s->params.blend_params = NULL; for (int i = 0; i < s->nb_inputs; i++) { LibplaceboInput *in = &s->inputs[i]; - int high_fps = av_cmp_q(in->link->frame_rate, outlink->frame_rate) > 0; + int high_fps = av_cmp_q(in->link->frame_rate, outlink->frame_rate) >= 0; if (in->qstatus != PL_QUEUE_OK) continue; s->params.skip_caching_single_frame = high_fps;