aboutsummaryrefslogtreecommitdiff
path: root/graphics/video
diff options
context:
space:
mode:
authorFilippos Karapetis2009-12-29 19:42:26 +0000
committerFilippos Karapetis2009-12-29 19:42:26 +0000
commit14d4b75afb00a47be666c23fc8e740d67178d026 (patch)
tree6f8e65d273e6f3e7add756f105b1df6bbe40be20 /graphics/video
parentef0f48584729038189d8f31fd5a99f37f5a718e5 (diff)
downloadscummvm-rg350-14d4b75afb00a47be666c23fc8e740d67178d026.tar.gz
scummvm-rg350-14d4b75afb00a47be666c23fc8e740d67178d026.tar.bz2
scummvm-rg350-14d4b75afb00a47be666c23fc8e740d67178d026.zip
Added a thin wrapper around the VMD player class, so that it can be used with the common VideoPlayer interface, to be used with videos from SCI32 games
svn-id: r46715
Diffstat (limited to 'graphics/video')
-rw-r--r--graphics/video/coktelvideo/coktelvideo.h4
-rw-r--r--graphics/video/vmd_decoder.cpp131
-rw-r--r--graphics/video/vmd_decoder.h78
3 files changed, 211 insertions, 2 deletions
diff --git a/graphics/video/coktelvideo/coktelvideo.h b/graphics/video/coktelvideo/coktelvideo.h
index b0f38186a2..abb6bfd568 100644
--- a/graphics/video/coktelvideo/coktelvideo.h
+++ b/graphics/video/coktelvideo/coktelvideo.h
@@ -23,8 +23,8 @@
*
*/
-// Currently, only GOB plays IMDs and VMDs, so skip compiling if GOB is disabled.
-#if !(defined(ENABLE_GOB) || defined(DYNAMIC_MODULES))
+// Currently, only GOB and SCI32 games play IMDs and VMDs, so skip compiling if GOB and SCI32 is disabled.
+#if !(defined(ENABLE_GOB) || defined(ENABLE_SCI32) || defined(DYNAMIC_MODULES))
// Do not compile the CoktelVideo code
diff --git a/graphics/video/vmd_decoder.cpp b/graphics/video/vmd_decoder.cpp
new file mode 100644
index 0000000000..f39570fc04
--- /dev/null
+++ b/graphics/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$
+ *
+ */
+
+#include "graphics/video/vmd_decoder.h"
+
+#ifdef GRAPHICS_VIDEO_COKTELVIDEO_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 Graphics {
+
+VMDDecoder::VMDDecoder(Audio::Mixer *mixer) : _mixer(mixer) {
+ _vmdDecoder = new Vmd(new Graphics::PaletteLUT(5, 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() & CoktelVideo::kFeaturesPalette) {
+ getPalette();
+ setPalette(_palette);
+ }
+
+ if (_vmdDecoder->getFeatures() & 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();
+
+ CoktelVideo::State state = _vmdDecoder->nextFrame();
+
+ if (state.flags & 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 \ No newline at end of file
diff --git a/graphics/video/vmd_decoder.h b/graphics/video/vmd_decoder.h
new file mode 100644
index 0000000000..61ec0adf50
--- /dev/null
+++ b/graphics/video/vmd_decoder.h
@@ -0,0 +1,78 @@
+/* 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$
+ *
+ */
+
+#include "graphics/video/coktelvideo/coktelvideo.h"
+
+#ifdef GRAPHICS_VIDEO_COKTELVIDEO_H
+
+#ifndef GRAPHICS_VIDEO_VMD_DECODER_H
+#define GRAPHICS_VIDEO_VMD_DECODER_H
+
+#include "graphics/video/video_player.h"
+#include "sound/mixer.h"
+
+namespace Graphics {
+
+/**
+ * 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 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:
+ Vmd *_vmdDecoder;
+ Audio::Mixer *_mixer;
+ byte _palette[256 * 3];
+
+ void getPalette();
+};
+
+} // End of namespace Graphics
+
+#endif
+
+#endif