From patchwork Thu Apr 27 14:25:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41362 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp563779pzb; Thu, 27 Apr 2023 07:27:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ46Z1Jr3Uy1xj/6uY8p0O6zknamLvC7zs39lsLCMjBQ/ozeDbR6jrZw0oTyBdFcs5OfX91x X-Received: by 2002:a17:907:728d:b0:94f:3074:14fe with SMTP id dt13-20020a170907728d00b0094f307414femr2143552ejc.17.1682605662166; Thu, 27 Apr 2023 07:27:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682605662; cv=none; d=google.com; s=arc-20160816; b=bGl1rIRTMCCeCboqY2i95X2gPXaIL9auswmxPagDT5bwdQAELnQ2F0XkFdDtsQlLY7 MaZo//b0z/c8cN3ORr676u2sJpG/Bmib8dtxFejqsnqTOQkKryAo6VeX8uozV4pAGrAH e8W6VoCVoMEkFnBB9vgx7LM0D29XEH0EiKg35cc2Ok6Hvp3MTqjd28UI+3GeYeXUFl1g G6QZc27jtwq9PTnjmrGpa1WePTTKj4/U2kjXb+dsL1D719rfyQ+dgqGTN1ctQS5FmbGt SXgdPvuLA+NqiWI2UOzRB8bVBOMd6UmFDCXQBJ/+Z63VspCMBd9PWWFcvyQPGVLfUI8O /LGg== 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=oD4AEpizdZvRBnQhn0fm/pdLCgUC//qyEeolyIDdpHg=; b=Ps51TOxTsoWcQ7QIsKY+INxePd82fSoCA3CfCJxiYbUzjNGkyFqMQnowo4hikG4kgb vC/jCoKbn8v2KIAj/Mc8b1qxN8mDg+JzHMPAL3aRGRvno6A033rsRBDM8nW412WIr+8U gTWjq5GYLSbCifPtbhQ4wXdP2nBpNw95qHSetwJFrJfK/WP44mp67zeIN2colCuld12U w0WdUu8e5pSLtKRGxpEh0Kq2R66WBZBGuy9xC8unVtjafIVvAdCxD31g5jaHnOeuqH9S 8G5rg5HjM6XCYRABIqaHuZXk4tqfA6nE6JuQccQd6c7zwycCpw/y6Pxg+rTfXJ355dW6 3//Q== 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 m21-20020aa7c2d5000000b005047ee841cbsi12793459edp.250.2023.04.27.07.27.41; Thu, 27 Apr 2023 07:27:42 -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 4181268BF8D; Thu, 27 Apr 2023 17:26:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49B2B68BEE4 for ; Thu, 27 Apr 2023 17:26:14 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 04E402404EC for ; Thu, 27 Apr 2023 16:26:14 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id L08ypI1Sb1C1 for ; Thu, 27 Apr 2023 16:26:13 +0200 (CEST) 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 mail0.khirnov.net (Postfix) with ESMTPS id D6B67240D03 for ; Thu, 27 Apr 2023 16:26:05 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C724B3A03F3 for ; Thu, 27 Apr 2023 16:26:05 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Apr 2023 16:25:58 +0200 Message-Id: <20230427142601.2613-18-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230427142601.2613-1-anton@khirnov.net> References: <20230427142601.2613-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/21] fftools/ffmpeg_filter: stop using InputStream.pts for filter EOF ts 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: kO6fGfzkAl40 Use InputStream.last_frame_pts/duration instead, which is more accurate. --- fftools/ffmpeg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index a69aceec9f..3ffc37729c 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1374,7 +1374,9 @@ static int send_filter_eof(InputStream *ist) int i, ret; for (i = 0; i < ist->nb_filters; i++) { - ret = ifilter_send_eof(ist->filters[i], ist->pts, AV_TIME_BASE_Q); + int64_t end_pts = ist->last_frame_pts == AV_NOPTS_VALUE ? AV_NOPTS_VALUE : + ist->last_frame_pts + ist->last_frame_duration_est; + ret = ifilter_send_eof(ist->filters[i], end_pts, ist->last_frame_tb); if (ret < 0) return ret; }