SCI: Add support for playing Mac QT videos in paletted screen formats

This is needed for the QT videos of the Mac version of KQ6
bluegr · Oct 31, 2024 · fa87276 · fa87276
1 parent 708fb4e
commit fa87276
Showing 1 changed file with 30 additions and 15 deletions.
diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp
@@ -130,32 +130,47 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) {
 		Common::Path filename(s->_segMan->getString(argv[0]));
 
 		if (g_sci->getPlatform() == Common::kPlatformMacintosh) {
-			// Mac QuickTime
-			// The only argument is the string for the video
+			// Mac QuickTime: the only argument is the string for the video
+			videoDecoder.reset(new Video::QuickTimeDecoder());
+			if (!videoDecoder->loadFile(filename)) {
+				warning("Could not open '%s'", filename.toString().c_str());
+				return NULL_REG;
+			}
 
-			// Switch to 16bpp graphics for Cinepak
-			if (g_system->getScreenFormat().bytesPerPixel == 1) {
+			if (videoDecoder->getPixelFormat() != g_system->getScreenFormat()) {
+				// Attempt to switch to a screen format with higher bpp
 				const Common::List<Graphics::PixelFormat> supportedFormats = g_system->getSupportedFormats();
 				Common::List<Graphics::PixelFormat>::const_iterator it;
 				for (it = supportedFormats.begin(); it != supportedFormats.end(); ++it) {
-					if (it->bytesPerPixel == 2) {
+					if (it->bytesPerPixel >= videoDecoder->getPixelFormat().bytesPerPixel) {
 						const Graphics::PixelFormat format = *it;
 						g_sci->_gfxScreen->gfxDriver()->initScreen(&format);
+						videoDecoder->setOutputPixelFormat(g_system->getScreenFormat());
 						switchedGraphicsMode = true;
-						syncLastFrame = false;
 						break;
 					}
 				}
-			}
 
-			if (g_system->getScreenFormat().bytesPerPixel == 1) {
-				warning("This video requires >8bpp color to be displayed, but could not switch to RGB color mode");
-				return NULL_REG;
+				if (!switchedGraphicsMode) {
+					if (g_system->getScreenFormat().isCLUT8()) {
+						// Dither the QuickTime video.
+						uint8 palette[256 * 3];
+						g_sci->_gfxScreen->grabPalette(palette, 0, 256);
+						videoDecoder->setDitheringPalette(palette);
+					} else {
+						videoDecoder->setOutputPixelFormat(g_system->getScreenFormat());
+					}
+				}
+			} else {
+				// Init the screen again
+				const Graphics::PixelFormat format = g_system->getScreenFormat();
+				g_sci->_gfxScreen->gfxDriver()->initScreen(&format);
+				videoDecoder->setOutputPixelFormat(g_system->getScreenFormat());
+				switchedGraphicsMode = true;
 			}
 
-			videoDecoder.reset(new Video::QuickTimeDecoder());
-			if (!videoDecoder->loadFile(filename))
-				error("Could not open '%s'", filename.toString().c_str());
+			// Never sync the last frame for QT movies
+			syncLastFrame = false;
 		} else {
 			// DOS SEQ
 			// SEQ's are called with no subops, just the string and delay
@@ -208,8 +223,8 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) {
 
 		playVideo(*videoDecoder);
 
-		// HACK: Switch back to 8bpp if we played a true color video.
-		// We also won't be copying the screen to the SCI screen...
+		// Switch back to 8bpp if we played a true color video.
+		// We also won't be copying the screen to the SCI screen.
 		if (switchedGraphicsMode)
 			g_sci->_gfxScreen->gfxDriver()->initScreen();
 		else if (syncLastFrame) {