diff options
Diffstat (limited to 'video')
-rw-r--r-- | video/avi_decoder.cpp | 16 | ||||
-rw-r--r-- | video/coktel_decoder.cpp | 4 | ||||
-rw-r--r-- | video/coktel_decoder.h | 2 |
3 files changed, 14 insertions, 8 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp index 44f8ade933..980ce3a3ea 100644 --- a/video/avi_decoder.cpp +++ b/video/avi_decoder.cpp @@ -118,7 +118,7 @@ bool AVIDecoder::parseNextChunk() { if (_fileStream->eos()) return false; - debug(3, "Decoding tag %s", tag2str(tag)); + debug(6, "Decoding tag %s", tag2str(tag)); switch (tag) { case ID_LIST: @@ -174,7 +174,7 @@ void AVIDecoder::handleList(uint32 listSize) { listSize -= 4; // Subtract away listType's 4 bytes uint32 curPos = _fileStream->pos(); - debug(0, "Found LIST of type %s", tag2str(listType)); + debug(7, "Found LIST of type %s", tag2str(listType)); switch (listType) { case ID_MOVI: // Movie List @@ -421,7 +421,7 @@ void AVIDecoder::handleNextPacket(TrackStatus &status) { if (status.track->getTrackType() == Track::kTrackTypeVideo) { // Horrible AVI video has a premature end // Force the frame to be the last frame - debug(0, "Forcing end of AVI video"); + debug(7, "Forcing end of AVI video"); ((AVIVideoTrack *)status.track)->forceTrackEnd(); } @@ -441,7 +441,7 @@ void AVIDecoder::handleNextPacket(TrackStatus &status) { if (status.track->getTrackType() == Track::kTrackTypeVideo) { // Horrible AVI video has a premature end // Force the frame to be the last frame - debug(0, "Forcing end of AVI video"); + debug(7, "Forcing end of AVI video"); ((AVIVideoTrack *)status.track)->forceTrackEnd(); } @@ -684,7 +684,7 @@ byte AVIDecoder::getStreamIndex(uint32 tag) const { void AVIDecoder::readOldIndex(uint32 size) { uint32 entryCount = size / 16; - debug(0, "Old Index: %d entries", entryCount); + debug(7, "Old Index: %d entries", entryCount); if (entryCount == 0) return; @@ -700,12 +700,12 @@ void AVIDecoder::readOldIndex(uint32 size) { // If it's absolute, the offset will equal the start of the movie list bool isAbsolute = firstEntry.offset == _movieListStart; - debug(1, "Old index is %s", isAbsolute ? "absolute" : "relative"); + debug(6, "Old index is %s", isAbsolute ? "absolute" : "relative"); if (!isAbsolute) firstEntry.offset += _movieListStart - 4; - debug(0, "Index 0: Tag '%s', Offset = %d, Size = %d (Flags = %d)", tag2str(firstEntry.id), firstEntry.offset, firstEntry.size, firstEntry.flags); + debug(7, "Index 0: Tag '%s', Offset = %d, Size = %d (Flags = %d)", tag2str(firstEntry.id), firstEntry.offset, firstEntry.size, firstEntry.flags); _indexEntries.push_back(firstEntry); for (uint32 i = 1; i < entryCount; i++) { @@ -720,7 +720,7 @@ void AVIDecoder::readOldIndex(uint32 size) { indexEntry.offset += _movieListStart - 4; _indexEntries.push_back(indexEntry); - debug(0, "Index %d: Tag '%s', Offset = %d, Size = %d (Flags = %d)", i, tag2str(indexEntry.id), indexEntry.offset, indexEntry.size, indexEntry.flags); + debug(7, "Index %d: Tag '%s', Offset = %d, Size = %d (Flags = %d)", i, tag2str(indexEntry.id), indexEntry.offset, indexEntry.size, indexEntry.flags); } } diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp index 21dda15cd0..278dc2d1fc 100644 --- a/video/coktel_decoder.cpp +++ b/video/coktel_decoder.cpp @@ -2810,6 +2810,10 @@ void AdvancedVMDDecoder::close() { _decoder->close(); } +void AdvancedVMDDecoder::setSurfaceMemory(void *mem, uint16 width, uint16 height, uint8 bpp) { + _decoder->setSurfaceMemory(mem, width, height, bpp); +} + AdvancedVMDDecoder::VMDVideoTrack::VMDVideoTrack(VMDDecoder *decoder) : _decoder(decoder) { } diff --git a/video/coktel_decoder.h b/video/coktel_decoder.h index a72f76eb9d..44de1c7d68 100644 --- a/video/coktel_decoder.h +++ b/video/coktel_decoder.h @@ -568,6 +568,8 @@ public: bool loadStream(Common::SeekableReadStream *stream); void close(); + void setSurfaceMemory(void *mem, uint16 width, uint16 height, uint8 bpp); + private: class VMDVideoTrack : public FixedRateVideoTrack { public: |