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

Extended the AviDecoder a bit

Browse source 
svn-id: r46162
This commit is contained in:
Sven Hesse 2009-11-27 18:25:40 +00:00
parent 6e26b4a1c8
commit cb2cc67b41
2 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
graphics/video/avi_decoder.cpp
View file

@ -255,6 +255,9 @@ bool AviDecoder::loadFile(const char *fileName) {
// Our frameDelay is calculated in 1/100 ms, so we convert it here // Our frameDelay is calculated in 1/100 ms, so we convert it here
_videoInfo.frameDelay = _header.microSecondsPerFrame / 10; _videoInfo.frameDelay = _header.microSecondsPerFrame / 10;
if (!_videoCodec)
return false;
return true; return true;
} }
@ -274,12 +277,18 @@ void AviDecoder::closeFile() {
_decodedHeader = false; _decodedHeader = false;
delete _videoCodec; delete _videoCodec;
_videoCodec = 0;
delete[] _ixInfo.indices; delete[] _ixInfo.indices;
_ixInfo.indices = 0;
} }
Surface *AviDecoder::getNextFrame() { Surface *AviDecoder::getNextFrame() {
uint32 nextTag = _fileStream->readUint32BE(); uint32 nextTag = _fileStream->readUint32BE();
if (_fileStream->eos())
return NULL;
if (nextTag == ID_LIST) { if (nextTag == ID_LIST) {
// A list of audio/video chunks // A list of audio/video chunks
uint32 listSize = _fileStream->readUint32LE() - 4; uint32 listSize = _fileStream->readUint32LE() - 4;
@ -340,8 +349,12 @@ Surface *AviDecoder::getNextFrame() {
// No alignment necessary. It's always even. // No alignment necessary. It's always even.
} else if (nextTag == ID_JUNK) { } else if (nextTag == ID_JUNK) {
runHandle(ID_JUNK); runHandle(ID_JUNK);
} else if (nextTag == ID_00AM) {
runHandle(ID_JUNK);
} else if (nextTag == ID_IDX1) {
runHandle(ID_IDX1);
} else } else
error ("Tag = \'%s\'", tag2str(nextTag)); error ("Tag = \'%s\', %d", tag2str(nextTag), _fileStream->pos());
return NULL; return NULL;
} }
@ -352,9 +365,16 @@ bool AviDecoder::decodeNextFrame() {
Surface *surface = NULL; Surface *surface = NULL;
while (!surface && _videoInfo.currentFrame < _videoInfo.frameCount) uint32 curFrame = _videoInfo.currentFrame;
while (!surface && _videoInfo.currentFrame < _videoInfo.frameCount && !_fileStream->eos())
surface = getNextFrame(); surface = getNextFrame();
if (curFrame == _videoInfo.currentFrame) {
warning("No video frame found");
_videoInfo.currentFrame++;
}
if (surface) if (surface)
memcpy(_videoFrameBuffer, surface->pixels, _header.width * _header.height); memcpy(_videoFrameBuffer, surface->pixels, _header.width * _header.height);

1
graphics/video/avi_decoder.h
View file

@ -56,6 +56,7 @@ namespace Graphics {
#define ID_VEDT MKID_BE('vedt') #define ID_VEDT MKID_BE('vedt')
#define ID_IDX1 MKID_BE('idx1') #define ID_IDX1 MKID_BE('idx1')
#define ID_STRD MKID_BE('strd') #define ID_STRD MKID_BE('strd')
#define ID_00AM MKID_BE('00AM')
//#define ID_INFO MKID_BE('INFO') //#define ID_INFO MKID_BE('INFO')
// Codec tags // Codec tags