Ticket #1399: sword2-animation.diff

scummvm/sword2/driver/animation.cpp

@@ -128 +128 @@
 
         info = mpeg2_info(decoder);
         framenum = 0;
-        ticks = _vm->_system->get_msecs();
 
         // Play audio
 
@@ -140 +139 @@
         if (sndfile->open(tempFile)) {
                 bgSoundStream = makeVorbisStream(sndfile, sndfile->size());
                 _vm->_mixer->playInputStream(&bgSound, bgSoundStream, false, 255, 0, -1);
+                
         }
-
 #endif
 
+        ticks = _vm->_system->get_msecs();
+
         return true;
 #else /* USE_MPEG2 */
         return false;
@@ -337 +338 @@
                 case STATE_SLICE:
                 case STATE_END:
                         if (info->display_fbuf) {
-                                /* simple audio video sync code:
-                                 * we calculate the actual frame by taking the delivered audio samples
-                                 * we add 2 frames as the number of samples delivered is higher than the
-                                 * number actually played due to buffering
+                                /* Audio/video sync is extremely simple. We
+                                 * just keep track of how long it's been since
+                                 * the audio track was started to calculate an
+                                 * approximate frame number. We try not to lag
+                                 * more than one frame behind this.
                                  *
-                                 * we then try to stay inside +- 1 frame of this calculated frame number by
-                                 * dropping frames if we run behind and delaying if we are too fast
+                                 * We do it this way since there is no way of
+                                 * asking the mixer how many samples have
+                                 * actually been played.
                                  */
 
 #ifdef BACKEND_8BIT
-                                if (checkPaletteSwitch() || (bgSoundStream == NULL) ||
-                                        (bgSoundStream->getSamplesPlayed() * 12 / bgSoundStream->getRate()) < (framenum + 3)){
 
-                                        _vm->_graphics->plotYUV(lut, sequence_i->width, sequence_i->height, info->display_fbuf->buf);
-
-                                        if (bgSoundStream) {
-                                                while ((bgSoundStream->getSamplesPlayed() * 12 / bgSoundStream->getRate()) < framenum + 1)
-                                                        _vm->_system->delay_msecs(10);
-                                        } else {
-                                                ticks += 83;
-                                                _vm->sleepUntil(ticks);
-                                        }
+                                (1000 * (framenum + 1)) / 12 + ticks
 
+                                if (checkPaletteSwitch() || _vm->_system->get_msecs() < (1000 * (framenum + 1)) / 12 + ticks) {
+                                        _vm->_graphics->plotYUV(lut, sequence_i->width, sequence_i->height, info->display_fbuf->buf);
+                                        _vm->sleepUntil(ticks + (1000 * framenum) / 12);
                                         _vm->_graphics->setNeedFullRedraw();
-
                                 } else
                                         warning("dropped frame %i", framenum);
 
@@ -369 +364 @@
 
 #else
 
-                                if ((bgSoundStream == NULL) ||
-                                        (bgSoundStream->getSamplesPlayed()*12/bgSoundStream->getRate()) < (framenum+3)){
-
+                                if (((_vm->_system->get_msecs() - ticks) * 12) / 1000 < framenum + 1) {
                                         plotYUV(lookup2, sequence_i->width, sequence_i->height, info->display_fbuf->buf);
-
-                                        if (bgSoundStream) {
-                                                while ((bgSoundStream->getSamplesPlayed()*12/bgSoundStream->getRate()) < framenum + 1)
-                                                        _vm->_system->delay_msecs(10);
-                                        } else {
-                                                ticks += 83;
-                                                _vm->sleepUntil(ticks);
-                                        }
-
+                                        _vm->sleepUntil(ticks + (1000 * framenum) / 12);
                                 } else
                                         warning("dropped frame %i", framenum);
 
@@ -389 +374 @@
 
                                 framenum++;
                                 return true;
-
                         }
                         break;
 

scummvm/sword2/driver/animation.h

@@ -69 +69 @@
 private:
         Sword2Engine *_vm;
 
-        int framenum;
-        int ticks;
+        uint framenum;
+        uint32 ticks;
 
 #ifdef USE_MPEG2
         mpeg2dec_t *decoder;
@@ -100 +100 @@
 
         struct {
                 int cnt;
-                int end;
+                uint end;
                 byte pal[4 * 256];
         } palettes[50];
 #else