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

VIDEO: Add support for AVI 2-track videos with missing track 2 indexes

Browse source
This commit is contained in:
Paul Gilbert 2016-12-29 16:54:13 -05:00
parent 766acba8ed
commit 2e8c80cf58
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
video/avi_decoder.cpp
View file

@ -721,18 +721,31 @@ bool AVIDecoder::seekIntern(const Audio::Timestamp &time) {
AVIVideoTrack *videoTrack2 = static_cast<AVIVideoTrack *>(_videoTracks.back().track); AVIVideoTrack *videoTrack2 = static_cast<AVIVideoTrack *>(_videoTracks.back().track);
videoTrack2->setCurFrame((int)frame - 1); videoTrack2->setCurFrame((int)frame - 1);
// Find the index entry for the frame and read it in // Find the index entry for the frame
OldIndex *entry = _indexEntries.find(_videoTracks.back().index, frame); int indexFrame = frame;
OldIndex *entry = nullptr;
do {
entry = _indexEntries.find(_videoTracks.back().index, indexFrame);
} while (!entry && --indexFrame >= 0);
assert(entry); assert(entry);
// Read in the frame
Common::SeekableReadStream *chunk = nullptr; Common::SeekableReadStream *chunk = nullptr;
_fileStream->seek(entry->offset + 8); _fileStream->seek(entry->offset + 8);
_videoTracks.back().chunkSearchOffset = entry->offset; _videoTracks.back().chunkSearchOffset = entry->offset;
if (entry->size != 0) if (entry->size != 0)
chunk = _fileStream->readStream(entry->size); chunk = _fileStream->readStream(entry->size);
videoTrack2->decodeFrame(chunk); videoTrack2->decodeFrame(chunk);
if (indexFrame < frame) {
TrackStatus &status = _videoTracks.back();
while (indexFrame++ < frame) {
// There was no index entry for the desired frame, so an earlier one was decoded.
// We now have to sequentially decode frames until we get to the desired frame
handleNextPacket(status);
}
}
} }
// Set the video track's frame // Set the video track's frame