From ac40828ed24ff3d42ac68f2d45f36a03c34dc54d Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 17 Jun 2018 15:24:15 +0200
Subject: VIDEO: Make the video pts sync easier to understand

---
 video/mpegps_decoder.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/video/mpegps_decoder.cpp b/video/mpegps_decoder.cpp
index 99624dd119..81c1765475 100644
--- a/video/mpegps_decoder.cpp
+++ b/video/mpegps_decoder.cpp
@@ -486,11 +486,16 @@ bool MPEGPSDecoder::MPEGVideoTrack::sendPacket(Common::SeekableReadStream *packe
 
 	if (foundFrame) {
 		_curFrame++;
+
+		// If there is a presentation timestamp, use that for sync. Almost all
+		// packets with a presentation timestamp will have a found frame, so
+		// it is probably not worth the trouble worrying about when they don't.
+
 		if (pts != 0xFFFFFFFF) {
-			Audio::Timestamp ptsTimestamp = Audio::Timestamp(pts / 90, 27000000);
-			framePeriod = ptsTimestamp.frameDiff(_nextFrameStartTime);
+			_nextFrameStartTime = Audio::Timestamp(pts / 90, 27000000);
+		} else {
+			_nextFrameStartTime = _nextFrameStartTime.addFrames(framePeriod);
 		}
-		_nextFrameStartTime = _nextFrameStartTime.addFrames(framePeriod);
 	}
 #endif
 
-- 
cgit v1.2.3