From patchwork Sun Jul 25 18:11:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 29052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3151032ios; Sun, 25 Jul 2021 11:39:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhhZPRJS11vwVyRLmlEqvNUD0B1dw7Jm20GALvGNlfTeGke22k9hS7gbK8JklpWJp/gQ/Q X-Received: by 2002:aa7:c9d8:: with SMTP id i24mr17479636edt.79.1627238349465; Sun, 25 Jul 2021 11:39:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627238349; cv=none; d=google.com; s=arc-20160816; b=RnDhJBuv9ajfZC/CVmfHdgFaJ4o7KpIbxwG/Ze7IA/OLM7lkOoyPK6BbwZ4ViEAhu8 QTnyfpleu6DHdJKdtigmUKOxeKDCCYUHYaL55PQoZuS/nk0A8yzl1xmB2tJkZggklteN q8xK3xQb0yb0nywn4x5a+WIWqAxf7DEcbxw+pZqBPDCGRFv5gKa50DTu9tYCodv5y35e ddteJ+re7G7JuyeAxUWW7c4pH+GMf51WkLDjFrUHUznD+gSyo97aLw38SscYxL7DJ5jO NvTDYH9Tz+5QveSo3gU+rliWwYr7oRrQrqgP1pSpAP0XxX0j9dNHjSLhg/paqsiBQaYX 9HBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=BnsrWOSFNCGGQqBpbWN6H29n+G2Rugg7phtGsKSKydc=; b=ym5EkXXdPF6VWaApXne0rCSfJ12BZiaMuWlf/1RPNvLuAtGEGB6yC9IfAgrL30ws23 jDk2CB8+tPTXOzM0fThjwPAzZfmvza8gkXS5zpNRjgjadbQbPnzM6LzSarzU4QoRRNPI QPdlAVm6BHo23MclCn25V/533tttqCLxrw2xizYTy5zsSI2HTBrba3bzhdbMhlcLLVVW Eh3KcnpXc48RnfaBBQKme3qjYDCICz9pkjvuLEZgJfk5cdj1tT/r9LEIA+4Faykn7G6G x8i05QLlVQ0QMa/g6X98PdWkTOjL/1DdTcL7wReynacqowrBB1p/VnceOpSRQJJ7Eoyi EqfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QwvXJr3n; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c9si6271576ede.568.2021.07.25.11.39.08; Sun, 25 Jul 2021 11:39:09 -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=@gmail.com header.s=20161025 header.b=QwvXJr3n; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B767668A54D; Sun, 25 Jul 2021 21:39:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3BE36891DA for ; Sun, 25 Jul 2021 21:38:58 +0300 (EEST) Received: by mail-lj1-f181.google.com with SMTP id x7so8460683ljn.10 for ; Sun, 25 Jul 2021 11:38:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Hi1EOV4Fnkf8IocZo0x4Ro5v+RTQuORXi6JmFQcMfJg=; b=QwvXJr3nl55hAL4LtdD4RWVAnjOJG3ZnGVvOZgjz6Co8EEB8qMdZFA10RBGovP6qBt Y5hjqEFREe9kZa7JbqwiB+hkBVp6m3h2oDbOb1Do1VJ5DsgMx6HhttP6aFpnJOCguL30 XCHdWseI0Vl0YyJ2lD0zkJZe/WF0x2PHJ7BkwmDwc/39nBStKYKiQdOuvaXgeP32c7lr Yw4UXuu8S3pBF4Wl527wXr/eT0aPW+chRroEb6Uz+hemt+l2D+HhpvpvlLmnXMglAYht lLpz9Av/PBL0ObauLNSxbVhXF2vnyV8gx0fyjipcUNAD2PtjYlXbfS8WUxNjhH1WNSHv VsmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Hi1EOV4Fnkf8IocZo0x4Ro5v+RTQuORXi6JmFQcMfJg=; b=NFrDuo3njt/TPHY0cxH7+3rhh0P2J1UdpLQq9hMTffQtd0QD5dEXXN0zckpYUiVIDj Y2YGXeup4FoJqYH8tM4j0lImPnzbUA8rhipgfk2lYeFwYNIXjSnCG6v1WESHm+hc+Gkx UgjFJgNiLdtdlDFwRJ9+eBs3aWF5MKB5bSqV8UyelJK/8jdQ+0yuoF6IXpaRABEOcsPu E2zVv33qnhcNi0Y3Ihx0Zozq+6ChYH2bK2Y1b2HlbDX2egSwiT+YPXict+lrq40/t6nG JL0TwFVSQfF/QWLz+jQH/6rd+1xetFujV6JBo/EPdWIcl38yg8xDt23y002Cq33PSPJi pzCw== X-Gm-Message-State: AOAM533GzdQFAW/n6ILijJ8UfT3KdbMeIm/STtqPUxDCxkewc9t9cWiA NMhRSHWj3ZA7rbqaJmVn3ZLhQNNLRLg= X-Received: by 2002:a05:6402:111a:: with SMTP id u26mr16944979edv.260.1627236687007; Sun, 25 Jul 2021 11:11:27 -0700 (PDT) Received: from localhost.localdomain ([95.168.118.139]) by smtp.gmail.com with ESMTPSA id x13sm15610961edv.40.2021.07.25.11.11.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jul 2021 11:11:26 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Jul 2021 20:11:18 +0200 Message-Id: <20210725181118.24110-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter/avf_concat: fix EOF timestamp 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DIBUKHKF4Cc9 Signed-off-by: Paul B Mahol --- libavfilter/avf_concat.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index cb46f52a04..8bb5a5d618 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -402,7 +402,10 @@ static int activate(AVFilterContext *ctx) if (ret > 0) { close_input(ctx, cat->cur_idx + i); if (cat->cur_idx + ctx->nb_outputs >= ctx->nb_inputs) { - ff_outlink_set_status(ctx->outputs[i], status, pts); + ff_outlink_set_status(ctx->outputs[i], status, + cat->delta_ts + av_rescale_q(pts, + ctx->inputs[cat->cur_idx + i]->time_base, + ctx->outputs[i]->time_base)); } if (!cat->nb_in_active) { ret = flush_segment(ctx);