[Scummvm-git-logs] scummvm master -> 1ecf2545f154f99aa87a68c2940bd3c1c455eca4
sev-
noreply at scummvm.org
Wed Jan 29 21:01:18 UTC 2025
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7c277a49cb VIDEO: QTVR: Documented PanoSampleDesc
1ecf2545f1 BASE: Added a convenience alias --debug-flags for --debugflags
Commit: 7c277a49cbbb021269248d87fe2a22554144e4cb
https://github.com/scummvm/scummvm/commit/7c277a49cbbb021269248d87fe2a22554144e4cb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-29T22:01:05+01:00
Commit Message:
VIDEO: QTVR: Documented PanoSampleDesc
Changed paths:
video/qt_decoder.h
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index fe9b9a20d45..7ff7542d3bf 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -192,38 +192,41 @@ private:
PanoSampleDesc(Common::QuickTimeParser::Track *parentTrack, uint32 codecTag);
~PanoSampleDesc();
- uint32 _reserved1;
- uint32 _reserved2;
- int16 _majorVersion;
- int16 _minorVersion;
- int32 _sceneTrackID;
- int32 _loResSceneTrackID;
- byte _reserved3[4 * 6];
- int32 _hotSpotTrackID;
- byte _reserved4[4 * 9];
- float _hPanStart;
- float _hPanEnd;
- float _vPanTop;
- float _vPanBottom;
- float _minimumZoom;
- float _maximumZoom;
+ uint32 _reserved1; // must be zero
+ uint32 _reserved2; // must be zero
+
+ int16 _majorVersion; // must be zero, also observed to be 1
+ int16 _minorVersion; // must be zero, also observed to be 1
+
+ int32 _sceneTrackID; // ID of video track that contains panoramic scene
+ int32 _loResSceneTrackID; // ID of video track that contains low res panoramic scene
+ byte _reserved3[4 * 6]; // must be zero
+ int32 _hotSpotTrackID; // ID of video track that contains hotspot image
+ byte _reserved4[4 * 9]; // must be zero
+
+ float _hPanStart; // horizontal pan range start angle (e.g. 0)
+ float _hPanEnd; // horizontal pan range end angle (e.g. 360)
+ float _vPanTop; // vertical pan range top angle (e.g. 42.5)
+ float _vPanBottom; // vertical pan range bottom angle (e.g. -42.5)
+ float _minimumZoom; // minimum zoom angle (e.g. 5; use 0 for default)
+ float _maximumZoom; // maximum zoom angle (e.g. 65; use 0 for default)
// info for the highest res version of scene track
- uint32 _sceneSizeX;
- uint32 _sceneSizeY;
- uint32 _numFrames;
- int16 _reserved5;
- int16 _sceneNumFramesX;
- int16 _sceneNumFramesY;
- int16 _sceneColorDepth;
+ uint32 _sceneSizeX; // pixel width of the panorama (e.g. 768)
+ uint32 _sceneSizeY; // pixel height of the panorama (e.g. 2496)
+ uint32 _numFrames; // number of diced frames (e.g. 24)
+ int16 _reserved5; // must be zero
+ int16 _sceneNumFramesX; // diced frames wide (e.g. 1)
+ int16 _sceneNumFramesY; // diced frames high (e.g. 24)
+ int16 _sceneColorDepth; // bit depth of the scene track (e.g. 32)
// info for the highest rest version of hotSpot track
- int32 _hotSpotSizeX;
- int32 _hotSpotSizeY;
- int16 _reserved6;
- int16 _hotSpotNumFramesX;
- int16 _hotSpotNumFramesY;
- int16 _hotSpotColorDepth;
+ int32 _hotSpotSizeX; // pixel width of the hot spot panorama (e.g. 768)
+ int32 _hotSpotSizeY; // pixel height of the hot spot panorama (e.g. 2496)
+ int16 _reserved6; // must be zero
+ int16 _hotSpotNumFramesX; // diced frames wide (e.g. 1)
+ int16 _hotSpotNumFramesY; // diced frames high (e.g. 24)
+ int16 _hotSpotColorDepth; // must be 8
};
// The VideoTrackHandler is the bridge between the time of playback
Commit: 1ecf2545f154f99aa87a68c2940bd3c1c455eca4
https://github.com/scummvm/scummvm/commit/1ecf2545f154f99aa87a68c2940bd3c1c455eca4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-01-29T22:01:05+01:00
Commit Message:
BASE: Added a convenience alias --debug-flags for --debugflags
Changed paths:
base/commandLine.cpp
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 234ab0b51fb..dd0993e4893 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -518,7 +518,7 @@ bool ensureAccessibleDirectoryForPathOption(Common::FSNode &node,
#ifndef DISABLE_COMMAND_LINE
// Use this for options which have an *optional* value
-#define DO_OPTION_OPT(shortCmd, longCmd, defaultVal) \
+#define DO_OPTION_OPT_ALIASED(shortCmd, longCmd, defaultVal, settingsKey) \
if (isLongCmd ? (!strcmp(s + 2, longCmd) || !strncmp(s + 2, longCmd"=", sizeof(longCmd"=") - 1)) : (tolower(s[1]) == shortCmd)) { \
s += 2; \
if (isLongCmd) { \
@@ -529,13 +529,21 @@ bool ensureAccessibleDirectoryForPathOption(Common::FSNode &node,
const char *option = s; \
if (*s == '\0' && !isLongCmd) { option = s2; i++; } \
if (!option || *option == '\0') option = defaultVal; \
- if (option) settings[longCmd] = option;
+ if (option) settings[settingsKey] = option;
+
+#define DO_OPTION_OPT(shortCmd, longCmd, defaultVal) \
+ DO_OPTION_OPT_ALIASED(shortCmd, longCmd, defaultVal, longCmd)
// Use this for options which have a required (string) value
#define DO_OPTION(shortCmd, longCmd) \
DO_OPTION_OPT(shortCmd, longCmd, 0) \
if (!option) usage("Option '%s' requires an argument", argv[isLongCmd ? i : i-1]);
+// Use this for options alias which have a required (string) value
+#define DO_OPTION_ALIASED(shortCmd, longCmd, settingsKey) \
+ DO_OPTION_OPT_ALIASED(shortCmd, longCmd, 0, settingsKey) \
+ if (!option) usage("Option '%s' requires an argument", argv[isLongCmd ? i : i-1]);
+
// Use this for options which have a required integer value
// (we don't check ERANGE because WinCE doesn't support errno, so we're stuck just rejecting LONG_MAX/LONG_MIN..)
#define DO_OPTION_INT(shortCmd, longCmd) \
@@ -593,6 +601,8 @@ bool ensureAccessibleDirectoryForPathOption(Common::FSNode &node,
#define DO_LONG_OPTION_PATH(longCmd) DO_OPTION_PATH(0, longCmd)
#define DO_LONG_COMMAND(longCmd) DO_COMMAND(0, longCmd)
+#define DO_LONG_OPTION_ALIASED(longCmd, settingsKey) DO_OPTION_ALIASED(0, longCmd, settingsKey)
+
// End an option handler
#define END_OPTION \
continue; \
@@ -737,6 +747,9 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
DO_LONG_OPTION("debugflags")
END_OPTION
+ DO_LONG_OPTION_ALIASED("debug-flags", "debugflags")
+ END_OPTION
+
DO_LONG_OPTION_BOOL("debug-channels-only")
END_OPTION
More information about the Scummvm-git-logs
mailing list