[Scummvm-git-logs] scummvm master -> a7aec6c486b4e270966a1ea6fc8e8cf7c700f0e8
sev-
noreply at scummvm.org
Fri Dec 27 12:04:05 UTC 2024
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
847c714e68 CONFIGURE: Split indeo into indeo3 and indeo45 components
e32dee18aa CONFIGURE: Added ENet as a component used by scumm-he games
a7aec6c486 CONFIGURE: Implement mpeg2 as a component
Commit: 847c714e689d94ecbd9c55e70ac9d9f605db62a9
https://github.com/scummvm/scummvm/commit/847c714e689d94ecbd9c55e70ac9d9f605db62a9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-27T12:40:26+01:00
Commit Message:
CONFIGURE: Split indeo into indeo3 and indeo45 components
Also, add indeo3 as a dependency to bbvs and add all codect to testbed
Changed paths:
configure
engines/bbvs/configure.engine
engines/director/configure.engine
engines/gob/configure.engine
engines/ngi/configure.engine
engines/testbed/configure.engine
engines/titanic/configure.engine
image/codecs/codec.cpp
image/module.mk
video/coktel_decoder.cpp
diff --git a/configure b/configure
index 1ce6f89a884..2496fc5446d 100755
--- a/configure
+++ b/configure
@@ -290,7 +290,8 @@ _need_memalign=yes
_have_x86=no
_have_amd64=no
_imgui=yes
-_indeo=auto
+_indeo3=auto
+_indeo45=auto
_hnm=auto
_fmtowns_pc98_audio=auto
_sid_audio=auto
@@ -323,7 +324,8 @@ add_feature test_cxx11 "Test C++11" "_test_cxx11"
add_component fmtowns_pc98_audio "FM-TOWNS/PC98 audio" "_fmtowns_pc98_audio" "USE_FMTOWNS_PC98_AUDIO"
add_component hnm "HNM" "_hnm" "USE_HNM"
add_component imgui "Dear ImGui based debugger" "_imgui" "USE_IMGUI"
-add_component indeo "Indeo" "_indeo" "USE_INDEO"
+add_component indeo3 "Indeo 3" "_indeo3" "USE_INDEO3"
+add_component indeo45 "Indeo 4&5" "_indeo45" "USE_INDEO45"
add_component lua "Lua" "_lua" "USE_LUA"
add_component vpx "libvpx" "_vpx" "USE_VPX"
add_component theoradec "libtheoradec" "_theoradec" "USE_THEORADEC"
diff --git a/engines/bbvs/configure.engine b/engines/bbvs/configure.engine
index 27c87ce9e10..a77a5e0fc5a 100644
--- a/engines/bbvs/configure.engine
+++ b/engines/bbvs/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine bbvs "Beavis and Butthead in Virtual Stupidity" yes
+add_engine bbvs "Beavis and Butthead in Virtual Stupidity" yes "" "" "indeo3" ""
diff --git a/engines/director/configure.engine b/engines/director/configure.engine
index fde78a9ff09..8566d594d5c 100644
--- a/engines/director/configure.engine
+++ b/engines/director/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine director "Macromedia Director" yes "" "" "highres" "imgui indeo"
+add_engine director "Macromedia Director" yes "" "" "highres" "imgui indeo3"
diff --git a/engines/gob/configure.engine b/engines/gob/configure.engine
index 5d73092aea7..c6730dfde68 100644
--- a/engines/gob/configure.engine
+++ b/engines/gob/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine gob "Gobli*ns" yes "" "" "indeo" "midi"
+add_engine gob "Gobli*ns" yes "" "" "indeo3" "midi"
diff --git a/engines/ngi/configure.engine b/engines/ngi/configure.engine
index 86bceb33f13..a3518cb474d 100644
--- a/engines/ngi/configure.engine
+++ b/engines/ngi/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine ngi "Nikita Game Interface" yes "" "" "16bit highres indeo"
+add_engine ngi "Nikita Game Interface" yes "" "" "16bit highres" "indeo45"
diff --git a/engines/testbed/configure.engine b/engines/testbed/configure.engine
index eca82ae5d4d..4ba2464306c 100644
--- a/engines/testbed/configure.engine
+++ b/engines/testbed/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine testbed "TestBed: the Testing framework" no "" "" "" "imgui midi universaltracker"
+add_engine testbed "TestBed: the Testing framework" no "" "" "" "imgui midi universaltracker indeo3 indeo45 vpx mpc hnm"
diff --git a/engines/titanic/configure.engine b/engines/titanic/configure.engine
index 5773a367d8d..53ec8d8791b 100644
--- a/engines/titanic/configure.engine
+++ b/engines/titanic/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine titanic "Starship Titanic" yes "" "" "16bit jpeg highres mad indeo"
+add_engine titanic "Starship Titanic" yes "" "" "16bit jpeg highres mad indeo45"
diff --git a/image/codecs/codec.cpp b/image/codecs/codec.cpp
index 1d733955c64..35ec40ea0cf 100644
--- a/image/codecs/codec.cpp
+++ b/image/codecs/codec.cpp
@@ -29,8 +29,10 @@
#include "image/codecs/cdtoons.h"
#include "image/codecs/cinepak.h"
-#ifdef USE_INDEO
+#ifdef USE_INDEO3
#include "image/codecs/indeo3.h"
+#endif
+#ifdef USE_INDEO45
#include "image/codecs/indeo4.h"
#include "image/codecs/indeo5.h"
#endif
@@ -225,25 +227,25 @@ Codec *createBitmapCodec(uint32 tag, uint32 streamTag, int width, int height, in
return new CinepakDecoder(bitsPerPixel);
case MKTAG('I','V','3','2'):
-#ifdef USE_INDEO
+#ifdef USE_INDEO3
return new Indeo3Decoder(width, height, bitsPerPixel);
#else
- warning("createBitmapCodec(): Indeo codecs are not compiled");
+ warning("createBitmapCodec(): Indeo 3 codec is not compiled");
return 0;
#endif
case MKTAG('I', 'V', '4', '1'):
case MKTAG('I', 'V', '4', '2'):
-#ifdef USE_INDEO
+#ifdef USE_INDEO45
return new Indeo4Decoder(width, height, bitsPerPixel);
#else
- warning("createBitmapCodec(): Indeo codecs are not compiled");
+ warning("createBitmapCodec(): Indeo 4 & 5 codecs are not compiled");
return 0;
#endif
case MKTAG('I', 'V', '5', '0'):
-#ifdef USE_INDEO
+#ifdef USE_INDEO45
return new Indeo5Decoder(width, height, bitsPerPixel);
#else
- warning("createBitmapCodec(): Indeo codecs are not compiled");
+ warning("createBitmapCodec(): Indeo 4 & 5 codecs are not compiled");
return 0;
#endif
@@ -302,11 +304,11 @@ Codec *createQuickTimeCodec(uint32 tag, int width, int height, int bitsPerPixel)
// Used my L-Zone-mac (Director game)
return new BitmapRawDecoder(width, height, bitsPerPixel, true, true);
case MKTAG('I','V','3','2'):
-#ifdef USE_INDEO
+#ifdef USE_INDEO3
// Indeo 3: Used by Team Xtreme: Operation Weather Disaster (Spanish)
return new Indeo3Decoder(width, height, bitsPerPixel);
#else
- warning("createQuickTimeCodec(): Indeo codecs are not compiled");
+ warning("createQuickTimeCodec(): Indeo 3 codec is not compiled");
return 0;
#endif
default:
diff --git a/image/module.mk b/image/module.mk
index ed5a6b48e69..5eb58c2a1a0 100644
--- a/image/module.mk
+++ b/image/module.mk
@@ -37,9 +37,13 @@ MODULE_OBJS += \
codecs/mpeg.o
endif
-ifdef USE_INDEO
+ifdef USE_INDEO3
+MODULE_OBJS += \
+ codecs/indeo3.o
+endif
+
+ifdef USE_INDEO45
MODULE_OBJS += \
- codecs/indeo3.o \
codecs/indeo4.o \
codecs/indeo5.o \
codecs/indeo/indeo.o \
diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index 5ef82b40cb2..6b4f6baea29 100644
--- a/video/coktel_decoder.cpp
+++ b/video/coktel_decoder.cpp
@@ -36,7 +36,7 @@
#include "video/coktel_decoder.h"
-#ifdef USE_INDEO
+#ifdef USE_INDEO3
#include "image/codecs/indeo3.h"
#endif
@@ -1869,7 +1869,7 @@ void VMDDecoder::setXY(uint16 x, uint16 y) {
}
bool VMDDecoder::openExternalCodec() {
-#ifdef USE_INDEO
+#ifdef USE_INDEO3
delete _codec;
#endif
@@ -1877,12 +1877,12 @@ bool VMDDecoder::openExternalCodec() {
if (_externalCodec) {
if (_videoCodec == kVideoCodecIndeo3) {
-#ifdef USE_INDEO
+#ifdef USE_INDEO3
_isPaletted = false;
_codec = new Image::Indeo3Decoder(_width, _height, g_system->getScreenFormat().bpp());
#else
- warning("VMDDecoder::openExternalCodec(): Indeo codecs are not compiled");
+ warning("VMDDecoder::openExternalCodec(): Indeo 3 codec is not compiled");
return false;
#endif
@@ -2246,7 +2246,7 @@ void VMDDecoder::close() {
delete[] _videoBuffer[1];
delete[] _videoBuffer[2];
-#ifdef USE_INDEO
+#ifdef USE_INDEO3
delete _codec;
#endif
@@ -2454,7 +2454,7 @@ bool VMDDecoder::renderFrame(Common::Rect &rect) {
if (!getRenderRects(rect, realRect, fakeRect))
return false;
-#ifdef USE_INDEO
+#ifdef USE_INDEO3
if (_externalCodec) {
if (!_codec)
return false;
@@ -2837,7 +2837,7 @@ uint32 VMDDecoder::getFlags() const {
}
Graphics::PixelFormat VMDDecoder::getPixelFormat() const {
-#ifdef USE_INDEO
+#ifdef USE_INDEO3
if (_externalCodec) {
if (_codec)
return _codec->getPixelFormat();
Commit: e32dee18aa446b9fb16b62079880a79e3d48f34b
https://github.com/scummvm/scummvm/commit/e32dee18aa446b9fb16b62079880a79e3d48f34b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-27T12:53:43+01:00
Commit Message:
CONFIGURE: Added ENet as a component used by scumm-he games
Changed paths:
configure
engines/scumm/configure.engine
diff --git a/configure b/configure
index 2496fc5446d..5dbb5a64918 100755
--- a/configure
+++ b/configure
@@ -321,6 +321,7 @@ add_feature zlib "zlib" "_zlib"
add_feature test_cxx11 "Test C++11" "_test_cxx11"
# Components are features which may be disabled if unused by the engines
+add_component enet "ENet" "_enet" "USE_ENET"
add_component fmtowns_pc98_audio "FM-TOWNS/PC98 audio" "_fmtowns_pc98_audio" "USE_FMTOWNS_PC98_AUDIO"
add_component hnm "HNM" "_hnm" "USE_HNM"
add_component imgui "Dear ImGui based debugger" "_imgui" "USE_IMGUI"
@@ -4381,11 +4382,6 @@ EOF
esac
fi
-#
-# Check whether ENet networking support is requested
-#
-define_in_config_if_yes "$_enet" 'USE_ENET'
-
#
# Check and set additional stuff needed for ENet.
#
diff --git a/engines/scumm/configure.engine b/engines/scumm/configure.engine
index 687f79e7c93..389c16636cf 100644
--- a/engines/scumm/configure.engine
+++ b/engines/scumm/configure.engine
@@ -2,4 +2,4 @@
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
add_engine scumm "SCUMM" yes "scumm_7_8 he" "v0-v6 games" "" "midi fmtowns_pc98_audio sid_audio"
add_engine scumm_7_8 "v7 & v8 games" yes
-add_engine he "HE71+ games" yes "" "" "highres bink"
+add_engine he "HE71+ games" yes "" "" "highres bink" "enet"
Commit: a7aec6c486b4e270966a1ea6fc8e8cf7c700f0e8
https://github.com/scummvm/scummvm/commit/a7aec6c486b4e270966a1ea6fc8e8cf7c700f0e8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-27T13:03:46+01:00
Commit Message:
CONFIGURE: Implement mpeg2 as a component
Changed paths:
configure
engines/ags/configure.engine
engines/grim/configure.engine
engines/mtropolis/configure.engine
engines/qdengine/configure.engine
engines/sword1/configure.engine
engines/sword2/configure.engine
engines/testbed/configure.engine
engines/zvision/configure.engine
image/codecs/mpeg.h
video/module.mk
diff --git a/configure b/configure
index 5dbb5a64918..eb4c53af84d 100755
--- a/configure
+++ b/configure
@@ -312,7 +312,6 @@ add_feature gif "GIF" "_gif"
add_feature highres "high resolution" "_highres"
add_feature jpeg "JPEG" "_jpeg"
add_feature mad "MAD" "_mad"
-add_feature mpeg2 "mpeg2" "_mpeg2"
add_feature opengl_game_classic "OpenGL (classic)" "_opengl_game_classic"
add_feature opengl_game_shaders "OpenGL with shaders" "_opengl_game_shaders"
add_feature png "PNG" "_png"
@@ -332,6 +331,7 @@ add_component vpx "libvpx" "_vpx" "USE_VPX"
add_component theoradec "libtheoradec" "_theoradec" "USE_THEORADEC"
add_component midi "MIDI synthesis" "_midi" "USE_MIDI"
add_component mpc "MPC" "_libmpcdec" "USE_MPCDEC"
+add_component mpeg2 "mpeg2" "_mpeg2" "USE_MPEG2"
add_component sid_audio "SID audio" "_sid_audio" "USE_SID_AUDIO"
add_component tinygl "TinyGL" "_tinygl" "USE_TINYGL"
add_component universaltracker "External Tracker Libraries" "_universaltracker" "USE_UNIVERSALTRACKER"
@@ -5634,7 +5634,6 @@ if test "$_mpeg2" = yes ; then
append_var INCLUDES "$MPEG2_CFLAGS"
append_var LIBS "$MPEG2_LIBS -lmpeg2"
fi
-define_in_config_if_yes "$_mpeg2" 'USE_MPEG2'
echo "$_mpeg2"
#
diff --git a/engines/ags/configure.engine b/engines/ags/configure.engine
index d840bd5396f..615b13f53a5 100644
--- a/engines/ags/configure.engine
+++ b/engines/ags/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine ags "Adventure Game Studio" yes "" "" "16bit mad" "theoradec midi universaltracker"
+add_engine ags "Adventure Game Studio" yes "" "" "16bit mad" "theoradec midi universaltracker mpeg2"
diff --git a/engines/grim/configure.engine b/engines/grim/configure.engine
index c63eb913e0e..e8d6a206224 100644
--- a/engines/grim/configure.engine
+++ b/engines/grim/configure.engine
@@ -1,4 +1,4 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine grim "Grim" yes "monkey4" "Grim Fandango" "16bit 3d highres" "theoradec tinygl"
+add_engine grim "Grim" yes "monkey4" "Grim Fandango" "16bit 3d highres" "theoradec tinygl mpeg2"
add_engine monkey4 "Escape from Monkey Island" no "" "" "bink"
diff --git a/engines/mtropolis/configure.engine b/engines/mtropolis/configure.engine
index 36065a3cbcd..b6455dcb42e 100644
--- a/engines/mtropolis/configure.engine
+++ b/engines/mtropolis/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine mtropolis "mTropolis" yes "" "" "16bit highres" "midi"
+add_engine mtropolis "mTropolis" yes "" "" "16bit highres" "midi mpeg2"
diff --git a/engines/qdengine/configure.engine b/engines/qdengine/configure.engine
index c988b288866..3ad3b928457 100644
--- a/engines/qdengine/configure.engine
+++ b/engines/qdengine/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine qdengine "QD Engine" yes "" "" "vorbis 16bit highres mpeg2" "imgui mpc"
+add_engine qdengine "QD Engine" yes "" "" "vorbis 16bit highres mpeg2" "imgui mpc mpeg2"
diff --git a/engines/sword1/configure.engine b/engines/sword1/configure.engine
index d6b10a65a3c..353db127f05 100644
--- a/engines/sword1/configure.engine
+++ b/engines/sword1/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine sword1 "Broken Sword" yes "" "" "highres"
+add_engine sword1 "Broken Sword" yes "" "" "highres" "mpeg2"
diff --git a/engines/sword2/configure.engine b/engines/sword2/configure.engine
index ee32d0f7abd..04380751496 100644
--- a/engines/sword2/configure.engine
+++ b/engines/sword2/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine sword2 "Broken Sword II" yes "" "" "highres"
+add_engine sword2 "Broken Sword II" yes "" "" "highres" "mpeg2"
diff --git a/engines/testbed/configure.engine b/engines/testbed/configure.engine
index 4ba2464306c..15d4b43bf21 100644
--- a/engines/testbed/configure.engine
+++ b/engines/testbed/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine testbed "TestBed: the Testing framework" no "" "" "" "imgui midi universaltracker indeo3 indeo45 vpx mpc hnm"
+add_engine testbed "TestBed: the Testing framework" no "" "" "" "imgui midi universaltracker indeo3 indeo45 vpx mpc hnm mpeg2"
diff --git a/engines/zvision/configure.engine b/engines/zvision/configure.engine
index 9d681be3789..6ac360c20ff 100644
--- a/engines/zvision/configure.engine
+++ b/engines/zvision/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine zvision "Z-Vision" yes "" "" "freetype2 16bit highres" "midi"
+add_engine zvision "Z-Vision" yes "" "" "freetype2 16bit highres" "midi mpeg2"
diff --git a/image/codecs/mpeg.h b/image/codecs/mpeg.h
index 5b5eaf50de4..903354c49ec 100644
--- a/image/codecs/mpeg.h
+++ b/image/codecs/mpeg.h
@@ -19,14 +19,14 @@
*
*/
-#ifdef USE_MPEG2
-
#ifndef IMAGE_CODECS_MPEG_H
#define IMAGE_CODECS_MPEG_H
#include "image/codecs/codec.h"
#include "graphics/pixelformat.h"
+#ifdef USE_MPEG2
+
typedef struct mpeg2dec_s mpeg2dec_t;
typedef struct mpeg2_info_s mpeg2_info_t;
diff --git a/video/module.mk b/video/module.mk
index 8bee4bdfa1a..1616e8660f1 100644
--- a/video/module.mk
+++ b/video/module.mk
@@ -6,7 +6,6 @@ MODULE_OBJS := \
coktel_decoder.o \
dxa_decoder.o \
flic_decoder.o \
- mpegps_decoder.o \
mve_decoder.o \
paco_decoder.o \
psx_decoder.o \
@@ -25,6 +24,11 @@ MODULE_OBJS += \
hnm_decoder.o
endif
+ifdef USE_MPEG2
+MODULE_OBJS += \
+ mpegps_decoder.o
+endif
+
ifdef USE_THEORADEC
MODULE_OBJS += \
theora_decoder.o
More information about the Scummvm-git-logs
mailing list