The wrapper for the VMD decoder is only used in the SCI engine for SCI32 games, so moved it inside the engine, instead of common code. Added support for VMD video playing from the "play_video" console command

svn-id: r46737

7 files changed, 231 insertions, 7 deletions

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 8b51ce2186..92b1d1c1ec 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -52,7 +52,10 @@
 #include "sci/gui/gui_cursor.h"
 
 #include "graphics/video/avi_decoder.h"
-#include "sci/seq_decoder.h"
+#include "sci/video/seq_decoder.h"
+#ifdef ENABLE_SCI32
+#include "sci/video/vmd_decoder.h"
+#endif
 
 #include "common/savefile.h"
 
@@ -245,6 +248,18 @@ void Console::postEnter() {
 			aviDecoder->closeFile();
 			delete player;
 			delete aviDecoder;
+		} else if (_videoFile.hasSuffix(".vmd")) {
+#ifdef ENABLE_SCI32
+			VMDDecoder *vmdDecoder = new VMDDecoder(g_system->getMixer());
+			Graphics::VideoPlayer *player = new Graphics::VideoPlayer(vmdDecoder);
+			if (vmdDecoder->loadFile(_videoFile.c_str()))
+				player->playVideo();
+			else
+				DebugPrintf("Failed to open movie file %s\n", _videoFile.c_str());
+			vmdDecoder->closeFile();
+			delete player;
+			delete vmdDecoder;
+#endif
 		}
 
 		_vm->_gamestate->_gui->showCursor();
