From 9e1fa63575347e109cb713275b4d733f27a0fe6e Mon Sep 17 00:00:00 2001
From: Nicolas Bacca
Date: Thu, 4 Mar 2004 18:54:35 +0000
Subject: Apply patch #907359 : Broken Sword videos improved frameskip

svn-id: r13180
---
 sword1/animation.cpp | 21 +++++++++++++++++----
 sword1/animation.h   |  1 +
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'sword1')

diff --git a/sword1/animation.cpp b/sword1/animation.cpp
index a1cfccf725..3dc114d503 100644
--- a/sword1/animation.cpp
+++ b/sword1/animation.cpp
@@ -134,6 +134,7 @@ bool AnimationState::init(const char *name) {
 
 	info = mpeg2_info(decoder);
 	framenum = 0;
+	frameskipped = 0;
 	ticks = _sys->get_msecs();
 
 	/* Play audio - TODO: Sync with video?*/
@@ -313,7 +314,11 @@ bool AnimationState::decodeFrame() {
 
 #ifdef BACKEND_8BIT
 				if (checkPaletteSwitch() || (bgSoundStream == NULL) ||
-                                    ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1)) {
+                                    ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) || frameskipped > 10) {
+					if (frameskipped > 10) {
+						warning("force frame %i redraw", framenum);
+						frameskipped = 0;
+					}
 					_scr->plotYUV(lut, sequence_i->width, sequence_i->height, info->display_fbuf->buf);
 
 					if (bgSoundStream) {
@@ -325,14 +330,20 @@ bool AnimationState::decodeFrame() {
 							_sys->delay_msecs(10);
 					}
 
-				} else
+				} else {
 					warning("dropped frame %i", framenum);
+					frameskipped++;
+				}
 
 				buildLookup(palnum + 1, lutcalcnum);
 
 #else
 
-				if ((bgSoundStream == NULL) || ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1)) {
+				if ((bgSoundStream == NULL) || ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) || frameskipped > 10) {
+					if (frameskipped > 10) {
+						warning("force frame %i redraw", framenum);
+						frameskipped = 0;
+					}
 					plotYUV(lookup, sequence_i->width, sequence_i->height, info->display_fbuf->buf);
 
 					if (bgSoundStream) {
@@ -344,8 +355,10 @@ bool AnimationState::decodeFrame() {
 							_sys->delay_msecs(10);
 					}
 
-				} else
+				} else {
 					warning("dropped frame %i", framenum);
+					frameskipped++;
+				}
 
 #endif
 
diff --git a/sword1/animation.h b/sword1/animation.h
index 29f4f41bce..58b1be61ee 100644
--- a/sword1/animation.h
+++ b/sword1/animation.h
@@ -77,6 +77,7 @@ private:
 	OSystem *_sys;
 
 	uint framenum;
+	uint frameskipped;
 	uint32 ticks;
 
 #ifdef USE_MPEG2
-- 
cgit v1.2.3