thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Add support for Bink video

Browse source
This commit is contained in:
Matthew Hoops 2011-07-02 16:37:41 -04:00
parent fffe7a9cc0
commit 9374215789
2 changed files with 50 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

66
engines/scumm/he/animation_he.cpp
View file

@ -26,12 +26,17 @@
#include "scumm/he/intern_he.h"
#include "audio/audiostream.h"
#include "video/bink_decoder.h"
#include "video/smk_decoder.h"
namespace Scumm {
MoviePlayer::MoviePlayer(ScummEngine_v90he *vm, Audio::Mixer *mixer) : _vm(vm) {
_video = new Video::SmackerDecoder(mixer);
if (_vm->_game.heversion >= 100 && (_vm->_game.features & GF_16BIT_COLOR))
_video = new Video::BinkDecoder();
else
_video = new Video::SmackerDecoder(mixer);
_flags = 0;
_wizResNum = 0;
}
@ -71,30 +76,55 @@ void MoviePlayer::copyFrameToBuffer(byte *dst, int dstType, uint x, uint y, uint
uint w = _video->getWidth();
const Graphics::Surface *surface = _video->decodeNextFrame();
if (!surface)
return;
byte *src = (byte *)surface->pixels;
if (_video->hasDirtyPalette())
_vm->setPaletteFromPtr(_video->getPalette(), 256);
if (_vm->_game.features & GF_16BIT_COLOR) {
dst += y * pitch + x * 2;
do {
for (uint i = 0; i < w; i++) {
uint16 color = READ_LE_UINT16(_vm->_hePalettes + _vm->_hePaletteSlot + 768 + src[i] * 2);
switch (dstType) {
case kDstScreen:
WRITE_UINT16(dst + i * 2, color);
break;
case kDstResource:
WRITE_LE_UINT16(dst + i * 2, color);
break;
default:
error("copyFrameToBuffer: Unknown dstType %d", dstType);
if (surface->format.bytesPerPixel == 1) {
dst += y * pitch + x * 2;
do {
for (uint i = 0; i < w; i++) {
uint16 color = READ_LE_UINT16(_vm->_hePalettes + _vm->_hePaletteSlot + 768 + src[i] * 2);
switch (dstType) {
case kDstScreen:
WRITE_UINT16(dst + i * 2, color);
break;
case kDstResource:
WRITE_LE_UINT16(dst + i * 2, color);
break;
default:
error("copyFrameToBuffer: Unknown dstType %d", dstType);
}
}
}
dst += pitch;
src += w;
} while (--h);
dst += pitch;
src += w;
} while (--h);
} else {
dst += y * pitch + x * 2;
do {
for (uint i = 0; i < w; i++) {
uint16 color = *((uint16 *)src + i);
switch (dstType) {
case kDstScreen:
WRITE_UINT16(dst + i * 2, color);
break;
case kDstResource:
WRITE_LE_UINT16(dst + i * 2, color);
break;
default:
error("copyFrameToBuffer: Unknown dstType %d", dstType);
}
}
dst += pitch;
src += surface->pitch;
} while (--h);
}
} else {
dst += y * pitch + x;
do {

4
engines/scumm/vars.cpp
View file

@ -704,8 +704,8 @@ void ScummEngine_v99he::resetScummVars() {
VAR(VAR_NUM_UNK) = _numUnk;
if (_game.heversion >= 100 && (_game.features & GF_16BIT_COLOR)) {
// Disable Bink and Smacker video in 16bit color games
VAR(140) = 0;
// Enable Bink and Smacker video in 16bit color games
VAR(140) = 1;
}
}
#endif