diff options
| author | Filippos Karapetis | 2009-01-11 03:34:50 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-01-11 03:34:50 +0000 |
| commit | 0b4dd7c4593587355c1965eb0d266040c83f0382 (patch) | |
| tree | c9f6b62c14ba25ccbdf5e8773d5c4e0dc367b7ea /graphics/video/dxa_player.cpp | |
| parent | 08c71e39490590125645215ce65fdcb71f11fae6 (diff) | |
| download | scummvm-rg350-0b4dd7c4593587355c1965eb0d266040c83f0382.tar.gz scummvm-rg350-0b4dd7c4593587355c1965eb0d266040c83f0382.tar.bz2 scummvm-rg350-0b4dd7c4593587355c1965eb0d266040c83f0382.zip | |
Committed a modified version of wjp's patch for the video player:
- Split the video player from the video decoders. It's now possible to have one video player for multiple decoders
- Added the palette weight calculation from the BS1 engine into VideoPlayer::setPalette. It's now possible to find the values of the white and black colors via getWhite() and getBlack() (useful for subtitle overlays)
- Adapted FTA2's movie playing code to the new changes to video player
- Fixed a slight bug in the DXA decoder (_videoinfo.startTime was not initialized)
svn-id: r35816
Diffstat (limited to 'graphics/video/dxa_player.cpp')
| -rw-r--r-- | graphics/video/dxa_player.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/graphics/video/dxa_player.cpp b/graphics/video/dxa_player.cpp index e228510e6b..397d1232da 100644 --- a/graphics/video/dxa_player.cpp +++ b/graphics/video/dxa_player.cpp @@ -25,6 +25,7 @@ #include "common/endian.h" #include "common/archive.h" +#include "common/system.h" #include "common/util.h" #include "graphics/video/dxa_player.h" @@ -476,6 +477,9 @@ void DXAPlayer::decode13(int size) { bool DXAPlayer::decodeNextFrame() { uint32 tag; + if (_videoInfo.currentFrame == 0) + _videoInfo.startTime = g_system->getMillis(); + tag = _fileStream->readUint32BE(); if (tag == MKID_BE('CMAP')) { byte rgb[768]; |