aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2017-09-12 19:06:53 -0400
committerGitHub2017-09-12 19:06:53 -0400
commit2b745ac298c0465c8f9df4ec9992806c1e0a6103 (patch)
treecbf242435edbaa7d1b2f878250730dd53f90f392
parente489e1c6b7a46108d7cd8657691bb32e4717b92f (diff)
parent7846d098b25fa90526cb137efd5e68a8b089da25 (diff)
downloadscummvm-rg350-2b745ac298c0465c8f9df4ec9992806c1e0a6103.tar.gz
scummvm-rg350-2b745ac298c0465c8f9df4ec9992806c1e0a6103.tar.bz2
scummvm-rg350-2b745ac298c0465c8f9df4ec9992806c1e0a6103.zip
Merge pull request #1013 from ccawley2011/15bit-indeo
IMAGE: Support rendering Indeo videos at 15bpp
-rw-r--r--image/codecs/indeo/indeo.cpp3
-rw-r--r--image/codecs/indeo3.cpp3
2 files changed, 6 insertions, 0 deletions
diff --git a/image/codecs/indeo/indeo.cpp b/image/codecs/indeo/indeo.cpp
index 34377537d7..4826137358 100644
--- a/image/codecs/indeo/indeo.cpp
+++ b/image/codecs/indeo/indeo.cpp
@@ -466,6 +466,9 @@ IVI45DecContext::IVI45DecContext() : _gb(nullptr), _frameNum(0), _frameType(0),
IndeoDecoderBase::IndeoDecoderBase(uint16 width, uint16 height, uint bitsPerPixel) : Codec() {
switch (bitsPerPixel) {
+ case 15:
+ _pixelFormat = Graphics::PixelFormat(2, 5, 5, 5, 0, 0, 5, 10, 0);
+ break;
case 16:
_pixelFormat = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0);
break;
diff --git a/image/codecs/indeo3.cpp b/image/codecs/indeo3.cpp
index d862d5352b..7d3a121bcd 100644
--- a/image/codecs/indeo3.cpp
+++ b/image/codecs/indeo3.cpp
@@ -45,6 +45,9 @@ Indeo3Decoder::Indeo3Decoder(uint16 width, uint16 height, uint bitsPerPixel) : _
_iv_frame[1].the_buf = 0;
switch (bitsPerPixel) {
+ case 15:
+ _pixelFormat = Graphics::PixelFormat(2, 5, 5, 5, 0, 0, 5, 10, 0);
+ break;
case 16:
_pixelFormat = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0);
break;