@@ -1139,7 +1154,7 @@ bool Console::cmdUndither(int argc, const char **argv) {
 
 bool Console::cmdPlayVideo(int argc, const char **argv) {
 	if (argc < 2) {
-		DebugPrintf("Plays a SEQ or AVI video.\n");
+		DebugPrintf("Plays a SEQ, AVI or VMD video.\n");
 		DebugPrintf("Usage: %s <video file name> <delay>\n", argv[0]);
 		DebugPrintf("The video file name should include the extension\n");
 		DebugPrintf("Delay is only used in SEQ videos and is measured in ticks (default: 10)\n");
@@ -1149,7 +1164,7 @@ bool Console::cmdPlayVideo(int argc, const char **argv) {
 	Common::String filename = argv[1];
 	filename.toLowercase();
 
-	if (filename.hasSuffix(".seq") || filename.hasSuffix(".avi")) {
+	if (filename.hasSuffix(".seq") || filename.hasSuffix(".avi") || filename.hasSuffix(".vmd")) {
 		_videoFile = filename;
 		_videoFrameDelay = (argc == 2) ? 10 : atoi(argv[2]);
 		return false;
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index d553b5d0e2..51ad54d2c1 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -30,7 +30,7 @@
 #include "sci/sci.h"
 #include "sci/debug.h"	// for g_debug_sleeptime_factor
 #include "sci/resource.h"
-#include "sci/seq_decoder.h"
+#include "sci/video/seq_decoder.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
 #include "sci/gfx/operations.h"
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 39922f37f5..13d815e366 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -7,7 +7,6 @@ MODULE_OBJS := \
 	event.o \
 	resource.o \
 	sci.o \
-	seq_decoder.o \
 	vocabulary.o \
 	engine/game.o \
 	engine/gc.o \
@@ -80,7 +79,9 @@ MODULE_OBJS := \
 	sfx/seq/map-mt32-to-gm.o \
 	sfx/softseq/adlib.o \
 	sfx/softseq/amiga.o \
-	sfx/softseq/pcjr.o
+	sfx/softseq/pcjr.o \
+	video/seq_decoder.o \
+	video/vmd_decoder.o
 	
 ifdef ENABLE_SCI32
 MODULE_OBJS += \
diff --git a/engines/sci/seq_decoder.cpp b/engines/sci/video/seq_decoder.cpp
index 45c46d13c6..d3b1ea915d 100644
--- a/engines/sci/seq_decoder.cpp
+++ b/engines/sci/video/seq_decoder.cpp
@@ -31,7 +31,7 @@
 
 #include "graphics/surface.h"
 
-#include "sci/seq_decoder.h"
+#include "sci/video/seq_decoder.h"
 
 namespace Sci {
 
diff --git a/engines/sci/seq_decoder.h b/engines/sci/video/seq_decoder.h
index 7c810db05d..7c810db05d 100644
--- a/engines/sci/seq_decoder.h
+++ b/engines/sci/video/seq_decoder.h
diff --git a/engines/sci/video/vmd_decoder.cpp b/engines/sci/video/vmd_decoder.cpp
new file mode 100644
index 0000000000..4e56e51054
--- /dev/null
+++ b/engines/sci/video/vmd_decoder.cpp
@@ -0,0 +1,131 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifdef ENABLE_SCI32
+
+#include "sci/video/vmd_decoder.h"
+
+#include "common/archive.h"
+#include "common/endian.h"
+#include "common/util.h"
+#include "common/stream.h"
+#include "common/system.h"
+
+#include "graphics/dither.h"
+
+#include "sound/mixer.h"
+#include "sound/audiostream.h"
+
+namespace Sci {
+
+VMDDecoder::VMDDecoder(Audio::Mixer *mixer) : _mixer(mixer) {
+	_vmdDecoder = new Graphics::Vmd(new Graphics::PaletteLUT(5, Graphics::PaletteLUT::kPaletteYUV));
+}
+
+VMDDecoder::~VMDDecoder() {
+	closeFile();
+}
+
+uint32 VMDDecoder::getFrameWaitTime() {
+	return _vmdDecoder->getFrameWaitTime();
+}
+
+bool VMDDecoder::loadFile(const char *fileName) {
+	closeFile();
+
+	_fileStream = SearchMan.createReadStreamForMember(fileName);
+	if (!_fileStream)
+		return false;
+
+	if (!_vmdDecoder->load(*_fileStream))
+		return false;
+
+	if (_vmdDecoder->getFeatures() & Graphics::CoktelVideo::kFeaturesPalette) {
+		getPalette();
+		setPalette(_palette);
+	}
+
+	if (_vmdDecoder->getFeatures() & Graphics::CoktelVideo::kFeaturesSound)
+		_vmdDecoder->enableSound(*_mixer);
+
+	_videoInfo.width = _vmdDecoder->getWidth();
+	_videoInfo.height = _vmdDecoder->getHeight();
+	_videoInfo.frameCount = _vmdDecoder->getFramesCount();
+	_videoInfo.frameRate = _vmdDecoder->getFrameRate();
+	_videoInfo.frameDelay = _videoInfo.frameRate * 100;
+	_videoInfo.currentFrame = 0;
+	_videoInfo.firstframeOffset = 0;	// not really necessary for VMDs
+
+	if (_vmdDecoder->hasExtraData())
+		warning("This VMD video has extra embedded data, which is currently not handled");
+
+	_videoFrameBuffer = new byte[_videoInfo.width * _videoInfo.height];
+	memset(_videoFrameBuffer, 0, _videoInfo.width * _videoInfo.height);
+
+	_vmdDecoder->setVideoMemory(_videoFrameBuffer, _videoInfo.width, _videoInfo.height);
+
+	return true;
+}
+
+void VMDDecoder::closeFile() {
+	if (!_fileStream)
+		return;
+
+	_vmdDecoder->unload();
+
+	delete _fileStream;
+	_fileStream = 0;
+
+	delete[] _videoFrameBuffer;
+	_videoFrameBuffer = 0;
+}
+
+bool VMDDecoder::decodeNextFrame() {
+	if (_videoInfo.currentFrame == 0)
+		_videoInfo.startTime = g_system->getMillis();
+
+	Graphics::CoktelVideo::State state = _vmdDecoder->nextFrame();
+
+	if (state.flags & Graphics::CoktelVideo::kStatePalette) {
+		getPalette();
+		setPalette(_palette);
+	}
+
+	return ++_videoInfo.currentFrame < _videoInfo.frameCount;
+}
+
+void VMDDecoder::getPalette() {
+	const byte *pal = _vmdDecoder->getPalette();
+
+	for (int i = 0; i < 256; i++) {
+		_palette[i * 3 + 0] = pal[i * 3 + 0] << 2;
+		_palette[i * 3 + 1] = pal[i * 3 + 1] << 2;
+		_palette[i * 3 + 2] = pal[i * 3 + 2] << 2;
+	}
+}
+
+} // End of namespace Graphics
+
+#endif
diff --git a/engines/sci/video/vmd_decoder.h b/engines/sci/video/vmd_decoder.h
new file mode 100644
index 0000000000..63a7e92ab6
--- /dev/null
+++ b/engines/sci/video/vmd_decoder.h
@@ -0,0 +1,77 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifdef ENABLE_SCI32
+
+#ifndef GRAPHICS_VIDEO_VMD_DECODER_H
+#define GRAPHICS_VIDEO_VMD_DECODER_H
+
+#include "graphics/video/coktelvideo/coktelvideo.h"
+#include "graphics/video/video_player.h"
+#include "sound/mixer.h"
+
+namespace Sci {
+
+/**
+ * Wrapper for the Coktel Vision VMD video decoder
+ * for videos by Coktel Vision/Sierra.
+ *
+ * Video decoder used in engines:
+ *  - gob (without this wrapper)
+ *  - sci
+ */
+	class VMDDecoder : public Graphics::VideoDecoder {
+public:
+	VMDDecoder(Audio::Mixer *mixer);
+	virtual ~VMDDecoder();
+
+	uint32 getFrameWaitTime();
+
+	/**
+	 * Load a VMD encoded video file
+	 * @param filename	the filename to load
+	 */
+	bool loadFile(const char *filename);
+
+	/**
+	 * Close a VMD encoded video file
+	 */
+	void closeFile();
+
+	bool decodeNextFrame();
+
+private:
+	Graphics::Vmd *_vmdDecoder;
+	Audio::Mixer *_mixer;
+	byte _palette[256 * 3];
+
+	void getPalette();
+};
+
+} // End of namespace Graphics
+
+#endif
+
+#endif