Ticket #8168: cmi-smushtest2.diff

scummvm/scumm/smush/brenderer.cpp

@@ -67 +67 @@
 }
 
 bool BaseRenderer::flipFrame() { 
-        save();
+        save(getFrame());
         return true;
 }
 

scummvm/scumm/smush/brenderer.h

@@ -36 +36 @@
 private:
         Palette _pal;           //!< The current palette
         char * _data;           //!< The current frame buffer
-        int32 _frame;                   //!< The current frame number
-        int32 _nbframes;                //!< The number of frames in the animation
-        int32 _width;                   //!< The current frame's width
+        int32 _frame;           //!< The current frame number
+        int32 _nbframes;        //!< The number of frames in the animation
+        bool _frameSkip;        //!< The player is skipping frames to catch up
+        int32 _width;           //!< The current frame's width
         int32 _height;          //!< The current frame's height
         const char * _fname;    //!< The filename of the animation being played
 protected:
@@ -54 +55 @@
         void setFrame(int32 f) { _frame = f; }; //!< allows to change the frame number
 public:
         int32 getFrame() const { return _frame; };      //!< accessor for current frame number
+        bool frameSkip() { return _frameSkip; };
+        void setFrameSkip(bool skip) { _frameSkip = skip; };
         BaseRenderer();
         virtual ~BaseRenderer();
 
@@ -76 +79 @@
 protected:
         void save(int32 frame = -1) {};
 public:
-        NullRenderer() {};
+        NullRenderer() { setFrameSkip(false); };
         virtual ~NullRenderer() {};
         bool wait(int32 ms) { return true; };
 };

scummvm/scumm/smush/scumm_renderer.cpp

@@ -203 +203 @@
         _pending_updates(0) {
 }
 
-static ScummRenderer * s_renderer;
-
-static void smush_handler(void * engine) {
-        s_renderer->update();
-}
-
 Mixer * ScummRenderer::getMixer() {
         if(_smixer == 0) {
                 _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 +216 @@
         _scumm->_insaneState = false;
         _scumm->exitCutscene();
         if(_smixer) {
-                _scumm->_timer->releaseProcedure(&smush_handler);
                 delete _smixer;
                 _smixer = 0;
         }
@@ -240 +231 @@
 }
 
 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; 
 }
 
@@ -277 +262 @@
 }
 
 void ScummRenderer::save(int32 frame) {
+        int32 elapsed_time, frame_time;
+
         int width = MIN(getWidth(), _scumm->_realWidth); 
         int height = MIN(getHeight(), _scumm->_realHeight);
+
+        if (frame == 0) {
+                _startTime = _scumm->_system->get_msecs();
+                elapsed_time = frame_time = 0;
+                setFrameSkip(false);
+        } else {
+                elapsed_time = _scumm->_system->get_msecs() - _startTime;
+                frame_time = (frame * _insaneSpeed) / 1000;
+        }
+
+        if (frame_time <= elapsed_time) {
+                // Don't wait -- just check for user input.
+                _scumm->waitForTimer(0);
+        } else {
+                _scumm->waitForTimer(frame_time - elapsed_time);
+        }
         
+        // If the movie is lagging too far behind, skip frames in an attempt
+        // to catch up.
 
-        // 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) {
+        if (elapsed_time - frame_time > 200)
+                setFrameSkip(true);
+
+        if (!frameSkip()) {
                 _scumm->_system->copy_rect((const byte *)data(), getWidth(), 0, 0, width, height);
                 _scumm->_system->update_screen();
         } else {
                 warning("ScummRenderer: Skipping frame %d to catch up", getFrame());
         }
+
+        if (elapsed_time - frame_time < 100)
+                setFrameSkip(false);
+
         _scumm->processKbd();
 }
 

scummvm/scumm/smush/scumm_renderer.h

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