[Scummvm-git-logs] scummvm master -> e93685b5578ed7ce0ae4372bd0286e69720dac4d

[AndywinXp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e93685b557 SCUMM: SMUSH (FT): Set correct proportion of in-frame counter and feed size


Commit: e93685b5578ed7ce0ae4372bd0286e69720dac4d
    https://github.com/scummvm/scummvm/commit/e93685b5578ed7ce0ae4372bd0286e69720dac4d
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-01-19T10:29:50+01:00

Commit Message:
SCUMM: SMUSH (FT): Set correct proportion of in-frame counter and feed size

This is aligned with the disasm and fixes almost imperceptible timing issues in fades

Changed paths:
    engines/scumm/smush/smush_player.cpp


diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index e5901c6c3c8..d85a2c7799f 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -1686,7 +1686,7 @@ void SmushPlayer::processDispatches(int16 feedSize) {
 
 				fadeMixStartingPoint = 0;
 				while (fadeRemaining) {
-					fadeInFrameCount = (fadeRemaining < engineBaseFeedSize / 2) ? fadeRemaining : engineBaseFeedSize / 2;
+					fadeInFrameCount = (fadeRemaining < engineBaseFeedSize / 4) ? fadeRemaining : engineBaseFeedSize / 4;
 
 					if (fadeInFrameCount == maxFadeChunkSize) {
 						fadeFeedSize = feedSize;
@@ -1745,8 +1745,8 @@ void SmushPlayer::processDispatches(int16 feedSize) {
 								if (_smushDispatch[i].volumeStep < 16)
 									_smushDispatch[i].volumeStep++;
 
-								if (mixInFrameCount > engineBaseFeedSize / 2)
-									mixInFrameCount = engineBaseFeedSize / 2;
+								if (mixInFrameCount > engineBaseFeedSize / 4)
+									mixInFrameCount = engineBaseFeedSize / 4;
 
 								_smushTracks[i].state = TRK_STATE_PLAYING;
 
@@ -1760,8 +1760,8 @@ void SmushPlayer::processDispatches(int16 feedSize) {
 
 								_smushTracks[i].state = TRK_STATE_ENDING;
 
-								if (mixInFrameCount > engineBaseFeedSize / 2)
-									mixInFrameCount = engineBaseFeedSize / 2;
+								if (mixInFrameCount > engineBaseFeedSize / 4)
+									mixInFrameCount = engineBaseFeedSize / 4;
 
 								_smushDispatch[i].audioRemaining -= mixInFrameCount;
 								_smushDispatch[i].currentOffset += mixInFrameCount;