[Scummvm-cvs-logs] SF.net SVN: scummvm:[46715] scummvm/trunk/graphics/video

[thebluegr at users.sourceforge.net]

Revision: 46715
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46715&view=rev
Author:   thebluegr
Date:     2009-12-29 19:42:26 +0000 (Tue, 29 Dec 2009)

Log Message:
-----------
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

Modified Paths:
--------------
    scummvm/trunk/graphics/video/coktelvideo/coktelvideo.h

Added Paths:
-----------
    scummvm/trunk/graphics/video/vmd_decoder.cpp
    scummvm/trunk/graphics/video/vmd_decoder.h

Modified: scummvm/trunk/graphics/video/coktelvideo/coktelvideo.h
===================================================================
--- scummvm/trunk/graphics/video/coktelvideo/coktelvideo.h	2009-12-29 18:28:26 UTC (rev 46714)
+++ scummvm/trunk/graphics/video/coktelvideo/coktelvideo.h	2009-12-29 19:42:26 UTC (rev 46715)
@@ -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
 

Added: scummvm/trunk/graphics/video/vmd_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/vmd_decoder.cpp	                        (rev 0)
+++ scummvm/trunk/graphics/video/vmd_decoder.cpp	2009-12-29 19:42:26 UTC (rev 46715)
@@ -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


Property changes on: scummvm/trunk/graphics/video/vmd_decoder.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Added: scummvm/trunk/graphics/video/vmd_decoder.h
===================================================================
--- scummvm/trunk/graphics/video/vmd_decoder.h	                        (rev 0)
+++ scummvm/trunk/graphics/video/vmd_decoder.h	2009-12-29 19:42:26 UTC (rev 46715)
@@ -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


Property changes on: scummvm/trunk/graphics/video/vmd_decoder.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.