libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-06 02:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: Load DVs only on demand

Browse Source
This commit is contained in:
Eugene Sandulenko 2020-08-21 10:51:44 +02:00
parent cf068bcc08
commit 45c49b1195
3 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
engines/director/cast.cpp
View File

@ -340,7 +340,6 @@ bool Cast::loadArchive() {
loadCastChildren();
loadSoundCasts();
loadDigitalVideoCasts();
return true;
}
@ -641,51 +640,47 @@ void Cast::loadSoundCasts() {
}
}
void Cast::loadDigitalVideoCasts() {
debugC(1, kDebugLoading, "****** Preloading digital video casts");
Common::String Cast::getVideoPath(int castId) {
Common::String res;
CastMember *cast = _loadedCast->getVal(castId);
for (Common::HashMap<int, CastMember *>::iterator c = _loadedCast->begin(); c != _loadedCast->end(); ++c) {
if (!c->_value)
continue;
if (cast->_type != kCastDigitalVideo)
return res;
if (c->_value->_type != kCastDigitalVideo)
continue;
DigitalVideoCastMember *digitalVideoCast = (DigitalVideoCastMember *)cast;
uint32 tag = MKTAG('M', 'o', 'o', 'V');
uint16 videoId = (uint16)(castId + _castIDoffset);
DigitalVideoCastMember *digitalVideoCast = (DigitalVideoCastMember *)c->_value;
uint32 tag = MKTAG('M', 'o', 'o', 'V');
uint16 videoId = (uint16)(c->_key + _castIDoffset);
if (_vm->getVersion() >= 400 && digitalVideoCast->_children.size() > 0) {
videoId = digitalVideoCast->_children[0].index;
tag = digitalVideoCast->_children[0].tag;
}
Common::SeekableReadStreamEndian *videoData = NULL;
switch (tag) {
case MKTAG('M', 'o', 'o', 'V'):
if (_castArchive->hasResource(MKTAG('M', 'o', 'o', 'V'), videoId)) {
debugC(2, kDebugLoading, "****** Loading 'MooV' id: %d", videoId);
videoData = _castArchive->getResource(MKTAG('M', 'o', 'o', 'V'), videoId);
}
break;
}
if (videoData == NULL || videoData->size() == 0) {
// video file is linked, load from the filesystem
Common::String filename = _castsInfo[c->_key]->fileName;
Common::String directory = _castsInfo[c->_key]->directory;
if (!digitalVideoCast->loadVideo(pathMakeRelative(directory + "\\" + filename))) {
warning("Cast::loadDigitalVideoCasts: failed to load QuickTime file for cast member %d", videoId);
}
} else {
warning("STUB: Cast::loadDigitalVideoCasts: unsupported non-zero MooV block");
}
if (videoData)
delete videoData;
if (_vm->getVersion() >= 400 && digitalVideoCast->_children.size() > 0) {
videoId = digitalVideoCast->_children[0].index;
tag = digitalVideoCast->_children[0].tag;
}
Common::SeekableReadStreamEndian *videoData = NULL;
switch (tag) {
case MKTAG('M', 'o', 'o', 'V'):
if (_castArchive->hasResource(MKTAG('M', 'o', 'o', 'V'), videoId)) {
debugC(2, kDebugLoading, "****** Loading 'MooV' id: %d", videoId);
videoData = _castArchive->getResource(MKTAG('M', 'o', 'o', 'V'), videoId);
}
break;
}
if (videoData == NULL || videoData->size() == 0) {
// video file is linked, load from the filesystem
Common::String filename = _castsInfo[castId]->fileName;
Common::String directory = _castsInfo[castId]->directory;
res = directory + "\\" + filename;
} else {
warning("STUB: Cast::getVideoPath(%d): unsupported non-zero MooV block", castId);
}
if (videoData)
delete videoData;
return res;
}
PaletteV4 Cast::loadPalette(Common::SeekableReadStreamEndian &stream) {

2
engines/director/cast.h
View File

@ -64,7 +64,6 @@ public:
void loadCastChildren();
void loadSoundCasts();
void loadDigitalVideoCasts();
void copyCastStxts();
Common::Rect getCastMemberInitialRect(int castId);
@ -74,6 +73,7 @@ public:
CastMember *getCastMemberByScriptId(int scriptId);
CastMemberInfo *getCastMemberInfo(int castId);
const Stxt *getStxt(int castId);
Common::String getVideoPath(int castId);
void dumpScript(const char *script, ScriptType type, uint16 id);

11
engines/director/channel.cpp
View File

@ -24,6 +24,7 @@
#include "director/movie.h"
#include "director/score.h"
#include "director/cursor.h"
#include "director/cast.h"
#include "director/channel.h"
#include "director/sprite.h"
#include "director/castmember.h"
@ -275,8 +276,14 @@ void Channel::setClean(Sprite *nextSprite, int spriteId, bool partial) {
if (nextSprite) {
if (_sprite->_castId != nextSprite->_castId && nextSprite->_cast) {
if (nextSprite->_cast->_type == kCastDigitalVideo)
((DigitalVideoCastMember *)nextSprite->_cast)->startVideo(this);
if (nextSprite->_cast->_type == kCastDigitalVideo) {
Common::String path = nextSprite->_cast->getCast()->getVideoPath(nextSprite->_castId);
if (!path.empty()) {
((DigitalVideoCastMember *)nextSprite->_cast)->loadVideo(pathMakeRelative(path));
((DigitalVideoCastMember *)nextSprite->_cast)->startVideo(this);
}
}
}
if (_sprite->_puppet || partial) {