diff options
author | Filippos Karapetis | 2009-05-20 10:43:18 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-05-20 10:43:18 +0000 |
commit | 6ec870303ff3532873f652fb1a565d72b0079645 (patch) | |
tree | 2acf20a4ae5d4deac4be47e3518c20409089f8bb /graphics/video/video_player.cpp | |
parent | caf9bf0941babc523be7c37bb10bfbb2213f5c0b (diff) | |
download | scummvm-rg350-6ec870303ff3532873f652fb1a565d72b0079645.tar.gz scummvm-rg350-6ec870303ff3532873f652fb1a565d72b0079645.tar.bz2 scummvm-rg350-6ec870303ff3532873f652fb1a565d72b0079645.zip |
- Reverted commit #40730, as it introduced rounding errors
- Properly fixed the FLIC player
- The sound chunk tag of DXA files is now read by the DXADecoder's loadFile() method
svn-id: r40736
Diffstat (limited to 'graphics/video/video_player.cpp')
-rw-r--r-- | graphics/video/video_player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/video/video_player.cpp b/graphics/video/video_player.cpp index b77cb3b7f7..81c025d22f 100644 --- a/graphics/video/video_player.cpp +++ b/graphics/video/video_player.cpp @@ -88,14 +88,14 @@ int32 VideoDecoder::getAudioLag() { Calculate the lag by how much time has gone by since the first frame and how much time *should* have passed. */ - int32 audioTime = g_system->getMillis() - _videoInfo.startTime; + int32 audioTime = (g_system->getMillis() - _videoInfo.startTime) * 100; int32 videoTime = _videoInfo.currentFrame * getFrameDelay(); return videoTime - audioTime; } uint32 VideoDecoder::getFrameWaitTime() { - int32 waitTime = getFrameDelay() + getAudioLag(); + int32 waitTime = (getFrameDelay() + getAudioLag()) / 100; if (waitTime < 0) return 0; |