From 2b46eda5b67ccdca8ef9012020dea0766191fa16 Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Thu, 24 Aug 2017 21:17:54 -0500 Subject: IMAGE: Allow Indeo4 transparency decoding in scalable videos y459.avi in Starship Titanic uses these two modes together, and this appears to work fine. --- image/codecs/indeo4.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'image/codecs') diff --git a/image/codecs/indeo4.cpp b/image/codecs/indeo4.cpp index bc777cfb85..a4eba85f49 100644 --- a/image/codecs/indeo4.cpp +++ b/image/codecs/indeo4.cpp @@ -761,11 +761,12 @@ int Indeo4Decoder::decodeTransparency() { } } - // FIXME: The transparency plane can be split, though it is not clear if - // this is in scalability mode, local decoding mode, or both. This adds - // complexity to the implementation, so avoid supporting unless it turns out - // to actually be necessary for correct decoding of game videos. - assert(!_ctx._isScalable); + // FIXME: The transparency plane can be split, apparently for local decoding + // mode (y459.avi in Titanic has the scalable flag and its transparency + // plane seems to be decoded successfully, so the split transparency plane + // does not seem to be related to scaling mode). This adds complexity to the + // implementation, so avoid supporting unless it turns out to actually be + // necessary for correct decoding of game videos. assert(!_ctx._usesTiling); assert(_surface.format.bytesPerPixel == 4); -- cgit v1.2.3