Ticket #9068: optional_coktelvideo_indeo3.patch

configure

@@ -116 +116 @@
 _mt32emu=yes
 _build_hq_scalers=yes
 _build_scalers=yes
+_indeo3=auto
 # Default vkeybd/keymapper options
 _vkeybd=no
 _keymapper=no
@@ -609 +610 @@
   --with-mpeg2-prefix=DIR  Prefix where libmpeg2 is installed (optional)
   --enable-mpeg2           enable mpeg2 codec for cutscenes [no]
 
+  --disable-indeo3         disable Indeo3 decoder [autodetect]
+
   --with-fluidsynth-prefix=DIR  Prefix where libfluidsynth is installed (optional)
   --disable-fluidsynth     disable fluidsynth MIDI driver [autodetect]
 
@@ -654 +657 @@
         --enable-nasm)            _nasm=yes       ;;
         --disable-nasm)           _nasm=no        ;;
         --enable-mpeg2)           _mpeg2=yes      ;;
+        --disable-indeo3)         _indeo3=no      ;;
+        --enable-indeo3)          _indeo3=yes     ;;
         --disable-fluidsynth)     _fluidsynth=no  ;;
         --enable-readline)        _readline=yes   ;;
         --disable-readline)       _readline=no    ;;
@@ -1652 +1657 @@
 add_to_config_mk_if_no $_build_scalers      'DISABLE_SCALERS = 1'
 
 #
+# Check whether to compile the Indeo3 decoder
+#
+if test "$_indeo3" = auto ; then
+        # Autodetect. Build if either the gob engine or plugins are enabled
+        if test `get_engine_build gob` = yes || test "$_dynamic_modules" = yes ; then
+                _indeo3="yes"
+        else
+                _indeo3="no"
+        fi
+fi
+if test "$_indeo3" = no ; then
+        _def_indeo3='#undef USE_INDEO3'
+else
+        _def_indeo3='#define USE_INDEO3'
+fi
+add_to_config_mk_if_yes "$_indeo3" 'USE_INDEO3 = 1'
+
+#
 # Check for math lib
 #
 cat > $TMPC << EOF
@@ -2003 +2026 @@
         echo_n ", MT-32 emu"
 fi
 
+if test "$_indeo3" = yes ; then
+        echo_n ", Indeo3 decoder"
+fi
+
 if test "$_text_console" = yes ; then
         echo_n ", text console"
 fi
@@ -2230 +2257 @@
 /* Options */
 $_def_text_console
 $_def_mt32emu
+$_def_indeo3
 
 /* Plugin settings */
 $_def_plugin

graphics/video/coktelvideo/coktelvideo.cpp

@@ -23 +23 @@
  *
  */
 
+#include "graphics/video/coktelvideo/coktelvideo.h"
+
+#ifdef GRAPHICS_VIDEO_COKTELVIDEO_H
+
 #include "common/endian.h"
 #include "common/system.h"
 
 #include "graphics/dither.h"
-#include "graphics/video/coktelvideo/coktelvideo.h"
 #include "graphics/video/coktelvideo/indeo3.h"
 
 namespace Graphics {
@@ -1127 +1130 @@
 
         if (_externalCodec) {
                 if (_videoCodec == MKID_BE('iv32')) {
+#ifdef USE_INDEO3
                         _features &= ~kFeaturesPalette;
                         _features |=  kFeaturesFullColor;
                         _codecIndeo3 = new Indeo3(_width, _height, _palLUT);
+#else
+                        warning("Vmd::assessVideoProperties(): Indeo3 decoder not compiled in");
+#endif
                 } else {
                         char *fourcc = (char *) &_videoCodec;
 
@@ -1186 +1193 @@
                 }
         }
 
+#ifdef USE_INDEO3
         if (_externalCodec && _codecIndeo3)
                 _features |= kFeaturesSupportsDouble;
+#endif
 
         return true;
 }
@@ -1502 +1511 @@
 
         }
 
+#ifdef USE_INDEO3
         if (_codecIndeo3) {
                 delete _codecIndeo3;
 
                 _codecIndeo3 = new Indeo3(_width * (doubleMode ? 2 : 1),
                                 _height * (doubleMode ? 2 : 1), _palLUT);
         }
