aboutsummaryrefslogtreecommitdiff
path: root/video/avi_decoder.h
diff options
context:
space:
mode:
authorPaul Gilbert2017-06-30 21:31:17 -0400
committerPaul Gilbert2017-06-30 21:31:17 -0400
commit2838776c4bf60556b73e74c7d481d9e4af718fbb (patch)
tree29cf0391d354468d1741ad57186c95183dc66bab /video/avi_decoder.h
parenta897ad9e7222a3f8af1d75bc9c787da3bd464c33 (diff)
downloadscummvm-rg350-2838776c4bf60556b73e74c7d481d9e4af718fbb.tar.gz
scummvm-rg350-2838776c4bf60556b73e74c7d481d9e4af718fbb.tar.bz2
scummvm-rg350-2838776c4bf60556b73e74c7d481d9e4af718fbb.zip
VIDEO: Refactor AVIDecoder for better handling of transparency track
A lot of the standard VideoDecoder methods were still treating the transparency track as part of the video, so methods like getFrameCount would return double the amount it should be. This refactoring properly separates the transparency track into a separate field entirely.
Diffstat (limited to 'video/avi_decoder.h')
-rw-r--r--video/avi_decoder.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index 541c73e068..a3dbddf015 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -337,8 +337,10 @@ protected:
void handleNextPacket(TrackStatus& status);
bool shouldQueueAudio(TrackStatus& status);
- Common::Array<TrackStatus> _videoTracks, _audioTracks;
+ void seekTransparencyFrame(int frame);
+ Common::Array<TrackStatus> _videoTracks, _audioTracks;
+ TrackStatus _transparencyTrack;
public:
virtual AVIAudioTrack *createAudioTrack(AVIStreamHeader sHeader, PCMWaveFormat wvInfo);