Psmf: Ignore last timestamp with old PsmfPlayer libs

Until 5.50 Fix #6574
hrydgard · Aug 15, 2016 · 00a379e · 00a379e
1 parent f233915
commit 00a379e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Core/HLE/scePsmf.cpp b/Core/HLE/scePsmf.cpp
@@ -232,9 +232,14 @@ class PsmfPlayer {
 	}
 
 	bool HasReachedEnd() {
-		bool videoPtsEnd = (s64)psmfPlayerAvcAu.pts >= (s64)totalDurationTimestamp - VIDEO_FRAME_DURATION_TS;
-		// If we're out of video data and have no audio, it's over even if the pts isn't there yet.
-		return videoPtsEnd || (mediaengine->IsVideoEnd() && mediaengine->IsNoAudioData());
+		if (psmfPlayerLibVersion >= 0x05050010) {
+			bool videoPtsEnd = (s64)psmfPlayerAvcAu.pts >= (s64)totalDurationTimestamp - VIDEO_FRAME_DURATION_TS;
+			// If we're out of video data and have no audio, it's over even if the pts isn't there yet.
+			return videoPtsEnd || (mediaengine->IsVideoEnd() && mediaengine->IsNoAudioData());			
+		}
+		else {// Older versions just read until the end of the file. 
+			return (mediaengine->IsVideoEnd() && mediaengine->IsNoAudioData());
+		}
 	}
 
 	u32 filehandle;