+#endif
 
         _doubleMode = doubleMode;
 }
@@ -1553 +1564 @@
         Imd::clear(del);
 
         if (del) {
+#ifdef USE_INDEO3
                 delete _codecIndeo3;
+#endif
                 delete[] _frames;
                 delete[] _vidMemBuffer;
         }
@@ -1561 +1574 @@
         _hasVideo   = true;
         _videoCodec = 0;
 
+#ifdef USE_INDEO3
         _codecIndeo3 = 0;
+#endif
 
         _partsPerFrame = 0;
         _frames = 0;
@@ -1795 +1810 @@
         int16 height = bottom - top  + 1;
         int16 sW     = _vidMemWidth;
         int16 sH     = _vidMemHeight;
-        uint32 dataLen = _frameDataLen;
 
         byte *dataPtr   = _frameData;
         byte *imdVidMem = _vidMem + sW * top + left;
@@ -1809 +1823 @@
         uint8 type;
         byte *dest = imdVidMem;
 
+#ifdef USE_INDEO3
+        uint32 dataLen = _frameDataLen;
+
         if (Indeo3::isIndeo3(dataPtr, dataLen)) {
                 if (!_codecIndeo3)
                         return 0;
@@ -1831 +1848 @@
                         return 0;
                 }
 
+#else
+
+        if (_externalCodec) {
+                return 0;
+        } else {
+
+#endif
+
                 type   = *dataPtr++;
                 srcPtr =  dataPtr;
 
@@ -2277 +2302 @@
 }
 
 } // End of namespace Graphics
+
+#endif // GRAPHICS_VIDEO_COKTELVIDEO_H

graphics/video/coktelvideo/coktelvideo.h

@@ -23 +23 @@
  *
  */
 
+// Currently, only GOB plays IMDs and VMDs, so skip compiling if GOB is disabled.
+#if !(defined(ENABLE_GOB) || defined(DYNAMIC_MODULES))
+
+// Do not compile the CoktelVideo code
+
+#else
+
 #ifndef GRAPHICS_VIDEO_COKTELVIDEO_H
 #define GRAPHICS_VIDEO_COKTELVIDEO_H
 
+#include "common/scummsys.h"
 #include "common/stream.h"
 #include "common/array.h"
 #include "graphics/dither.h"
@@ -34 +42 @@
 
 namespace Graphics {
 
+#ifdef USE_INDEO3
 class Indeo3;
+#endif
 
 /** Common interface for handling Coktel Vision videos and derivated formats. */
 class CoktelVideo {
@@ -475 +485 @@
         bool _doubleMode;
 
         Graphics::PaletteLUT *_palLUT;
+
+#ifdef USE_INDEO3
         Indeo3 *_codecIndeo3;
+#endif
 
         void clear(bool del = true);
 
@@ -519 +532 @@
 } // End of namespace Graphics
 
 #endif // GRAPHICS_VIDEO_COKTELVIDEO_H
+
+#endif // Engine and dynamic plugins guard

graphics/video/coktelvideo/indeo3.cpp

@@ -23 +23 @@
  *
  */
 
+#include "common/scummsys.h"
+
+#ifdef USE_INDEO3
+
 /* Intel Indeo 3 decompressor, derived from ffmpeg.
  *
  * Original copyright note: * Intel Indeo 3 (IV31, IV32, etc.) video decoder for ffmpeg
@@ -3477 +3481 @@
 };
 
 } // End of namespace Graphics
+
+#endif // USE_INDEO3

graphics/video/coktelvideo/indeo3.h

@@ -23 +23 @@
  *
  */
 
+#include "common/scummsys.h"
+
+#ifdef USE_INDEO3
+
 /* Intel Indeo 3 decompressor, derived from ffmpeg.
  *
  * Original copyright note:
@@ -118 +122 @@
 } // End of namespace Graphics
 
 #endif // GRAPHICS_VIDEO_INDEO3_H
+
+#endif // USE_INDEO3