Ticket #8162: lipsync.diff

scumm/script_v8.cpp

@@ -1594 +1594 @@
                 break;
 
         case 0xDA:              // lipSyncWidth
+                push(_sound->voiceLipSyncWidth());
+                break;
         case 0xDB:              // lipSyncHeight
-                // TODO - get lip sync data for the currently active voice
-                // HACK - return random values for now, to make things look half decent
-                push(_rnd.getRandomNumber(255));
+                push(_sound->voiceLipSyncHeight());
                 break;
         case 0xDC:              // actorTalkAnimation
                 {

scumm/sound.cpp

@@ -41 +41 @@
         _musicBundleBufFinal = NULL;
         _musicBundleBufOutput = NULL;
         _musicDisk = 0;
+        _voiceLipSyncData = NULL;
+        _voiceLipSyncLength = 0;
         _talkChannel = -1;
 }
 
@@ -1183 +1185 @@
         }
 
         ptr += 12;
+        _voiceLipSyncLength = 0;
         while(tag != MKID_BE('DATA')) {
                 tag = READ_BE_UINT32(ptr); ptr += 4;
                 switch(tag) {
@@ -1196 +1199 @@
                         case MKID_BE('REGN'):
                         case MKID_BE('STOP'):
                         case MKID_BE('JUMP'):
-                        case MKID_BE('SYNC'):
                                 size = READ_BE_UINT32(ptr); ptr += size + 4;
                         break;
 
+                        case MKID_BE('SYNC'):
+                                size = READ_BE_UINT32(ptr); ptr += 8;
+                                _voiceLipSyncLength = size / 4 - 1;
+
+                                // Some voice has up to 426 entries.
+                                if (_voiceLipSyncData == NULL)
+                                        _voiceLipSyncData =
+                                                new _lipSyncEntry[512];
+                                if (_voiceLipSyncLength > 512)
+                                        error("Too much lip sync data: %d entries",
+                                              _voiceLipSyncLength);
+
+                                for (int i = 0; i < _voiceLipSyncLength; i++) {
+                                        _voiceLipSyncData[i].jiffies =
+                                                READ_BE_UINT16(ptr);
+                                        _voiceLipSyncData[i].width = ptr[2];
+                                        _voiceLipSyncData[i].height = ptr[3];
+                                        ptr += 4;
+                                }
+                        break;
+
                         case MKID_BE('DATA'):
                                 size = READ_BE_UINT32(ptr); ptr += 4;
                         break;
@@ -1217 +1240 @@
         
         byte * final = (byte *)malloc(size);
         memcpy(final, ptr, size);
+
+        // Needed for lip sync in COMI
+        _voiceBundleStartTime = _scumm->_system->get_msecs();
+
         if (bits == 8) {
                 return _scumm->_mixer->playRaw(NULL, final, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
         } else if (bits == 16){
@@ -1225 +1252 @@
                 warning("Sound::playBundleSound() to do more options to playRaw...");
                 return -1;
         }
+}
+
+Sound::_lipSyncEntry *Sound::voiceLipSyncData() {
+        int jiffies = (_scumm->_system->get_msecs() -
+                       _voiceBundleStartTime) / 17;
+
+        if (_voiceLipSyncLength == 0) {
+                warning("Attempt to get lip sync data from sound with none");
+                if (_voiceLipSyncData == NULL)
+                        _voiceLipSyncData = new _lipSyncEntry[512];
+                _voiceLipSyncData[0].width = 0;
+                _voiceLipSyncData[0].height = 0;
+                return _voiceLipSyncData;
+        }
+
+        // Use a binary search to find the last entry with time
+        // <= current time.  Invariant: current time is in [left,right)
+        int left = 0, right = _voiceLipSyncLength;
+
+        while (right - left > 1) {
+                int mid = (left + right) / 2;
+                if (_voiceLipSyncData[mid].jiffies == jiffies)
+                        return _voiceLipSyncData + mid;
+                else if (_voiceLipSyncData[mid].jiffies > jiffies)
+                        right = mid;
+                else
+                        left = mid + 1;
+        }
+        return _voiceLipSyncData + left;
 }
 
 int Sound::playSfxSound(void *sound, uint32 size, uint rate, bool isUnsigned) {

scumm/sound.h

@@ -60 +60 @@
         int32 _outputMixerSize;
         int32 _bundleSampleChannels;
 
+        uint32 _voiceBundleStartTime;
+        struct _lipSyncEntry {
+                uint16 jiffies;
+                uint8 width, height;
+        };
+        _lipSyncEntry *_voiceLipSyncData;
+        int32 _voiceLipSyncLength;
+        _lipSyncEntry *voiceLipSyncData();
+
         File *_sfxFile;
         uint32 _talk_sound_a1, _talk_sound_a2, _talk_sound_b1, _talk_sound_b2;
         byte _talk_sound_mode;
@@ -167 +176 @@
         void bundleMusicHandler(Scumm * scumm);
         void stopBundleMusic();
         int playBundleSound(char *sound);
+        uint8 voiceLipSyncWidth() {
+                return voiceLipSyncData()->width;
+        }
+        uint8 voiceLipSyncHeight() {
+                return voiceLipSyncData()->height;
+        }
+
         byte * readCreativeVocFile(byte * ptr, uint32 & size, uint32 & rate, uint32 & loops);
         int playSfxSound(void *sound, uint32 size, uint rate, bool isUnsigned);
         int playSfxSound_MP3(void *sound, uint32 size);