From patchwork Mon Dec 7 10:08:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 24379 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9C36144B3F9 for ; Mon, 7 Dec 2020 12:08:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81DB468990E; Mon, 7 Dec 2020 12:08:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BA136803CE for ; Mon, 7 Dec 2020 12:08:53 +0200 (EET) Received: by mail-lf1-f66.google.com with SMTP id w13so4521506lfd.5 for ; Mon, 07 Dec 2020 02:08:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=l55uMEVI/k8wvJCWYRlep/88h4EHc3G5mB2XiVlSj2g=; b=Ah80lT3D3uRFHJm/bYVBaaDYCUsMtv9bVd5LpQd9UW4Fa1CekfKFq3pawsa8KFKA6j 61NCylJdRNnMHpfgBCdbNSJqXrgXA77tA38mYP28iATJ1FZAGhh55XzLKkg4CCG610n2 Rna8joVf85luv6xZPuLrx8BPKSE2Wxc47eeDSJSieiS13N9W1wJgSk98e4XLiV01wxyp yVvfvKlGjA+5lQgmh47ZqmpJBfGRhnpxyu0su3d1x0CJnA4lE7RDNljzglkDpWodCyY9 bmYIVnrnKmpyLfeRHeFSBBcmRknZZNfzOb/WCtyU4RIaekwkSowjYtYf1qycCoIFVYlY qXgA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=l55uMEVI/k8wvJCWYRlep/88h4EHc3G5mB2XiVlSj2g=; b=IFmg+q5Zg13r/lwkkZsFTzVelU/m5FAyra7tPoOQXAWk2sor+wHaSu3t5AGW0cQgpm n5OApSra9999MApVxpXzSQ2B4qK6LqCp3/EbeBz9aX+3fwFdD3sym/u7inMBweX2DIbw g2w/o/s6A1jYmCXLE4fIavJWZHuEv1F7rHWxz4zFYdz4SAoeZaCiEcqXggeR4J4nOyX3 3H1gkD7kOY1wbxNFBpEL1f9uONlVzJxrphercaET/dr+atbS2bebFonxGjBdz4mBHWWF UCt1pYSbXxltZeN4PzEL3L08GUH9RuwQvyK5W7hn85uw7hqyd+ercGPIe9VL2fgIKv4a gT3g== X-Gm-Message-State: AOAM533CbWzbN8klbUoHNNZdhb8SxafVkl2XoWHtOg9B91QVGkM2q9gW c33pH5WvUS3z/uXGwZa/VXZ5luTwi/R5hg== X-Google-Smtp-Source: ABdhPJwNO+ruXjQ4f33rR5NQQMOnJMdkWcpXtFCQyi5QnzplbjbBi7ZRZ6UOVVRepiTyEzfqVo4oKg== X-Received: by 2002:ac2:5b1e:: with SMTP id v30mr3140432lfn.540.1607335731902; Mon, 07 Dec 2020 02:08:51 -0800 (PST) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id v5sm45061ljj.135.2020.12.07.02.08.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 02:08:51 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Dec 2020 12:08:43 +0200 Message-Id: <20201207100845.17520-4-jeebjp@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201207100845.17520-1-jeebjp@gmail.com> References: <20201207100845.17520-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avformat/fifo: cause immediate stream-time recovery if time went backwards X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" From: Jan Ekström This way discontinuities backwards could also get handled (albeit they generally tend to be incorrect to begin with on this layer of avformat). Signed-off-by: Jan Ekström --- libavformat/fifo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/fifo.c b/libavformat/fifo.c index b940d0dafe1..9fc524adbdf 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -338,7 +338,8 @@ static int fifo_thread_attempt_recovery(FifoThreadContext *ctx, FifoMessage *msg } if (fifo->recovery_wait_streamtime) { - if (ctx->last_recovery_ts == AV_NOPTS_VALUE) { + if (ctx->last_recovery_ts == AV_NOPTS_VALUE || + pkt->pts < ctx->last_recovery_ts) { /* Enforce recovery immediately */ time_since_recovery = fifo->recovery_wait_time; } else {