Ticket #8168: cmi-smushtest.diff

scummvm/scumm/smush/scumm_renderer.cpp

@@ -200 +200 @@
         _scumm(scumm),
         _smixer(0),
         _insaneSpeed(speed),
-        _pending_updates(0) {
+        _pending_updates(0),
+        _startTime(_scumm->_system->get_msecs()) {
 }
 
-static ScummRenderer * s_renderer;
+uint32 ScummRenderer::getElapsedTime() {
+        return _scumm->_system->get_msecs() - _startTime;
+}
 
-static void smush_handler(void * engine) {
-        s_renderer->update();
+uint32 ScummRenderer::getFrameTime() {
+        return (getFrame() * _insaneSpeed) / 1000;
 }
 
 Mixer * ScummRenderer::getMixer() {
@@ -214 +217 @@
                 _smixer = new ScummMixer(_scumm->_mixer);
                 if(!_smixer) error("unable to allocate a smush mixer");
                 _smixer->_silentMixer = _scumm->_silentDigitalImuse;
-                s_renderer = this;
-                _scumm->_timer->installProcedure(&smush_handler, _insaneSpeed);
         }
         return _smixer;
 }
@@ -224 +225 @@
         _scumm->_insaneState = false;
         _scumm->exitCutscene();
         if(_smixer) {
-                _scumm->_timer->releaseProcedure(&smush_handler);
                 delete _smixer;
                 _smixer = 0;
         }
@@ -240 +240 @@
 }
 
 bool ScummRenderer::wait(int32 ms) {
-        // Because waitForTimer() also is the function that checks for user
-        // input we always want to call it at least once between frames, or
-        // the user may become unable to interrupt the movie.
-        do {
-                _scumm->waitForTimer(1);
-        } while(_pending_updates <= 0);
-        return true; 
+        int32 elapsed_time, frame_time;
+
+        elapsed_time = getElapsedTime();
+        frame_time = getFrameTime();
+
+        if (frame_time < elapsed_time) {
+                // Don't wait -- just check for user input.
+                _scumm->waitForTimer(0);
+        } else {
+                _scumm->waitForTimer(frame_time - elapsed_time);
+        }
+        return true;
 }
 
 bool ScummRenderer::startDecode(const char * fname, int32 version, int32 nbframes) {
@@ -277 +282 @@
 }
 
 void ScummRenderer::save(int32 frame) {
+        int32 elapsed_time, frame_time;
+
         int width = MIN(getWidth(), _scumm->_realWidth); 
         int height = MIN(getHeight(), _scumm->_realHeight);
-        
+
+        elapsed_time = getElapsedTime();
+        frame_time = getFrameTime();
 
         // In theory, this will always be true. In reality, there may be
         // several pending updates because the computer wasn't fast enough to
-        // process them all. In that case, skip the frame to catch up.
-        if (--_pending_updates <= 0) {
+        // process them all. If we lag too far behind, skip frames in an
+        // attempt to catch up.
+
+        if (elapsed_time - frame_time < 200) {
                 _scumm->_system->copy_rect((const byte *)data(), getWidth(), 0, 0, width, height);
                 _scumm->_system->update_screen();
         } else {

scummvm/scumm/smush/scumm_renderer.h

@@ -46 +46 @@
         ScummMixer * _smixer;
         uint32 _insaneSpeed;
         volatile int _pending_updates;
+        uint32 _startTime;
+        uint32 getElapsedTime();
+        uint32 getFrameTime();
 public:
         ScummRenderer(Scumm * scumm, uint32 speed);
         virtual ~ScummRenderer();