From patchwork Fri Jun 16 09:29:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 42145 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp1391775pzb; Fri, 16 Jun 2023 02:32:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5hIuMxWUROmb6ORau+Ir2t5y3KZ91rDhzokSfs/CNkLDvumLOlokiYZU398E7mkeLorgzy X-Received: by 2002:a17:907:16a1:b0:980:1db8:d961 with SMTP id hc33-20020a17090716a100b009801db8d961mr1429614ejc.67.1686907953208; Fri, 16 Jun 2023 02:32:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686907953; cv=none; d=google.com; s=arc-20160816; b=DKkrpTLp8AMliorhzvruCdWhEmRSe8DlZpHbnLy/P6jnajkUYaOxvh5BM9unNXu/uV w0KW7bgzBn7/iE+nKu3F8jDKsSCG/+1fvfC/pn/8MZdMXGynuI+TTX+zqvWFD/5zkWk9 7tsBg83TE9dImLSDI2L/7etRW4qG4JxO+mJtQZhmvDW/K5gI6sDI3EpTjJi3wdrAJiFy YNm6KgJjt8JMGtrctDf2Ei5eTAYHM8XKHmMT0ZQ+TDOqutAH9/nQPqeuyykohIk2br1o 2dlz/RIgn2hqi5xBpDUx1VemdzHGGXVqD5m4rzt4v2nzSt7f1Gu+1Mj2yAB7OgV6G2nm dvpA== 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=V+o8rlFC5aIYBFHnuLT2wKNvzoghJ68EhVLBlDaNS0c=; b=VMUcJcJRkVE9C7We+3hIv71Sb4NpVRoENFmgTPl2v+pCP6NkO+3de7RScIElPeGAoo QprvVqv9D63WQzEih8P96+2lnsd3iXGuHZiXpq9p6uRSffUq2a4cXCLEp7mGpZ6xIAMU +XovVXDTnUVyFrwnU4XtZmw6dWsUz/hLD1t3m+gwVNfNxAa/ebKK94fr0HsfeX6b15Iv 4q+QT9F7YNjLZogEeyysbLFVuMr/ozksEemANwN94iqDdBPVlLfWLEn04EvmOsFSLMaw 53O1SOSivuhMfo20cLRH/Z0p5wp73q4Bs74RoVQmsC+8ujjIgJd84EDf2/aDf7ZsMvkh V9/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=qsdc03wF; 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 q13-20020a1709064c8d00b0097860824fc1si10438775eju.819.2023.06.16.02.32.32; Fri, 16 Jun 2023 02:32:33 -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=qsdc03wF; 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 17F7E68C605; Fri, 16 Jun 2023 12:30:40 +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 4E12A68C5C1 for ; Fri, 16 Jun 2023 12:30:30 +0300 (EEST) Received: from localhost (217-74-0-168.hsi.r-kom.net [217.74.0.168]) by haasn.dev (Postfix) with ESMTPSA id BEE2242DAF; Fri, 16 Jun 2023 11:30:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1686907830; bh=IPTvDd1ypQPPAWWAWTghunKyOk5l4etsIQxERXNSV/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qsdc03wFZf4lt7xys5QnpiQHFMcnr6nw9jAldyNgjFroQZ8ymek58GSryalhavJQJ mDf98mlCJQ3yhH48hJyRgBTZkpuXj3cwcHedp4bmorEIg/Ja7Ea/jTBx1GEkrUq0/o AdnZRUOR50/pkkVEvz8WY0LmAL2XRP1DPCVzNXdU= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jun 2023 11:29:57 +0200 Message-ID: <20230616092959.5247-20-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 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: WZUtUU4j6duS 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 b78391441a..9b1526f19e 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -879,7 +879,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;