diff options
| author | Nicolas Bacca | 2004-03-04 18:54:35 +0000 |
|---|---|---|
| committer | Nicolas Bacca | 2004-03-04 18:54:35 +0000 |
| commit | 9e1fa63575347e109cb713275b4d733f27a0fe6e (patch) | |
| tree | f50c09b5da6b75c47a9e80c73675d27c7bcf3b86 /sword2 | |
| parent | ece97788ac5c06ceef8c1954b9a21f42eac6b1ec (diff) | |
| download | scummvm-rg350-9e1fa63575347e109cb713275b4d733f27a0fe6e.tar.gz scummvm-rg350-9e1fa63575347e109cb713275b4d733f27a0fe6e.tar.bz2 scummvm-rg350-9e1fa63575347e109cb713275b4d733f27a0fe6e.zip | |
Apply patch #907359 : Broken Sword videos improved frameskip
svn-id: r13180
Diffstat (limited to 'sword2')
| -rw-r--r-- | sword2/driver/animation.cpp | 23 | ||||
| -rw-r--r-- | sword2/driver/animation.h | 1 |
2 files changed, 18 insertions, 6 deletions
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp index 14accf6604..211c6b5fdb 100644 --- a/sword2/driver/animation.cpp +++ b/sword2/driver/animation.cpp @@ -142,6 +142,7 @@ bool AnimationState::init(const char *name) { info = mpeg2_info(decoder); framenum = 0; + frameskipped = 0; ticks = _vm->_system->get_msecs(); // Play audio @@ -358,8 +359,11 @@ bool AnimationState::decodeFrame() { #ifdef BACKEND_8BIT if (checkPaletteSwitch() || (bgSoundStream == NULL) || - ((_vm->_mixer->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1)) { - + ((_vm->_mixer->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1) || frameskipped > 10) { + if (frameskipped > 10) { + warning("force frame %i redraw", framenum); + frameskipped = 0; + } _vm->_graphics->plotYUV(lut, sequence_i->width, sequence_i->height, info->display_fbuf->buf); if (bgSoundStream) { @@ -372,16 +376,21 @@ bool AnimationState::decodeFrame() { _vm->_graphics->setNeedFullRedraw(); - } else + } else { warning("dropped frame %i", framenum); + frameskipped++; + } buildLookup(palnum + 1, lutcalcnum); #else if ((bgSoundStream == NULL) || - ((_vm->_mixer->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1)) { - + ((_vm->_mixer->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) { @@ -392,8 +401,10 @@ bool AnimationState::decodeFrame() { _vm->sleepUntil(ticks); } - } else + } else { warning("dropped frame %i", framenum); + frameskipped++; + } #endif diff --git a/sword2/driver/animation.h b/sword2/driver/animation.h index 28399d06d4..84e7d70637 100644 --- a/sword2/driver/animation.h +++ b/sword2/driver/animation.h @@ -71,6 +71,7 @@ private: Sword2Engine *_vm; uint framenum; + uint frameskipped; int ticks; #ifdef USE_MPEG2 |