diff options
author | Matthew Hoops | 2010-05-18 14:17:24 +0000 |
---|---|---|
committer | Matthew Hoops | 2010-05-18 14:17:24 +0000 |
commit | 11cbdd03180a655b2b23ee4a13f1a00a1d782b3c (patch) | |
tree | 5b0d84211308ea37a2fa2f7017d6f96314f3c6fb /engines/sword1 | |
parent | f3892a506b2f935bae0be6319394c503c786d368 (diff) | |
download | scummvm-rg350-11cbdd03180a655b2b23ee4a13f1a00a1d782b3c.tar.gz scummvm-rg350-11cbdd03180a655b2b23ee4a13f1a00a1d782b3c.tar.bz2 scummvm-rg350-11cbdd03180a655b2b23ee4a13f1a00a1d782b3c.zip |
Committing the rest of the VideoDecoder Rewrite from patch #2963496.
svn-id: r49079
Diffstat (limited to 'engines/sword1')
-rw-r--r-- | engines/sword1/animation.cpp | 78 | ||||
-rw-r--r-- | engines/sword1/animation.h | 13 |
2 files changed, 62 insertions, 29 deletions
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index 221a20ba45..c0e7be7758 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -68,9 +68,10 @@ static const char *sequenceList[20] = { /////////////////////////////////////////////////////////////////////////////// MoviePlayer::MoviePlayer(SwordEngine *vm, Text *textMan, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Graphics::VideoDecoder *decoder, DecoderType decoderType) - : _vm(vm), _textMan(textMan), _snd(snd), _bgSoundHandle(bgSoundHandle), _system(system), VideoPlayer(decoder) { + : _vm(vm), _textMan(textMan), _snd(snd), _bgSoundHandle(bgSoundHandle), _system(system) { _bgSoundStream = NULL; _decoderType = decoderType; + _decoder = decoder; } MoviePlayer::~MoviePlayer() { @@ -86,11 +87,10 @@ bool MoviePlayer::load(uint32 id) { Common::File f; char filename[20]; - if (_decoderType == kVideoDecoderDXA) { + if (_decoderType == kVideoDecoderDXA) _bgSoundStream = Audio::SeekableAudioStream::openStreamFile(sequenceList[id]); - } else { + else _bgSoundStream = NULL; - } if (SwordEngine::_systemVars.showText) { sprintf(filename, "%s.txt", sequenceList[id]); @@ -146,9 +146,9 @@ bool MoviePlayer::load(uint32 id) { } void MoviePlayer::play() { - if (_bgSoundStream) { + if (_bgSoundStream) _snd->playStream(Audio::Mixer::kSFXSoundType, _bgSoundHandle, _bgSoundStream); - } + bool terminated = false; _textX = 0; @@ -179,7 +179,7 @@ void MoviePlayer::play() { void MoviePlayer::performPostProcessing(byte *screen) { if (!_movieTexts.empty()) { - if (_decoder->getCurFrame() + 1 == _movieTexts[0]->_startFrame) { + if (_decoder->getCurFrame() == _movieTexts[0]->_startFrame) { _textMan->makeTextSprite(2, (uint8 *)_movieTexts[0]->_text, 600, LETTER_COL); FrameHeader *frame = _textMan->giveSpriteData(2); @@ -188,7 +188,7 @@ void MoviePlayer::performPostProcessing(byte *screen) { _textX = 320 - _textWidth / 2; _textY = 420 - _textHeight; } - if (_decoder->getCurFrame() + 1 == _movieTexts[0]->_endFrame) { + if (_decoder->getCurFrame() == _movieTexts[0]->_endFrame) { _textMan->releaseText(2, false); delete _movieTexts.remove_at(0); } @@ -205,10 +205,10 @@ void MoviePlayer::performPostProcessing(byte *screen) { for (x = 0; x < _textWidth; x++) { switch (src[x]) { case BORDER_COL: - dst[x] = _decoder->getBlack(); + dst[x] = findBlackPalIndex(); break; case LETTER_COL: - dst[x] = _decoder->getWhite(); + dst[x] = findWhitePalIndex(); break; } } @@ -228,12 +228,12 @@ void MoviePlayer::performPostProcessing(byte *screen) { for (y = 0; y < _textHeight; y++) { if (_textY + y < frameY || _textY + y >= frameY + frameHeight) { - memset(dst + _textX, _decoder->getBlack(), _textWidth); + memset(dst + _textX, findBlackPalIndex(), _textWidth); } else { if (frameX > _textX) - memset(dst + _textX, _decoder->getBlack(), frameX - _textX); + memset(dst + _textX, findBlackPalIndex(), frameX - _textX); if (frameX + frameWidth < _textX + _textWidth) - memset(dst + frameX + frameWidth, _decoder->getBlack(), _textX + _textWidth - (frameX + frameWidth)); + memset(dst + frameX + frameWidth, findBlackPalIndex(), _textX + _textWidth - (frameX + frameWidth)); } dst += _system->getWidth(); @@ -244,25 +244,51 @@ void MoviePlayer::performPostProcessing(byte *screen) { } } -DXADecoderWithSound::DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle) - : _mixer(mixer), _bgSoundHandle(bgSoundHandle) { +bool MoviePlayer::playVideo() { + uint16 x = (g_system->getWidth() - _decoder->getWidth()) / 2; + uint16 y = (g_system->getHeight() - _decoder->getHeight()) / 2; + + while (!_vm->shouldQuit() && !_decoder->endOfVideo()) { + if (_decoder->needsUpdate()) { + Graphics::Surface *frame = _decoder->decodeNextFrame(); + if (frame) + _vm->_system->copyRectToScreen((byte *)frame->pixels, frame->pitch, x, y, frame->w, frame->h); + + if (_decoder->hasDirtyPalette()) + _decoder->setSystemPalette(); + + Graphics::Surface *screen = _vm->_system->lockScreen(); + performPostProcessing((byte *)screen->pixels); + _vm->_system->unlockScreen(); + _vm->_system->updateScreen(); + } + + Common::Event event; + while (_vm->_system->getEventManager()->pollEvent(event)) + if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE) || event.type == Common::EVENT_LBUTTONUP) + return false; + } + + return !_vm->shouldQuit(); } -int32 DXADecoderWithSound::getAudioLag() { - if (!_fileStream) - return 0; +byte MoviePlayer::findBlackPalIndex() { + return 0; +} - if (!_mixer->isSoundHandleActive(*_bgSoundHandle)) - return 0; +byte MoviePlayer::findWhitePalIndex() { + return 0xff; +} - int32 frameDelay = getFrameDelay(); - int32 videoTime = (_videoInfo.currentFrame + 1) * frameDelay; - int32 audioTime; +DXADecoderWithSound::DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle) + : _mixer(mixer), _bgSoundHandle(bgSoundHandle) { +} - const Audio::Timestamp ts = _mixer->getElapsedTime(*_bgSoundHandle); - audioTime = ts.convertToFramerate(100000).totalNumberOfFrames(); +uint32 DXADecoderWithSound::getElapsedTime() const { + if (_mixer->isSoundHandleActive(*_bgSoundHandle)) + return _mixer->getSoundElapsedTime(*_bgSoundHandle); - return videoTime - audioTime; + return VideoDecoder::getElapsedTime(); } /////////////////////////////////////////////////////////////////////////////// diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h index e97fc083f6..82343f2800 100644 --- a/engines/sword1/animation.h +++ b/engines/sword1/animation.h @@ -28,7 +28,7 @@ #include "graphics/video/dxa_decoder.h" #include "graphics/video/smk_decoder.h" -#include "graphics/video/video_player.h" +#include "graphics/video/video_decoder.h" #include "common/array.h" @@ -64,18 +64,20 @@ public: DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle); ~DXADecoderWithSound() {} - int32 getAudioLag(); + uint32 getElapsedTime() const; + private: Audio::Mixer *_mixer; Audio::SoundHandle *_bgSoundHandle; }; -class MoviePlayer : public Graphics::VideoPlayer { +class MoviePlayer { public: MoviePlayer(SwordEngine *vm, Text *textMan, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Graphics::VideoDecoder *decoder, DecoderType decoderType); virtual ~MoviePlayer(); bool load(uint32 id); void play(); + protected: SwordEngine *_vm; Text *_textMan; @@ -85,10 +87,15 @@ protected: int _textX, _textY, _textWidth, _textHeight; DecoderType _decoderType; + Graphics::VideoDecoder *_decoder; Audio::SoundHandle *_bgSoundHandle; Audio::AudioStream *_bgSoundStream; + bool playVideo(); void performPostProcessing(byte *screen); + + byte findBlackPalIndex(); + byte findWhitePalIndex(); }; MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, Audio::Mixer *snd, OSystem *system); |