From patchwork Sat Nov 4 07:56:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 44509 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3aa6:b0:181:818d:5e7f with SMTP id d38csp336354pzh; Sat, 4 Nov 2023 02:23:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHNE6P9Ac6lxnREnTn56Dc6E6Zi5QCkRcSZY2VBKKKdfZ/p45l6xWrMjdoIqLypWLC8B/nS X-Received: by 2002:a50:9b0a:0:b0:540:3c85:14b3 with SMTP id o10-20020a509b0a000000b005403c8514b3mr22147468edi.36.1699089786395; Sat, 04 Nov 2023 02:23:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699089786; cv=none; d=google.com; s=arc-20160816; b=tYj7hn3PL+785YA/bYORyFJtBep6V1eBt8oAshR9u/oXEi59AKNj1XeJRBOsz+PYi1 hrFeGnzl3GYn23oj9QCNSqwQyjeQUDcXpF3N6dq5+MXAd69RqS+wnYQ5uYRttPW+bvJT S6rl0Q5CBZ7OlYLcvo2C+q+LLm5FtQJRbRHZPWh8CJOSx9MjxRpOpX2kYBVqN+A7w/Gn is0i3U6x765Cphj3xbm9yjRUUMCi/NcEbBH6/8rKQTU7s2tAbjus5SKvw5RRB821r/62 elera14roNqNAkRwqhXCq63cT//DczSsfGXJ/R8C5CTpVmFNqxhPHf417KmGFmI8h/vk nHpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:delivered-to; bh=dF2VaOR3JdHKCo0U8M0VIKltQisRkuw6Lggdq20cbzU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=rnwtxu7dYoQopeIRltsKBn0REEmHAme5JxN0wj4kUJ9YjXz1VeWOgLNsc2g8nchpnc WjpARlRd5GGMATwBJ0UYqCsbk5a11bRMoL7ync2kHWCNke4duKOeqS8LVjWpLZeVopaT s70FofsjPOzj5+1w/YpFceTeucVsWtkU1CD1t3VyJx78DO2fVzitUSSSpSFNXmKJg4sN V6ebdHkcuMPShKYzc9ye72ZMHG7ap6xfv6fn4VnuKQ10mvxrEEDSZUKI2cx/+izrD2lH cyfrxxMVsJGDwsICiQnj+XGFkiRNgVjdUTrEWQDYTz5b5Xcl/wv3oeZM0vZfanX5N5uV h2QQ== ARC-Authentication-Results: i=1; mx.google.com; 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 v26-20020a50a45a000000b005432fcb2346si1869603edb.385.2023.11.04.02.23.06; Sat, 04 Nov 2023 02:23:06 -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; 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 3A15068CE78; Sat, 4 Nov 2023 11:22:03 +0200 (EET) 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 3653668CE47 for ; Sat, 4 Nov 2023 11:21:55 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 9E59C1135 for ; Sat, 4 Nov 2023 10:21:50 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id nBiUnhPPuZgh for ; Sat, 4 Nov 2023 10:21:50 +0100 (CET) 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 A30D21102 for ; Sat, 4 Nov 2023 10:21:47 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6A50E3A0FDA for ; Sat, 4 Nov 2023 10:21:40 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Nov 2023 08:56:17 +0100 Message-ID: <20231104092125.10213-9-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231104092125.10213-1-anton@khirnov.net> References: <20231104092125.10213-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/24] fftools/ffmpeg_filter: remove an unnecessary sub2video_push_ref() call 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: jAsWaBx1Ey6U It only seems to produce duplicate frames. --- fftools/ffmpeg_filter.c | 3 --- tests/ref/fate/sub2video_basic | 3 --- tests/ref/fate/sub2video_time_limited | 1 - 3 files changed, 7 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index c738fc3397..d48974581b 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -2266,9 +2266,6 @@ void ifilter_sub2video_heartbeat(InputFilter *ifilter, int64_t pts, AVRational t or if we need to initialize the system, update the overlayed subpicture and its start/end times */ sub2video_update(ifp, pts2 + 1, NULL); - - if (av_buffersrc_get_nb_failed_requests(ifp->filter)) - sub2video_push_ref(ifp, pts2); } int ifilter_sub2video(InputFilter *ifilter, const AVFrame *frame) diff --git a/tests/ref/fate/sub2video_basic b/tests/ref/fate/sub2video_basic index a6eb1a34ea..314b7a07dd 100644 --- a/tests/ref/fate/sub2video_basic +++ b/tests/ref/fate/sub2video_basic @@ -12,7 +12,6 @@ 0, 183357, 183357, 0, 1382400, 0x00000000 0, 183433, 183433, 0, 1382400, 0x85547fd1 0, 185799, 185799, 0, 1382400, 0x00000000 -0, 185909, 185909, 0, 1382400, 0x00000000 0, 185910, 185910, 0, 1382400, 0xb6a8f181 0, 188606, 188606, 0, 1382400, 0x00000000 0, 188663, 188663, 0, 1382400, 0xb64d1a2c @@ -59,7 +58,6 @@ 0, 296776, 296776, 0, 1382400, 0x00000000 0, 300049, 300049, 0, 1382400, 0xaf08b10d 0, 301949, 301949, 0, 1382400, 0x00000000 -0, 302034, 302034, 0, 1382400, 0x00000000 0, 302035, 302035, 0, 1382400, 0x853a9d93 0, 303559, 303559, 0, 1382400, 0x00000000 0, 304203, 304203, 0, 1382400, 0x7491a87d @@ -76,7 +74,6 @@ 0, 326403, 326403, 0, 1382400, 0x00000000 0, 327193, 327193, 0, 1382400, 0x35b85f2e 0, 328285, 328285, 0, 1382400, 0x00000000 -0, 328360, 328360, 0, 1382400, 0x00000000 0, 328361, 328361, 0, 1382400, 0x83f103e5 0, 329885, 329885, 0, 1382400, 0x00000000 0, 329946, 329946, 0, 1382400, 0xbc1ca9b3 diff --git a/tests/ref/fate/sub2video_time_limited b/tests/ref/fate/sub2video_time_limited index c7d48d639f..0634d5857e 100644 --- a/tests/ref/fate/sub2video_time_limited +++ b/tests/ref/fate/sub2video_time_limited @@ -5,4 +5,3 @@ #sar 0: 0/1 0, 6072, 6072, 0, 8294400, 0x00000000 0, 6072, 6072, 0, 8294400, 0xa87c518f -0, 36101, 36101, 0, 8294400, 0xa87c518f