aboutsummaryrefslogtreecommitdiff
path: root/graphics/video/video_player.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-05-19 19:56:53 +0000
committerFilippos Karapetis2009-05-19 19:56:53 +0000
commite358b13ef96e15fc1788841633eb09b1f739cc90 (patch)
tree080a9766958f53fb5d9291d5cd15d9a0d5edb88f /graphics/video/video_player.cpp
parent4f6bc506153550a16efd02a10b0b377cce54c434 (diff)
downloadscummvm-rg350-e358b13ef96e15fc1788841633eb09b1f739cc90.tar.gz
scummvm-rg350-e358b13ef96e15fc1788841633eb09b1f739cc90.tar.bz2
scummvm-rg350-e358b13ef96e15fc1788841633eb09b1f739cc90.zip
Changed calculations based on frame delay to be based on the scale of 1ms, not 1/100. This fixes the FLIC player and also makes the overall code a bit clearer and easier to understand
svn-id: r40730
Diffstat (limited to 'graphics/video/video_player.cpp')
-rw-r--r--graphics/video/video_player.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/video/video_player.cpp b/graphics/video/video_player.cpp
index 81c025d22f..b77cb3b7f7 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) * 100;
+ int32 audioTime = g_system->getMillis() - _videoInfo.startTime;
int32 videoTime = _videoInfo.currentFrame * getFrameDelay();
return videoTime - audioTime;
}
uint32 VideoDecoder::getFrameWaitTime() {
- int32 waitTime = (getFrameDelay() + getAudioLag()) / 100;
+ int32 waitTime = getFrameDelay() + getAudioLag();
if (waitTime < 0)
return 0;