[Scummvm-git-logs] scummvm master -> 6c8a0e45f1365cda42e3d2d3ce58a9d21c8d2291

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
6c8a0e45f1 DIRECTOR: Add the scale digital-video member property (D7)


Commit: 6c8a0e45f1365cda42e3d2d3ce58a9d21c8d2291
    https://github.com/scummvm/scummvm/commit/6c8a0e45f1365cda42e3d2d3ce58a9d21c8d2291
Author: Gianluca Boiano (morf3089 at gmail.com)
Date: 2026-07-15T19:14:00+02:00

Commit Message:
DIRECTOR: Add the scale digital-video member property (D7)

QuickTime members expose scale as a list of [x, y] playback
percentages; setting it aborted the handler mid-frame since
setObjectProp() found no such property.

Fixes stalled loading screen in physicus (Intro.dxr)

Changed paths:
    engines/director/castmember/digitalvideo.cpp
    engines/director/castmember/digitalvideo.h
    engines/director/lingo/lingo-the.cpp
    engines/director/lingo/lingo-the.h


diff --git a/engines/director/castmember/digitalvideo.cpp b/engines/director/castmember/digitalvideo.cpp
index 251449b0770..883137ef2a8 100644
--- a/engines/director/castmember/digitalvideo.cpp
+++ b/engines/director/castmember/digitalvideo.cpp
@@ -108,6 +108,7 @@ DigitalVideoCastMember::DigitalVideoCastMember(Cast *cast, uint16 castId)
 	_enableSound = true;
 	_crop = false;
 	_center = false;
+	_scaleX = _scaleY = 100;
 	_dirty = false;
 	_emptyFile = false;
 
@@ -183,6 +184,8 @@ DigitalVideoCastMember::DigitalVideoCastMember(Cast *cast, uint16 castId, Digita
 	_enableSound = source._enableSound;
 	_crop = source._crop;
 	_center = source._center;
+	_scaleX = source._scaleX;
+	_scaleY = source._scaleY;
 	_preload = source._preload;
 	_showControls = source._showControls;
 	_directToStage = source._directToStage;
@@ -626,8 +629,20 @@ Common::String DigitalVideoCastMember::formatInfo() {
 	);
 }
 
+Common::Rect DigitalVideoCastMember::getInitialRect() {
+	// Sprites are sized from this rect, and the widget stretches the
+	// decoded frame to the sprite bbox, so scaling here scales rendering.
+	Common::Rect rect = _initialRect;
+	if (_scaleX > 0 && _scaleX != 100)
+		rect.setWidth(_initialRect.width() * _scaleX / 100);
+	if (_scaleY > 0 && _scaleY != 100)
+		rect.setHeight(_initialRect.height() * _scaleY / 100);
+	return rect;
+}
+
 Common::Point DigitalVideoCastMember::getRegistrationOffset() {
-	return Common::Point(_initialRect.width() / 2, _initialRect.height() / 2);
+	Common::Rect rect = getInitialRect();
+	return Common::Point(rect.width() / 2, rect.height() / 2);
 }
 
 Common::Point DigitalVideoCastMember::getRegistrationOffset(int16 width, int16 height) {
@@ -649,6 +664,7 @@ bool DigitalVideoCastMember::hasField(int field) {
 	case kTheLoop:
 	case kThePausedAtStart:
 	case kThePreLoad:
+	case kTheScale:
 	case kTheSound:
 	case kTheTimeScale:
 	case kTheVideo:
@@ -701,6 +717,12 @@ Datum DigitalVideoCastMember::getField(int field) {
 	case kThePreLoad:
 		d = _preload;
 		break;
+	case kTheScale:
+		d.type = ARRAY;
+		d.u.farr = new FArray;
+		d.u.farr->arr.push_back(_scaleX);
+		d.u.farr->arr.push_back(_scaleY);
+		break;
 	case kTheSound:
 		d = _enableSound;
 		break;
@@ -744,8 +766,9 @@ void DigitalVideoCastMember::setField(int field, const Datum &d) {
 		CastMember::setField(field, d);
 		loadVideoFromCast();
 		if (_channel) {
-			_channel->setWidth(_initialRect.width());
-			_channel->setHeight(_initialRect.height());
+			Common::Rect rect = getInitialRect();
+			_channel->setWidth(rect.width());
+			_channel->setHeight(rect.height());
 		}
 		return;
 	case kTheFrameRate:
@@ -764,6 +787,19 @@ void DigitalVideoCastMember::setField(int field, const Datum &d) {
 	case kThePreLoad:
 		_preload = (bool)d.asInt();
 		return;
+	case kTheScale:
+		if ((d.type == ARRAY || d.type == POINT) && d.u.farr->arr.size() >= 2) {
+			_scaleX = d.u.farr->arr[0].asInt();
+			_scaleY = d.u.farr->arr[1].asInt();
+			if (_channel) {
+				Common::Rect rect = getInitialRect();
+				_channel->setWidth(rect.width());
+				_channel->setHeight(rect.height());
+			}
+		} else {
+			warning("DigitalVideoCastMember::setField(): scale expects an [x, y] percentage list, got %s", d.type2str());
+		}
+		return;
 	case kTheSound:
 		_enableSound = (bool)d.asInt();
 		return;
diff --git a/engines/director/castmember/digitalvideo.h b/engines/director/castmember/digitalvideo.h
index 315cf912918..ef62b65f7a2 100644
--- a/engines/director/castmember/digitalvideo.h
+++ b/engines/director/castmember/digitalvideo.h
@@ -73,6 +73,7 @@ public:
 
 	Common::String formatInfo() override;
 
+	Common::Rect getInitialRect() override;
 	Common::Point getRegistrationOffset() override;
 	Common::Point getRegistrationOffset(int16 width, int16 height) override;
 
@@ -89,6 +90,7 @@ public:
 	bool _crop;
 	bool _center;
 	bool _preload;
+	int _scaleX, _scaleY;	// D7+: playback size percentages [x, y]; [100, 100] = original size
 	bool _showControls;
 	bool _directToStage;
 	bool _avimovie, _qtmovie;
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index eb9bf8e18bd..11f06d77eb2 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -285,6 +285,7 @@ const TheEntityField fields[] = {
 	{ kTheSprite,	"movieTime",	kTheMovieTime,	300 },//		D3.1 P
 	{ kTheCast,		"pausedAtStart",kThePausedAtStart,400 },//				D4 p
 	{ kTheCast,		"preLoad",		kThePreLoad,	300 },//		D3.1 p
+	{ kTheCast,		"scale",		kTheScale,		700 },//							D7 p
 	{ kTheSprite,	"setTrackEnabled",kTheSetTrackEnabled, 500 },//				D5 p
 	{ kTheCast,		"sound",		kTheSound,		300 },//		D3.1 p // 0-1 off-on
 	{ kTheSprite,	"startTime",	kTheStartTime,	300 },//		D3.1 p
diff --git a/engines/director/lingo/lingo-the.h b/engines/director/lingo/lingo-the.h
index 58fe71e5f85..983c963d3b0 100644
--- a/engines/director/lingo/lingo-the.h
+++ b/engines/director/lingo/lingo-the.h
@@ -271,6 +271,7 @@ enum TheFieldType {
 	kTheRight,
 	kTheSampleRate,
 	kTheSampleSize,
+	kTheScale,
 	kTheScoreColor,
 	kTheScoreSelection,
 	kTheScript,