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

2 files changed, 0 insertions, 209 deletions

diff --git a/graphics/video/vmd_decoder.cpp b/graphics/video/vmd_decoder.cpp
deleted file mode 100644
index d57eb49ee1..0000000000
--- a/graphics/video/vmd_decoder.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/* 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
diff --git a/graphics/video/vmd_decoder.h b/graphics/video/vmd_decoder.h
deleted file mode 100644
index 61ec0adf50..0000000000
--- a/graphics/video/vmd_decoder.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* 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