Merge remote-tracking branch 'origin/master' into soltys_wip2

5 files changed, 2553 insertions, 8 deletions

diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
new file mode 100644
index 0000000000..c02042f972
--- /dev/null
+++ b/video/bink_decoder.cpp
@@ -0,0 +1,1634 @@
+/* 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.
+ *
+ */
+
+// Based on eos' Bink decoder which is in turn
+// based quite heavily on the Bink decoder found in FFmpeg.
+// Many thanks to Kostya Shishkov for doing the hard work.
+
+#include "audio/decoders/raw.h"
+
+#include "common/util.h"
+#include "common/textconsole.h"
+#include "common/math.h"
+#include "common/stream.h"
+#include "common/file.h"
+#include "common/str.h"
+#include "common/bitstream.h"
+#include "common/huffman.h"
+#include "common/rdft.h"
+#include "common/dct.h"
+#include "common/system.h"
+
+#include "graphics/yuv_to_rgb.h"
+#include "graphics/surface.h"
+
+#include "video/binkdata.h"
+#include "video/bink_decoder.h"
+
+static const uint32 kBIKfID = MKTAG('B', 'I', 'K', 'f');
+static const uint32 kBIKgID = MKTAG('B', 'I', 'K', 'g');
+static const uint32 kBIKhID = MKTAG('B', 'I', 'K', 'h');
+static const uint32 kBIKiID = MKTAG('B', 'I', 'K', 'i');
+
+static const uint32 kVideoFlagAlpha = 0x00100000;
+
+static const uint16 kAudioFlagDCT    = 0x1000;
+static const uint16 kAudioFlagStereo = 0x2000;
+
+// Number of bits used to store first DC value in bundle
+static const uint32 kDCStartBits = 11;
+
+namespace Video {
+
+BinkDecoder::VideoFrame::VideoFrame() : bits(0) {
+}
+
+BinkDecoder::VideoFrame::~VideoFrame() {
+	delete bits;
+}
+
+
+BinkDecoder::AudioTrack::AudioTrack() : bits(0), bands(0), rdft(0), dct(0) {
+}
+
+BinkDecoder::AudioTrack::~AudioTrack() {
+	delete bits;
+
+	delete[] bands;
+
+	delete rdft;
+	delete dct;
+}
+
+
+BinkDecoder::BinkDecoder() {
+	_bink = 0;
+	_audioTrack = 0;
+
+	for (int i = 0; i < 16; i++)
+		_huffman[i] = 0;
+
+	for (int i = 0; i < kSourceMAX; i++) {
+		_bundles[i].countLength = 0;
+
+		_bundles[i].huffman.index = 0;
+		for (int j = 0; j < 16; j++)
+			_bundles[i].huffman.symbols[j] = j;
+
+		_bundles[i].data     = 0;
+		_bundles[i].dataEnd  = 0;
+		_bundles[i].curDec   = 0;
+		_bundles[i].curPtr   = 0;
+	}
+
+	for (int i = 0; i < 16; i++) {
+		_colHighHuffman[i].index = 0;
+		for (int j = 0; j < 16; j++)
+			_colHighHuffman[i].symbols[j] = j;
+	}
+
+	for (int i = 0; i < 4; i++) {
+		_curPlanes[i] = 0;
+		_oldPlanes[i] = 0;
+	}
+
+	_audioStream = 0;
+	_audioStarted = false;
+}
+
+BinkDecoder::~BinkDecoder() {
+	close();
+}
+
+void BinkDecoder::close() {
+	reset();
+
+	if (_audioStream) {
+		// Stop audio
+		g_system->getMixer()->stopHandle(_audioHandle);
+		_audioStream = 0;
+	}
+
+	_audioStarted = false;
+
+	for (int i = 0; i < 4; i++) {
+		delete[] _curPlanes[i]; _curPlanes[i] = 0;
+		delete[] _oldPlanes[i]; _oldPlanes[i] = 0;
+	}
+
+	deinitBundles();
+
+	for (int i = 0; i < 16; i++) {
+		delete _huffman[i];
+		_huffman[i] = 0;
+	}
+
+	delete _bink; _bink = 0;
+	_surface.free();
+
+	_audioTrack = 0;
+
+	for (int i = 0; i < kSourceMAX; i++) {
+		_bundles[i].countLength = 0;
+
+		_bundles[i].huffman.index = 0;
+		for (int j = 0; j < 16; j++)
+			_bundles[i].huffman.symbols[j] = j;
+
+		_bundles[i].data     = 0;
+		_bundles[i].dataEnd  = 0;
+		_bundles[i].curDec   = 0;
+		_bundles[i].curPtr   = 0;
+	}
+
+	for (int i = 0; i < 16; i++) {
+		_colHighHuffman[i].index = 0;
+		for (int j = 0; j < 16; j++)
+			_colHighHuffman[i].symbols[j] = j;
+	}
+
+	_audioTracks.clear();
+	_frames.clear();
+}
+
+uint32 BinkDecoder::getElapsedTime() const {
+	if (_audioStream && g_system->getMixer()->isSoundHandleActive(_audioHandle))
+		return g_system->getMixer()->getSoundElapsedTime(_audioHandle);
+
+	return g_system->getMillis() - _startTime;
+}
+
+const Graphics::Surface *BinkDecoder::decodeNextFrame() {
+	if (endOfVideo())
+		return 0;
+
+	VideoFrame &frame = _frames[_curFrame + 1];
+
+	if (!_bink->seek(frame.offset))
+		error("Bad bink seek");
+
+	uint32 frameSize = frame.size;
+
+	for (uint32 i = 0; i < _audioTracks.size(); i++) {
+		AudioTrack &audio = _audioTracks[i];
+
+		uint32 audioPacketLength = _bink->readUint32LE();
+
+		frameSize -= 4;
+
+		if (frameSize < audioPacketLength)
+			error("Audio packet too big for the frame");
+
+		if (audioPacketLength >= 4) {
+			if (i == _audioTrack) {
+				// Only play one audio track
+
+				//                  Number of samples in bytes
+				audio.sampleCount = _bink->readUint32LE() / (2 * audio.channels);
+
+				audio.bits = new Common::BitStream32LE(*_bink, (audioPacketLength - 4) * 8);
+
+				audioPacket(audio);
+
+				delete audio.bits;
+				audio.bits = 0;
+
+			} else
+				// Skip the rest
+				_bink->skip(audioPacketLength);
+
+			frameSize -= audioPacketLength;
+		}
+	}
+
+	frame.bits = new Common::BitStream32LE(*_bink, frameSize * 8);
+
+	videoPacket(frame);
+
+	delete frame.bits;
+	frame.bits = 0;
+
+	_curFrame++;
+	if (_curFrame == 0)
+		_startTime = g_system->getMillis();
+
+	if (!_audioStarted && _audioStream) {
+		_audioStarted = true;
+		g_system->getMixer()->playStream(Audio::Mixer::kPlainSoundType, &_audioHandle, _audioStream);
+	}
+
+	return &_surface;
+}
+
+void BinkDecoder::audioPacket(AudioTrack &audio) {
+	if (!_audioStream)
+		return;
+
+	int outSize = audio.frameLen * audio.channels;
+	while (audio.bits->pos() < audio.bits->size()) {
+		int16 *out = (int16 *)malloc(outSize * 2);
+		memset(out, 0, outSize * 2);
+
+		audioBlock(audio, out);
+
+		byte flags = Audio::FLAG_16BITS;
+		if (audio.outChannels == 2)
+			flags |= Audio::FLAG_STEREO;
+
+#ifdef SCUMM_LITTLE_ENDIAN
+		flags |= Audio::FLAG_LITTLE_ENDIAN;
+#endif
+
+		_audioStream->queueBuffer((byte *)out, audio.blockSize * 2, DisposeAfterUse::YES, flags);
+
+		if (audio.bits->pos() & 0x1F) // next data block starts at a 32-byte boundary
+			audio.bits->skip(32 - (audio.bits->pos() & 0x1F));
+	}
+}
+
+void BinkDecoder::videoPacket(VideoFrame &video) {
+	assert(video.bits);
+
+	if (_hasAlpha) {
+		if (_id == kBIKiID)
+			video.bits->skip(32);
+
+		decodePlane(video, 3, false);
+	}
+
+	if (_id == kBIKiID)
+		video.bits->skip(32);
+
+	for (int i = 0; i < 3; i++) {
+		int planeIdx = ((i == 0) || !_swapPlanes) ? i : (i ^ 3);
+
+		decodePlane(video, planeIdx, i != 0);
+
+		if (video.bits->pos() >= video.bits->size())
+			break;
+	}
+
+	// Convert the YUV data we have to our format
+	// We're ignoring alpha for now
+	assert(_curPlanes[0] && _curPlanes[1] && _curPlanes[2]);
+	Graphics::convertYUV420ToRGB(&_surface, _curPlanes[0], _curPlanes[1], _curPlanes[2],
+			_surface.w, _surface.h, _surface.w, _surface.w >> 1);
+
+	// And swap the planes with the reference planes
+	for (int i = 0; i < 4; i++)
+		SWAP(_curPlanes[i], _oldPlanes[i]);
+}
+
+void BinkDecoder::decodePlane(VideoFrame &video, int planeIdx, bool isChroma) {
+
+	uint32 blockWidth  = isChroma ? ((_surface.w  + 15) >> 4) : ((_surface.w  + 7) >> 3);
+	uint32 blockHeight = isChroma ? ((_surface.h + 15) >> 4) : ((_surface.h + 7) >> 3);
+	uint32 width       = isChroma ?  (_surface.w        >> 1) :   _surface.w;
+	uint32 height      = isChroma ?  (_surface.h       >> 1) :   _surface.h;
+
+	DecodeContext ctx;
+
+	ctx.video     = &video;
+	ctx.planeIdx  = planeIdx;
+	ctx.destStart = _curPlanes[planeIdx];
+	ctx.destEnd   = _curPlanes[planeIdx] + width * height;
+	ctx.prevStart = _oldPlanes[planeIdx];
+	ctx.prevEnd   = _oldPlanes[planeIdx] + width * height;
+	ctx.pitch     = width;
+
+	for (int i = 0; i < 64; i++) {
+		ctx.coordMap[i] = (i & 7) + (i >> 3) * ctx.pitch;
+
+		ctx.coordScaledMap1[i] = ((i & 7) * 2 + 0) + (((i >> 3) * 2 + 0) * ctx.pitch);
+		ctx.coordScaledMap2[i] = ((i & 7) * 2 + 1) + (((i >> 3) * 2 + 0) * ctx.pitch);
+		ctx.coordScaledMap3[i] = ((i & 7) * 2 + 0) + (((i >> 3) * 2 + 1) * ctx.pitch);
+		ctx.coordScaledMap4[i] = ((i & 7) * 2 + 1) + (((i >> 3) * 2 + 1) * ctx.pitch);
+	}
+
+	for (int i = 0; i < kSourceMAX; i++) {
+		_bundles[i].countLength = _bundles[i].countLengths[isChroma ? 1 : 0];
+
+		readBundle(video, (Source) i);
+	}
+
+	for (ctx.blockY = 0; ctx.blockY < blockHeight; ctx.blockY++) {
+		readBlockTypes  (video, _bundles[kSourceBlockTypes]);
+		readBlockTypes  (video, _bundles[kSourceSubBlockTypes]);
+		readColors      (video, _bundles[kSourceColors]);
+		readPatterns    (video, _bundles[kSourcePattern]);
+		readMotionValues(video, _bundles[kSourceXOff]);
+		readMotionValues(video, _bundles[kSourceYOff]);
+		readDCS         (video, _bundles[kSourceIntraDC], kDCStartBits, false);
+		readDCS         (video, _bundles[kSourceInterDC], kDCStartBits, true);
+		readRuns        (video, _bundles[kSourceRun]);
+
+		ctx.dest = ctx.destStart + 8 * ctx.blockY * ctx.pitch;
+		ctx.prev = ctx.prevStart + 8 * ctx.blockY * ctx.pitch;
+
+		for (ctx.blockX = 0; ctx.blockX < blockWidth; ctx.blockX++, ctx.dest += 8, ctx.prev += 8) {
+			BlockType blockType = (BlockType) getBundleValue(kSourceBlockTypes);
+
+			// 16x16 block type on odd line means part of the already decoded block, so skip it
+			if ((ctx.blockY & 1) && (blockType == kBlockScaled)) {
+				ctx.blockX += 1;
+				ctx.dest   += 8;
+				ctx.prev   += 8;
+				continue;
+			}
+
+			switch (blockType) {
+				case kBlockSkip:
+					blockSkip(ctx);
+					break;
+
+				case kBlockScaled:
+					blockScaled(ctx);
+					break;
+
+				case kBlockMotion:
+					blockMotion(ctx);
+					break;
+
+				case kBlockRun:
+					blockRun(ctx);
+					break;
+
+				case kBlockResidue:
+					blockResidue(ctx);
+					break;
+
+				case kBlockIntra:
+					blockIntra(ctx);
+					break;
+
+				case kBlockFill:
+					blockFill(ctx);
+					break;
+
+				case kBlockInter:
+					blockInter(ctx);
+					break;
+
+				case kBlockPattern:
+					blockPattern(ctx);
+					break;
+
+				case kBlockRaw:
+					blockRaw(ctx);
+					break;
+
+				default:
+					error("Unknown block type: %d", blockType);
+			}
+
+		}
+
+	}
+
+	if (video.bits->pos() & 0x1F) // next plane data starts at 32-bit boundary
+		video.bits->skip(32 - (video.bits->pos() & 0x1F));
+
+}
+
+void BinkDecoder::readBundle(VideoFrame &video, Source source) {
+	if (source == kSourceColors) {
+		for (int i = 0; i < 16; i++)
+			readHuffman(video, _colHighHuffman[i]);
+
+		_colLastVal = 0;
+	}
+
+	if ((source != kSourceIntraDC) && (source != kSourceInterDC))
+		readHuffman(video, _bundles[source].huffman);
+
+	_bundles[source].curDec = _bundles[source].data;
+	_bundles[source].curPtr = _bundles[source].data;
+}
+
+void BinkDecoder::readHuffman(VideoFrame &video, Huffman &huffman) {
+	huffman.index = video.bits->getBits(4);
+
+	if (huffman.index == 0) {
+		// The first tree always gives raw nibbles
+
+		for (int i = 0; i < 16; i++)
+			huffman.symbols[i] = i;
+
+		return;
+	}
+
+	byte hasSymbol[16];
+
+	if (video.bits->getBit()) {
+		// Symbol selection
+
+		memset(hasSymbol, 0, 16);
+
+		uint8 length = video.bits->getBits(3);
+		for (int i = 0; i <= length; i++) {
+			huffman.symbols[i] = video.bits->getBits(4);
+			hasSymbol[huffman.symbols[i]] = 1;
+		}
+
+		for (int i = 0; i < 16; i++)
+			if (hasSymbol[i] == 0)
+				huffman.symbols[++length] = i;
+
+		return;
+	}
+
+	// Symbol shuffling
+
+	byte tmp1[16], tmp2[16];
+	byte *in = tmp1, *out = tmp2;
+
+	uint8 depth = video.bits->getBits(2);
+
+	for (int i = 0; i < 16; i++)
+		in[i] = i;
+
+	for (int i = 0; i <= depth; i++) {
+		int size = 1 << i;
+
+		for (int j = 0; j < 16; j += (size << 1))
+			mergeHuffmanSymbols(video, out + j, in + j, size);
+
+		SWAP(in, out);
+	}
+
+	memcpy(huffman.symbols, in, 16);
+}
+
+void BinkDecoder::mergeHuffmanSymbols(VideoFrame &video, byte *dst, const byte *src, int size) {
+	const byte *src2  = src + size;
+	int         size2 = size;
+
+	do {
+		if (!video.bits->getBit()) {
+			*dst++ = *src++;
+			size--;
+		} else {
+			*dst++ = *src2++;
+			size2--;
+		}
+
+	} while (size && size2);
+
+	while (size--)
+		*dst++ = *src++;
+	while (size2--)
+		*dst++ = *src2++;
+}
+
+bool BinkDecoder::loadStream(Common::SeekableReadStream *stream) {
+	close();
+
+	_id = stream->readUint32BE();
+	if ((_id != kBIKfID) && (_id != kBIKgID) && (_id != kBIKhID) && (_id != kBIKiID))
+		return false;
+
+	uint32 fileSize         = stream->readUint32LE() + 8;
+	uint32 frameCount       = stream->readUint32LE();
+	uint32 largestFrameSize = stream->readUint32LE();
+
+	if (largestFrameSize > fileSize) {
+		warning("Largest frame size greater than file size");
+		return false;
+	}
+
+	stream->skip(4);
+
+	uint32 width  = stream->readUint32LE();
+	uint32 height = stream->readUint32LE();
+
+	uint32 frameRateNum = stream->readUint32LE();
+	uint32 frameRateDen = stream->readUint32LE();
+	if (frameRateNum == 0 || frameRateDen == 0) {
+		warning("Invalid frame rate (%d/%d)", frameRateNum, frameRateDen);
+		return false;
+	}
+
+	_frameRate = Common::Rational(frameRateNum, frameRateDen);
+	_bink = stream;
+
+	_videoFlags = _bink->readUint32LE();
+
+	uint32 audioTrackCount = _bink->readUint32LE();
+
+	if (audioTrackCount > 1) {
+		warning("More than one audio track found. Using the first one");
+
+		_audioTrack = 0;
+	}
+
+	if (audioTrackCount > 0) {
+		_audioTracks.reserve(audioTrackCount);
+
+		_bink->skip(4 * audioTrackCount);
+
+		// Reading audio track properties
+		for (uint32 i = 0; i < audioTrackCount; i++) {
+			AudioTrack track;
+
+			track.sampleRate = _bink->readUint16LE();
+			track.flags      = _bink->readUint16LE();
+
+			_audioTracks.push_back(track);
+
+			initAudioTrack(_audioTracks[i]);
+		}
+
+		_bink->skip(4 * audioTrackCount);
+	}
+
+	// Reading video frame properties
+	_frames.resize(frameCount);
+	for (uint32 i = 0; i < frameCount; i++) {
+		_frames[i].offset   = _bink->readUint32LE();
+		_frames[i].keyFrame = _frames[i].offset & 1;
+
+		_frames[i].offset &= ~1;
+
+		if (i != 0)
+			_frames[i - 1].size = _frames[i].offset - _frames[i - 1].offset;
+
+		_frames[i].bits = 0;
+	}
+
+	_frames[frameCount - 1].size = _bink->size() - _frames[frameCount - 1].offset;
+
+	_hasAlpha   = _videoFlags & kVideoFlagAlpha;
+	_swapPlanes = (_id == kBIKhID) || (_id == kBIKiID); // BIKh and BIKi swap the chroma planes
+
+	Graphics::PixelFormat format = g_system->getScreenFormat();
+	_surface.create(width, height, format);
+
+	// Give the planes a bit extra space
+	width  = _surface.w  + 32;
+	height = _surface.h + 32;
+
+	_curPlanes[0] = new byte[ width       *  height      ]; // Y
+	_curPlanes[1] = new byte[(width >> 1) * (height >> 1)]; // U, 1/4 resolution
+	_curPlanes[2] = new byte[(width >> 1) * (height >> 1)]; // V, 1/4 resolution
+	_curPlanes[3] = new byte[ width       *  height      ]; // A
+	_oldPlanes[0] = new byte[ width       *  height      ]; // Y
+	_oldPlanes[1] = new byte[(width >> 1) * (height >> 1)]; // U, 1/4 resolution
+	_oldPlanes[2] = new byte[(width >> 1) * (height >> 1)]; // V, 1/4 resolution
+	_oldPlanes[3] = new byte[ width       *  height      ]; // A
+
+	// Initialize the video with solid black
+	memset(_curPlanes[0],   0,  width       *  height      );
+	memset(_curPlanes[1],   0, (width >> 1) * (height >> 1));
+	memset(_curPlanes[2],   0, (width >> 1) * (height >> 1));
+	memset(_curPlanes[3], 255,  width       *  height      );
+	memset(_oldPlanes[0],   0,  width       *  height      );
+	memset(_oldPlanes[1],   0, (width >> 1) * (height >> 1));
+	memset(_oldPlanes[2],   0, (width >> 1) * (height >> 1));
+	memset(_oldPlanes[3], 255,  width       *  height      );
+
+	initBundles();
+	initHuffman();
+
+	if (_audioTrack < _audioTracks.size()) {
+		const AudioTrack &audio = _audioTracks[_audioTrack];
+
+		_audioStream = Audio::makeQueuingAudioStream(audio.outSampleRate, audio.outChannels == 2);
+	}
+
+	return true;
+}
+
+void BinkDecoder::initAudioTrack(AudioTrack &audio) {
+	audio.sampleCount = 0;
+	audio.bits        = 0;
+
+	audio.channels = ((audio.flags & kAudioFlagStereo) != 0) ? 2 : 1;
+	audio.codec    = ((audio.flags & kAudioFlagDCT   ) != 0) ? kAudioCodecDCT : kAudioCodecRDFT;
+
+	if (audio.channels > kAudioChannelsMax)
+		error("Too many audio channels: %d", audio.channels);
+
+	uint32 frameLenBits;
+	// Calculate frame length
+	if     (audio.sampleRate < 22050)
+		frameLenBits =  9;
+	else if(audio.sampleRate < 44100)
+		frameLenBits = 10;
+	else
+		frameLenBits = 11;
+
+	audio.frameLen = 1 << frameLenBits;
+
+	audio.outSampleRate = audio.sampleRate;
+	audio.outChannels   = audio.channels;
+
+	if (audio.codec  == kAudioCodecRDFT) {
+		// RDFT audio already interleaves the samples correctly
+
+		if (audio.channels == 2)
+			frameLenBits++;
+
+		audio.sampleRate *= audio.channels;
+		audio.frameLen   *= audio.channels;
+		audio.channels    = 1;
+	}
+
+	audio.overlapLen = audio.frameLen / 16;
+	audio.blockSize  = (audio.frameLen - audio.overlapLen) * audio.channels;
+	audio.root       = 2.0 / sqrt((double)audio.frameLen);
+
+	uint32 sampleRateHalf = (audio.sampleRate + 1) / 2;
+
+	// Calculate number of bands
+	for (audio.bandCount = 1; audio.bandCount < 25; audio.bandCount++)
+		if (sampleRateHalf <= binkCriticalFreqs[audio.bandCount - 1])
+			break;
+
+	audio.bands = new uint32[audio.bandCount + 1];
+
+	// Populate bands
+	audio.bands[0] = 1;
+	for (uint32 i = 1; i < audio.bandCount; i++)
+		audio.bands[i] = binkCriticalFreqs[i - 1] * (audio.frameLen / 2) / sampleRateHalf;
+	audio.bands[audio.bandCount] = audio.frameLen / 2;
+
+	audio.first = true;
+
+	for (uint8 i = 0; i < audio.channels; i++)
+		audio.coeffsPtr[i] = audio.coeffs + i * audio.frameLen;
+
+	audio.codec = ((audio.flags & kAudioFlagDCT) != 0) ? kAudioCodecDCT : kAudioCodecRDFT;
+
+	if      (audio.codec == kAudioCodecRDFT)
+		audio.rdft = new Common::RDFT(frameLenBits, Common::RDFT::DFT_C2R);
+	else if (audio.codec == kAudioCodecDCT)
+		audio.dct  = new Common::DCT(frameLenBits, Common::DCT::DCT_III);
+}
+
+void BinkDecoder::initBundles() {
+	uint32 bw     = (_surface.w  + 7) >> 3;
+	uint32 bh     = (_surface.h + 7) >> 3;
+	uint32 blocks = bw * bh;
+
+	for (int i = 0; i < kSourceMAX; i++) {
+		_bundles[i].data    = new byte[blocks * 64];
+		_bundles[i].dataEnd = _bundles[i].data + blocks * 64;
+	}
+
+	uint32 cbw[2] = { (_surface.w + 7) >> 3, (_surface.w  + 15) >> 4 };
+	uint32 cw [2] = {  _surface.w          ,  _surface.w        >> 1 };
+
+	// Calculate the lengths of an element count in bits
+	for (int i = 0; i < 2; i++) {
+		int width = MAX<uint32>(cw[i], 8);
+
+		_bundles[kSourceBlockTypes   ].countLengths[i] = Common::intLog2((width  >> 3)    + 511) + 1;
+		_bundles[kSourceSubBlockTypes].countLengths[i] = Common::intLog2((width  >> 4)    + 511) + 1;
+		_bundles[kSourceColors       ].countLengths[i] = Common::intLog2((width  >> 3)*64 + 511) + 1;
+		_bundles[kSourceIntraDC      ].countLengths[i] = Common::intLog2((width  >> 3)    + 511) + 1;
+		_bundles[kSourceInterDC      ].countLengths[i] = Common::intLog2((width  >> 3)    + 511) + 1;
+		_bundles[kSourceXOff         ].countLengths[i] = Common::intLog2((width  >> 3)    + 511) + 1;
+		_bundles[kSourceYOff         ].countLengths[i] = Common::intLog2((width  >> 3)    + 511) + 1;
+		_bundles[kSourcePattern      ].countLengths[i] = Common::intLog2((cbw[i] << 3)    + 511) + 1;
+		_bundles[kSourceRun          ].countLengths[i] = Common::intLog2((width  >> 3)*48 + 511) + 1;
+	}
+}
+
+void BinkDecoder::deinitBundles() {
+	for (int i = 0; i < kSourceMAX; i++)
+		delete[] _bundles[i].data;
+}
+
+void BinkDecoder::initHuffman() {
+	for (int i = 0; i < 16; i++)
+		_huffman[i] = new Common::Huffman(binkHuffmanLengths[i][15], 16, binkHuffmanCodes[i], binkHuffmanLengths[i]);
+}
+
+byte BinkDecoder::getHuffmanSymbol(VideoFrame &video, Huffman &huffman) {
+	return huffman.symbols[_huffman[huffman.index]->getSymbol(*video.bits)];
+}
+
+int32 BinkDecoder::getBundleValue(Source source) {
+	if ((source < kSourceXOff) || (source == kSourceRun))
+		return *_bundles[source].curPtr++;
+
+	if ((source == kSourceXOff) || (source == kSourceYOff))
+		return (int8) *_bundles[source].curPtr++;
+
+	int16 ret = *((int16 *) _bundles[source].curPtr);
+
+	_bundles[source].curPtr += 2;
+
+	return ret;
+}
+
+uint32 BinkDecoder::readBundleCount(VideoFrame &video, Bundle &bundle) {
+	if (!bundle.curDec || (bundle.curDec > bundle.curPtr))
+		return 0;
+
+	uint32 n = video.bits->getBits(bundle.countLength);
+	if (n == 0)
+		bundle.curDec = 0;
+
+	return n;
+}
+
+void BinkDecoder::blockSkip(DecodeContext &ctx) {
+	byte *dest = ctx.dest;
+	byte *prev = ctx.prev;
+
+	for (int j = 0; j < 8; j++, dest += ctx.pitch, prev += ctx.pitch)
+		memcpy(dest, prev, 8);
+}
+
+void BinkDecoder::blockScaledSkip(DecodeContext &ctx) {
+	byte *dest = ctx.dest;
+	byte *prev = ctx.prev;
+
+	for (int j = 0; j < 16; j++, dest += ctx.pitch, prev += ctx.pitch)
+		memcpy(dest, prev, 16);
+}
+
+void BinkDecoder::blockScaledRun(DecodeContext &ctx) {
+	const uint8 *scan = binkPatterns[ctx.video->bits->getBits(4)];
+
+	int i = 0;
+	do {
+		int run = getBundleValue(kSourceRun) + 1;
+
+		i += run;
+		if (i > 64)
+			error("Run went out of bounds");
+
+		if (ctx.video->bits->getBit()) {
+
+			byte v = getBundleValue(kSourceColors);
+			for (int j = 0; j < run; j++, scan++)
+				ctx.dest[ctx.coordScaledMap1[*scan]] =
+				ctx.dest[ctx.coordScaledMap2[*scan]] =
+				ctx.dest[ctx.coordScaledMap3[*scan]] =
+				ctx.dest[ctx.coordScaledMap4[*scan]] = v;
+
+		} else
+			for (int j = 0; j < run; j++, scan++)
+				ctx.dest[ctx.coordScaledMap1[*scan]] =
+				ctx.dest[ctx.coordScaledMap2[*scan]] =
+				ctx.dest[ctx.coordScaledMap3[*scan]] =
+				ctx.dest[ctx.coordScaledMap4[*scan]] = getBundleValue(kSourceColors);
+
+	} while (i < 63);
+
+	if (i == 63)
+		ctx.dest[ctx.coordScaledMap1[*scan]] =
+		ctx.dest[ctx.coordScaledMap2[*scan]] =
+		ctx.dest[ctx.coordScaledMap3[*scan]] =
+		ctx.dest[ctx.coordScaledMap4[*scan]] = getBundleValue(kSourceColors);
+}
+
+void BinkDecoder::blockScaledIntra(DecodeContext &ctx) {
+	int16 block[64];
+	memset(block, 0, 64 * sizeof(int16));
+
+	block[0] = getBundleValue(kSourceIntraDC);
+
+	readDCTCoeffs(*ctx.video, block, true);
+
+	IDCT(block);
+
+	int16 *src   = block;
+	byte  *dest1 = ctx.dest;
+	byte  *dest2 = ctx.dest + ctx.pitch;
+	for (int j = 0; j < 8; j++, dest1 += (ctx.pitch << 1) - 16, dest2 += (ctx.pitch << 1) - 16, src += 8) {
+
+		for (int i = 0; i < 8; i++, dest1 += 2, dest2 += 2)
+			dest1[0] = dest1[1] = dest2[0] = dest2[1] = src[i];
+
+	}
+}
+
+void BinkDecoder::blockScaledFill(DecodeContext &ctx) {
+	byte v = getBundleValue(kSourceColors);
+
+	byte *dest = ctx.dest;
+	for (int i = 0; i < 16; i++, dest += ctx.pitch)
+		memset(dest, v, 16);
+}
+
+void BinkDecoder::blockScaledPattern(DecodeContext &ctx) {
+	byte col[2];
+
+	for (int i = 0; i < 2; i++)
+		col[i] = getBundleValue(kSourceColors);
+
+	byte *dest1 = ctx.dest;
+	byte *dest2 = ctx.dest + ctx.pitch;
+	for (int j = 0; j < 8; j++, dest1 += (ctx.pitch << 1) - 16, dest2 += (ctx.pitch << 1) - 16) {
+		byte v = getBundleValue(kSourcePattern);
+
+		for (int i = 0; i < 8; i++, dest1 += 2, dest2 += 2, v >>= 1)
+			dest1[0] = dest1[1] = dest2[0] = dest2[1] = col[v & 1];
+	}
+}
+
+void BinkDecoder::blockScaledRaw(DecodeContext &ctx) {
+	byte row[8];
+
+	byte *dest1 = ctx.dest;
+	byte *dest2 = ctx.dest + ctx.pitch;
+	for (int j = 0; j < 8; j++, dest1 += (ctx.pitch << 1) - 16, dest2 += (ctx.pitch << 1) - 16) {
+		memcpy(row, _bundles[kSourceColors].curPtr, 8);
+
+		for (int i = 0; i < 8; i++, dest1 += 2, dest2 += 2)
+			dest1[0] = dest1[1] = dest2[0] = dest2[1] = row[i];
+
+		_bundles[kSourceColors].curPtr += 8;
+	}
+}
+
+void BinkDecoder::blockScaled(DecodeContext &ctx) {
+	BlockType blockType = (BlockType) getBundleValue(kSourceSubBlockTypes);
+
+	switch (blockType) {
+		case kBlockRun:
+			blockScaledRun(ctx);
+			break;
+
+		case kBlockIntra:
+			blockScaledIntra(ctx);
+			break;
+
+		case kBlockFill:
+			blockScaledFill(ctx);
+			break;
+
+		case kBlockPattern:
+			blockScaledPattern(ctx);
+			break;
+
+		case kBlockRaw:
+			blockScaledRaw(ctx);
+			break;
+
+		default:
+			error("Invalid 16x16 block type: %d", blockType);
+	}
+
+	ctx.blockX += 1;
+	ctx.dest   += 8;
+	ctx.prev   += 8;
+}
+
+void BinkDecoder::blockMotion(DecodeContext &ctx) {
+	int8 xOff = getBundleValue(kSourceXOff);
+	int8 yOff = getBundleValue(kSourceYOff);
+
+	byte *dest = ctx.dest;
+	byte *prev = ctx.prev + yOff * ((int32) ctx.pitch) + xOff;
+	if ((prev < ctx.prevStart) || (prev > ctx.prevEnd))
+		error("Copy out of bounds (%d | %d)", ctx.blockX * 8 + xOff, ctx.blockY * 8 + yOff);
+
+	for (int j = 0; j < 8; j++, dest += ctx.pitch, prev += ctx.pitch)
+		memcpy(dest, prev, 8);
+}
+
+void BinkDecoder::blockRun(DecodeContext &ctx) {
+	const uint8 *scan = binkPatterns[ctx.video->bits->getBits(4)];
+
+	int i = 0;
+	do {
+		int run = getBundleValue(kSourceRun) + 1;
+
+		i += run;
+		if (i > 64)
+			error("Run went out of bounds");
+
+		if (ctx.video->bits->getBit()) {
+
+			byte v = getBundleValue(kSourceColors);
+			for (int j = 0; j < run; j++)
+				ctx.dest[ctx.coordMap[*scan++]] = v;
+
+		} else
+			for (int j = 0; j < run; j++)
+				ctx.dest[ctx.coordMap[*scan++]] = getBundleValue(kSourceColors);
+
+	} while (i < 63);
+
+	if (i == 63)
+		ctx.dest[ctx.coordMap[*scan++]] = getBundleValue(kSourceColors);
+}
+
+void BinkDecoder::blockResidue(DecodeContext &ctx) {
+	blockMotion(ctx);
+
+	byte v = ctx.video->bits->getBits(7);
+
+	int16 block[64];
+	memset(block, 0, 64 * sizeof(int16));
+
+	readResidue(*ctx.video, block, v);
+
+	byte  *dst = ctx.dest;
+	int16 *src = block;
+	for (int i = 0; i < 8; i++, dst += ctx.pitch, src += 8)
+		for (int j = 0; j < 8; j++)
+			dst[j] += src[j];
+}
+
+void BinkDecoder::blockIntra(DecodeContext &ctx) {
+	int16 block[64];
+	memset(block, 0, 64 * sizeof(int16));
+
+	block[0] = getBundleValue(kSourceIntraDC);
+
+	readDCTCoeffs(*ctx.video, block, true);
+
+	IDCTPut(ctx, block);
+}
+
+void BinkDecoder::blockFill(DecodeContext &ctx) {
+	byte v = getBundleValue(kSourceColors);
+
+	byte *dest = ctx.dest;
+	for (int i = 0; i < 8; i++, dest += ctx.pitch)
+		memset(dest, v, 8);
+}
+
+void BinkDecoder::blockInter(DecodeContext &ctx) {
+	blockMotion(ctx);
+
+	int16 block[64];
+	memset(block, 0, 64 * sizeof(int16));
+
+	block[0] = getBundleValue(kSourceInterDC);
+
+	readDCTCoeffs(*ctx.video, block, false);
+
+	IDCTAdd(ctx, block);
+}
+
+void BinkDecoder::blockPattern(DecodeContext &ctx) {
+	byte col[2];
+
+	for (int i = 0; i < 2; i++)
+		col[i] = getBundleValue(kSourceColors);
+
+	byte *dest = ctx.dest;
+	for (int i = 0; i < 8; i++, dest += ctx.pitch - 8) {
+		byte v = getBundleValue(kSourcePattern);
+
+		for (int j = 0; j < 8; j++, v >>= 1)
+			*dest++ = col[v & 1];
+	}
+}
+
+void BinkDecoder::blockRaw(DecodeContext &ctx) {
+	byte *dest = ctx.dest;
+	byte *data = _bundles[kSourceColors].curPtr;
+	for (int i = 0; i < 8; i++, dest += ctx.pitch, data += 8)
+		memcpy(dest, data, 8);
+
+	_bundles[kSourceColors].curPtr += 64;
+}
+
+void BinkDecoder::readRuns(VideoFrame &video, Bundle &bundle) {
+	uint32 n = readBundleCount(video, bundle);
+	if (n == 0)
+		return;
+
+	byte *decEnd = bundle.curDec + n;
+	if (decEnd > bundle.dataEnd)
+		error("Run value went out of bounds");
+
+	if (video.bits->getBit()) {
+		byte v = video.bits->getBits(4);
+
+		memset(bundle.curDec, v, n);
+		bundle.curDec += n;
+
+	} else
+		while (bundle.curDec < decEnd)
+			*bundle.curDec++ = getHuffmanSymbol(video, bundle.huffman);
+}
+
+void BinkDecoder::readMotionValues(VideoFrame &video, Bundle &bundle) {
+	uint32 n = readBundleCount(video, bundle);
+	if (n == 0)
+		return;
+
+	byte *decEnd = bundle.curDec + n;
+	if (decEnd > bundle.dataEnd)
+		error("Too many motion values");
+
+	if (video.bits->getBit()) {
+		byte v = video.bits->getBits(4);
+
+		if (v) {
+			int sign = -(int)video.bits->getBit();
+			v = (v ^ sign) - sign;
+		}
+
+		memset(bundle.curDec, v, n);
+
+		bundle.curDec += n;
+		return;
+	}
+
+	do {
+		byte v = getHuffmanSymbol(video, bundle.huffman);
+
+		if (v) {
+			int sign = -(int)video.bits->getBit();
+			v = (v ^ sign) - sign;
+		}
+
+		*bundle.curDec++ = v;
+
+	} while (bundle.curDec < decEnd);
+}
+
+const uint8 rleLens[4] = { 4, 8, 12, 32 };
+void BinkDecoder::readBlockTypes(VideoFrame &video, Bundle &bundle) {
+	uint32 n = readBundleCount(video, bundle);
+	if (n == 0)
+		return;
+
+	byte *decEnd = bundle.curDec + n;
+	if (decEnd > bundle.dataEnd)
+		error("Too many block type values");
+
+	if (video.bits->getBit()) {
+		byte v = video.bits->getBits(4);
+
+		memset(bundle.curDec, v, n);
+
+		bundle.curDec += n;
+		return;
+	}
+
+	byte last = 0;
+	do {
+
+		byte v = getHuffmanSymbol(video, bundle.huffman);
+
+		if (v < 12) {
+			last = v;
+			*bundle.curDec++ = v;
+		} else {
+			int run = rleLens[v - 12];
+
+			memset(bundle.curDec, last, run);
+
+			bundle.curDec += run;
+		}
+
+	} while (bundle.curDec < decEnd);
+}
+
+void BinkDecoder::readPatterns(VideoFrame &video, Bundle &bundle) {
+	uint32 n = readBundleCount(video, bundle);
+	if (n == 0)
+		return;
+
+	byte *decEnd = bundle.curDec + n;
+	if (decEnd > bundle.dataEnd)
+		error("Too many pattern values");
+
+	byte v;
+	while (bundle.curDec < decEnd) {
+		v  = getHuffmanSymbol(video, bundle.huffman);
+		v |= getHuffmanSymbol(video, bundle.huffman) << 4;
+		*bundle.curDec++ = v;
+	}
+}
+
+
+void BinkDecoder::readColors(VideoFrame &video, Bundle &bundle) {
+	uint32 n = readBundleCount(video, bundle);
+	if (n == 0)
+		return;
+
+	byte *decEnd = bundle.curDec + n;
+	if (decEnd > bundle.dataEnd)
+		error("Too many color values");
+
+	if (video.bits->getBit()) {
+		_colLastVal = getHuffmanSymbol(video, _colHighHuffman[_colLastVal]);
+
+		byte v;
+		v = getHuffmanSymbol(video, bundle.huffman);
+		v = (_colLastVal << 4) | v;
+
+		if (_id != kBIKiID) {
+			int sign = ((int8) v) >> 7;
+			v = ((v & 0x7F) ^ sign) - sign;
+			v += 0x80;
+		}
+
+		memset(bundle.curDec, v, n);
+		bundle.curDec += n;
+
+		return;
+	}
+
+	while (bundle.curDec < decEnd) {
+		_colLastVal = getHuffmanSymbol(video, _colHighHuffman[_colLastVal]);
+
+		byte v;
+		v = getHuffmanSymbol(video, bundle.huffman);
+		v = (_colLastVal << 4) | v;
+
+		if (_id != kBIKiID) {
+			int sign = ((int8) v) >> 7;
+			v = ((v & 0x7F) ^ sign) - sign;
+			v += 0x80;
+		}
+		*bundle.curDec++ = v;
+	}
+}
+
+void BinkDecoder::readDCS(VideoFrame &video, Bundle &bundle, int startBits, bool hasSign) {
+	uint32 length = readBundleCount(video, bundle);
+	if (length == 0)
+		return;
+
+	int16 *dest = (int16 *) bundle.curDec;
+
+	int32 v = video.bits->getBits(startBits - (hasSign ? 1 : 0));
+	if (v && hasSign) {
+		int sign = -(int)video.bits->getBit();
+		v = (v ^ sign) - sign;
+	}
+
+	*dest++ = v;
+	length--;
+
+	for (uint32 i = 0; i < length; i += 8) {
+		uint32 length2 = MIN<uint32>(length - i, 8);
+
+		byte bSize = video.bits->getBits(4);
+
+		if (bSize) {
+
+			for (uint32 j = 0; j < length2; j++) {
+				int16 v2 = video.bits->getBits(bSize);
+				if (v2) {
+					int sign = -(int)video.bits->getBit();
+					v2 = (v2 ^ sign) - sign;
+				}
+
+				v += v2;
+				*dest++ = v;
+
+				if ((v < -32768) || (v > 32767))
+					error("DC value went out of bounds: %d", v);
+			}
+
+		} else
+			for (uint32 j = 0; j < length2; j++)
+				*dest++ = v;
+	}
+
+	bundle.curDec = (byte *) dest;
+}
+
+/** Reads 8x8 block of DCT coefficients. */
+void BinkDecoder::readDCTCoeffs(VideoFrame &video, int16 *block, bool isIntra) {
+	int coefCount = 0;
+	int coefIdx[64];
+
+	int listStart = 64;
+	int listEnd   = 64;
+
+	int coefList[128];      int modeList[128];
+	coefList[listEnd] = 4;  modeList[listEnd++] = 0;
+	coefList[listEnd] = 24; modeList[listEnd++] = 0;
+	coefList[listEnd] = 44; modeList[listEnd++] = 0;
+	coefList[listEnd] = 1;  modeList[listEnd++] = 3;
+	coefList[listEnd] = 2;  modeList[listEnd++] = 3;
+	coefList[listEnd] = 3;  modeList[listEnd++] = 3;
+
+	int bits = video.bits->getBits(4) - 1;
+	for (int mask = 1 << bits; bits >= 0; mask >>= 1, bits--) {
+		int listPos = listStart;
+
+		while (listPos < listEnd) {
+
+			if (!(modeList[listPos] | coefList[listPos]) || !video.bits->getBit()) {
+				listPos++;
+				continue;
+			}
+
+			int ccoef = coefList[listPos];
+			int mode  = modeList[listPos];
+
+			switch (mode) {
+			case 0:
+				coefList[listPos] = ccoef + 4;
+				modeList[listPos] = 1;
+			case 2:
+				if (mode == 2) {
+					coefList[listPos]   = 0;
+					modeList[listPos++] = 0;
+				}
+				for (int i = 0; i < 4; i++, ccoef++) {
+					if (video.bits->getBit()) {
+						coefList[--listStart] = ccoef;
+						modeList[  listStart] = 3;
+					} else {
+						int t;
+						if (!bits) {
+							t = 1 - (video.bits->getBit() << 1);
+						} else {
+							t = video.bits->getBits(bits) | mask;
+
+							int sign = -(int)video.bits->getBit();
+							t = (t ^ sign) - sign;
+						}
+						block[binkScan[ccoef]] = t;
+						coefIdx[coefCount++]   = ccoef;
+					}
+				}
+				break;
+
+			case 1:
+				modeList[listPos] = 2;
+				for (int i = 0; i < 3; i++) {
+					ccoef += 4;
+					coefList[listEnd]   = ccoef;
+					modeList[listEnd++] = 2;
+				}
+				break;
+
+			case 3:
+				int t;
+				if (!bits) {
+					t = 1 - (video.bits->getBit() << 1);
+				} else {
+					t = video.bits->getBits(bits) | mask;
+
+					int sign = -(int)video.bits->getBit();
+					t = (t ^ sign) - sign;
+				}
+				block[binkScan[ccoef]] = t;
+				coefIdx[coefCount++]   = ccoef;
+				coefList[listPos]      = 0;
+				modeList[listPos++]    = 0;
+				break;
+			}
+		}
+	}
+
+	uint8 quantIdx = video.bits->getBits(4);
+	const uint32 *quant = isIntra ? binkIntraQuant[quantIdx] : binkInterQuant[quantIdx];
+	block[0] = (block[0] * quant[0]) >> 11;
+
+	for (int i = 0; i < coefCount; i++) {
+		int idx = coefIdx[i];
+		block[binkScan[idx]] = (block[binkScan[idx]] * quant[idx]) >> 11;
+	}
+
+}
+
+/** Reads 8x8 block with residue after motion compensation. */
+void BinkDecoder::readResidue(VideoFrame &video, int16 *block, int masksCount) {
+	int nzCoeff[64];
+	int nzCoeffCount = 0;
+
+	int listStart = 64;
+	int listEnd   = 64;
+
+	int coefList[128];      int modeList[128];
+	coefList[listEnd] =  4; modeList[listEnd++] = 0;
+	coefList[listEnd] = 24; modeList[listEnd++] = 0;
+	coefList[listEnd] = 44; modeList[listEnd++] = 0;
+	coefList[listEnd] =  0; modeList[listEnd++] = 2;
+
+	for (int mask = 1 << video.bits->getBits(3); mask; mask >>= 1) {
+
+		for (int i = 0; i < nzCoeffCount; i++) {
+			if (!video.bits->getBit())
+				continue;
+			if (block[nzCoeff[i]] < 0)
+				block[nzCoeff[i]] -= mask;
+			else
+				block[nzCoeff[i]] += mask;
+			masksCount--;
+			if (masksCount < 0)
+				return;
+		}
+
+		int listPos = listStart;
+		while (listPos < listEnd) {
+
+			if (!(coefList[listPos] | modeList[listPos]) || !video.bits->getBit()) {
+				listPos++;
+				continue;
+			}
+
+			int ccoef = coefList[listPos];
+			int mode  = modeList[listPos];
+
+			switch (mode) {
+			case 0:
+				coefList[listPos] = ccoef + 4;
+				modeList[listPos] = 1;
+			case 2:
+				if (mode == 2) {
+					coefList[listPos]   = 0;
+					modeList[listPos++] = 0;
+				}
+
+				for (int i = 0; i < 4; i++, ccoef++) {
+					if (video.bits->getBit()) {
+						coefList[--listStart] = ccoef;
+						modeList[  listStart] = 3;
+					} else {
+						nzCoeff[nzCoeffCount++] = binkScan[ccoef];
+
+						int sign = -(int)video.bits->getBit();
+						block[binkScan[ccoef]] = (mask ^ sign) - sign;
+
+						masksCount--;
+						if (masksCount < 0)
+							return;
+					}
+				}
+				break;
+
+			case 1:
+				modeList[listPos] = 2;
+				for (int i = 0; i < 3; i++) {
+					ccoef += 4;
+					coefList[listEnd]   = ccoef;
+					modeList[listEnd++] = 2;
+				}
+				break;
+
+			case 3:
+				nzCoeff[nzCoeffCount++] = binkScan[ccoef];
+
+				int sign = -(int)video.bits->getBit();
+				block[binkScan[ccoef]] = (mask ^ sign) - sign;
+
+				coefList[listPos]   = 0;
+				modeList[listPos++] = 0;
+				masksCount--;
+				if (masksCount < 0)
+					return;
+				break;
+			}
+		}
+	}
+}
+
+float BinkDecoder::getFloat(AudioTrack &audio) {
+	int power = audio.bits->getBits(5);
+
+	float f = ldexp((float)audio.bits->getBits(23), power - 23);
+
+	if (audio.bits->getBit())
+		f = -f;
+
+	return f;
+}
+
+void BinkDecoder::audioBlock(AudioTrack &audio, int16 *out) {
+	if      (audio.codec == kAudioCodecDCT)
+		audioBlockDCT (audio);
+	else if (audio.codec == kAudioCodecRDFT)
+		audioBlockRDFT(audio);
+
+	floatToInt16Interleave(out, const_cast<const float **>(audio.coeffsPtr), audio.frameLen, audio.channels);
+
+	if (!audio.first) {
+		int count = audio.overlapLen * audio.channels;
+		int shift = Common::intLog2(count);
+		for (int i = 0; i < count; i++) {
+			out[i] = (audio.prevCoeffs[i] * (count - i) + out[i] * i) >> shift;
+		}
+	}
+
+	memcpy(audio.prevCoeffs, out + audio.blockSize, audio.overlapLen * audio.channels * sizeof(*out));
+
+	audio.first = false;
+}
+
+void BinkDecoder::audioBlockDCT(AudioTrack &audio) {
+	audio.bits->skip(2);
+
+	for (uint8 i = 0; i < audio.channels; i++) {
+		float *coeffs = audio.coeffsPtr[i];
+
+		readAudioCoeffs(audio, coeffs);
+
+		coeffs[0] /= 0.5;
+
+		audio.dct->calc(coeffs);
+
+		for (uint32 j = 0; j < audio.frameLen; j++)
+			coeffs[j] *= (audio.frameLen / 2.0);
+	}
+
+}
+
+void BinkDecoder::audioBlockRDFT(AudioTrack &audio) {
+	for (uint8 i = 0; i < audio.channels; i++) {
+		float *coeffs = audio.coeffsPtr[i];
+
+		readAudioCoeffs(audio, coeffs);
+
+		audio.rdft->calc(coeffs);
+	}
+}
+
+static const uint8 rleLengthTab[16] = {
+	2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 32, 64
+};
+
+void BinkDecoder::readAudioCoeffs(AudioTrack &audio, float *coeffs) {
+	coeffs[0] = getFloat(audio) * audio.root;
+	coeffs[1] = getFloat(audio) * audio.root;
+
+	float quant[25];
+
+	for (uint32 i = 0; i < audio.bandCount; i++) {
+		int value = audio.bits->getBits(8);
+
+		//                              0.066399999 / log10(M_E)
+		quant[i] = exp(MIN(value, 95) * 0.15289164787221953823f) * audio.root;
+	}
+
+	float q = 0.0;
+
+	// Find band (k)
+	int k;
+	for (k = 0; audio.bands[k] < 1; k++)
+		q = quant[k];
+
+	// Parse coefficients
+	uint32 i = 2;
+	while (i < audio.frameLen) {
+
+		uint32 j = 0;
+		if (audio.bits->getBit())
+			j = i + rleLengthTab[audio.bits->getBits(4)] * 8;
+		else
+			j = i + 8;
+
+		j = MIN(j, audio.frameLen);
+
+		int width = audio.bits->getBits(4);
+		if (width == 0) {
+
+			memset(coeffs + i, 0, (j - i) * sizeof(*coeffs));
+			i = j;
+			while (audio.bands[k] * 2 < i)
+				q = quant[k++];
+
+		} else {
+
+			while (i < j) {
+				if (audio.bands[k] * 2 == i)
+					q = quant[k++];
+
+				int coeff = audio.bits->getBits(width);
+				if (coeff) {
+
+					if (audio.bits->getBit())
+						coeffs[i] = -q * coeff;
+					else
+						coeffs[i] =  q * coeff;
+
+				} else {
+					coeffs[i] = 0.0;
+				}
+				i++;
+			}
+
+		}
+
+	}
+
+}
+
+static inline int floatToInt16One(float src) {
+	return (int16) CLIP<int>((int) floor(src + 0.5), -32768, 32767);
+}
+
+void BinkDecoder::floatToInt16Interleave(int16 *dst, const float **src, uint32 length, uint8 channels) {
+	if (channels == 2) {
+		for (uint32 i = 0; i < length; i++) {
+			dst[2 * i    ] = floatToInt16One(src[0][i]);
+			dst[2 * i + 1] = floatToInt16One(src[1][i]);
+		}
+	} else {
+		for(uint8 c = 0; c < channels; c++)
+			for(uint32 i = 0, j = c; i < length; i++, j += channels)
+				dst[j] = floatToInt16One(src[c][i]);
+	}
+}
+
+#define A1  2896 /* (1/sqrt(2))<<12 */
+#define A2  2217
+#define A3  3784
+#define A4 -5352
+
+#define IDCT_TRANSFORM(dest,s0,s1,s2,s3,s4,s5,s6,s7,d0,d1,d2,d3,d4,d5,d6,d7,munge,src) {\
+    const int a0 = (src)[s0] + (src)[s4]; \
+    const int a1 = (src)[s0] - (src)[s4]; \
+    const int a2 = (src)[s2] + (src)[s6]; \
+    const int a3 = (A1*((src)[s2] - (src)[s6])) >> 11; \
+    const int a4 = (src)[s5] + (src)[s3]; \
+    const int a5 = (src)[s5] - (src)[s3]; \
+    const int a6 = (src)[s1] + (src)[s7]; \
+    const int a7 = (src)[s1] - (src)[s7]; \
+    const int b0 = a4 + a6; \
+    const int b1 = (A3*(a5 + a7)) >> 11; \
+    const int b2 = ((A4*a5) >> 11) - b0 + b1; \
+    const int b3 = (A1*(a6 - a4) >> 11) - b2; \
+    const int b4 = ((A2*a7) >> 11) + b3 - b1; \
+    (dest)[d0] = munge(a0+a2   +b0); \
+    (dest)[d1] = munge(a1+a3-a2+b2); \
+    (dest)[d2] = munge(a1-a3+a2+b3); \
+    (dest)[d3] = munge(a0-a2   -b4); \
+    (dest)[d4] = munge(a0-a2   +b4); \
+    (dest)[d5] = munge(a1-a3+a2-b3); \
+    (dest)[d6] = munge(a1+a3-a2-b2); \
+    (dest)[d7] = munge(a0+a2   -b0); \
+}
+/* end IDCT_TRANSFORM macro */
+
+#define MUNGE_NONE(x) (x)
+#define IDCT_COL(dest,src) IDCT_TRANSFORM(dest,0,8,16,24,32,40,48,56,0,8,16,24,32,40,48,56,MUNGE_NONE,src)
+
+#define MUNGE_ROW(x) (((x) + 0x7F)>>8)
+#define IDCT_ROW(dest,src) IDCT_TRANSFORM(dest,0,1,2,3,4,5,6,7,0,1,2,3,4,5,6,7,MUNGE_ROW,src)
+
+static inline void IDCTCol(int16 *dest, const int16 *src)
+{
+	if ((src[8] | src[16] | src[24] | src[32] | src[40] | src[48] | src[56]) == 0) {
+		dest[ 0] =
+		dest[ 8] =
+		dest[16] =
+		dest[24] =
+		dest[32] =
+		dest[40] =
+		dest[48] =
+		dest[56] = src[0];
+	} else {
+		IDCT_COL(dest, src);
+	}
+}
+
+void BinkDecoder::IDCT(int16 *block) {
+	int i;
+	int16 temp[64];
+
+	for (i = 0; i < 8; i++)
+		IDCTCol(&temp[i], &block[i]);
+	for (i = 0; i < 8; i++) {
+		IDCT_ROW( (&block[8*i]), (&temp[8*i]) );
+	}
+}
+
+void BinkDecoder::IDCTAdd(DecodeContext &ctx, int16 *block) {
+	int i, j;
+
+	IDCT(block);
+	byte *dest = ctx.dest;
+	for (i = 0; i < 8; i++, dest += ctx.pitch, block += 8)
+		for (j = 0; j < 8; j++)
+			 dest[j] += block[j];
+}
+
+void BinkDecoder::IDCTPut(DecodeContext &ctx, int16 *block) {
+	int i;
+	int16 temp[64];
+	for (i = 0; i < 8; i++)
+		IDCTCol(&temp[i], &block[i]);
+	for (i = 0; i < 8; i++) {
+		IDCT_ROW( (&ctx.dest[i*ctx.pitch]), (&temp[8*i]) );
+	}
+}
+
+} // End of namespace Video
diff --git a/video/bink_decoder.h b/video/bink_decoder.h
new file mode 100644
index 0000000000..ceb55391a9
--- /dev/null
+++ b/video/bink_decoder.h
@@ -0,0 +1,334 @@
+/* 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.
+ *
+ */
+
+// Based on eos' Bink decoder which is in turn
+// based quite heavily on the Bink decoder found in FFmpeg.
+// Many thanks to Kostya Shishkov for doing the hard work.
+
+#include "common/scummsys.h"
+
+#ifdef USE_BINK
+
+#ifndef VIDEO_BINK_DECODER_H
+#define VIDEO_BINK_DECODER_H
+
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "common/array.h"
+#include "common/rational.h"
+
+#include "video/video_decoder.h"
+
+namespace Common {
+	class SeekableReadStream;
+	class BitStream;
+	class Huffman;
+
+	class RDFT;
+	class DCT;
+}
+
+namespace Video {
+
+/**
+ * Decoder for Bink videos.
+ *
+ * Video decoder used in engines:
+ *  - scumm (he)
+ */
+class BinkDecoder : public FixedRateVideoDecoder {
+public:
+	BinkDecoder();
+	~BinkDecoder();
+
+	// VideoDecoder API
+	bool loadStream(Common::SeekableReadStream *stream);
+	void close();
+	bool isVideoLoaded() const { return _bink != 0; }
+	uint16 getWidth() const { return _surface.w; }
+	uint16 getHeight() const { return _surface.h; }
+	Graphics::PixelFormat getPixelFormat() const { return _surface.format; }
+	uint32 getFrameCount() const { return _frames.size(); }
+	uint32 getElapsedTime() const;
+	const Graphics::Surface *decodeNextFrame();
+
+	// FixedRateVideoDecoder
+	Common::Rational getFrameRate() const { return _frameRate; }
+
+private:
+	static const int kAudioChannelsMax  = 2;
+	static const int kAudioBlockSizeMax = (kAudioChannelsMax << 11);
+
+	/** IDs for different data types used in Bink video codec. */
+	enum Source {
+		kSourceBlockTypes    = 0, ///< 8x8 block types.
+		kSourceSubBlockTypes    , ///< 16x16 block types (a subset of 8x8 block types).
+		kSourceColors           , ///< Pixel values used for different block types.
+		kSourcePattern          , ///< 8-bit values for 2-color pattern fill.
+		kSourceXOff             , ///< X components of motion value.
+		kSourceYOff             , ///< Y components of motion value.
+		kSourceIntraDC          , ///< DC values for intrablocks with DCT.
+		kSourceInterDC          , ///< DC values for interblocks with DCT.
+		kSourceRun              , ///< Run lengths for special fill block.
+
+		kSourceMAX
+	};
+
+	/** Bink video block types. */
+	enum BlockType {
+		kBlockSkip    = 0,  ///< Skipped block.
+		kBlockScaled     ,  ///< Block has size 16x16.
+		kBlockMotion     ,  ///< Block is copied from previous frame with some offset.
+		kBlockRun        ,  ///< Block is composed from runs of colors with custom scan order.
+		kBlockResidue    ,  ///< Motion block with some difference added.
+		kBlockIntra      ,  ///< Intra DCT block.
+		kBlockFill       ,  ///< Block is filled with single color.
+		kBlockInter      ,  ///< Motion block with DCT applied to the difference.
+		kBlockPattern    ,  ///< Block is filled with two colors following custom pattern.
+		kBlockRaw           ///< Uncoded 8x8 block.
+	};
+
+	/** Data structure for decoding and tranlating Huffman'd data. */
+	struct Huffman {
+		int  index;       ///< Index of the Huffman codebook to use.
+		byte symbols[16]; ///< Huffman symbol => Bink symbol tranlation list.
+	};
+
+	/** Data structure used for decoding a single Bink data type. */
+	struct Bundle {
+		int countLengths[2]; ///< Lengths of number of entries to decode (in bits).
+		int countLength;     ///< Length of number of entries to decode (in bits) for the current plane.
+
+		Huffman huffman; ///< Huffman codebook.
+
+		byte *data;    ///< Buffer for decoded symbols.
+		byte *dataEnd; ///< Buffer end.
+
+		byte *curDec; ///< Pointer to the data that wasn't yet decoded.
+		byte *curPtr; ///< Pointer to the data that wasn't yet read.
+	};
+
+	enum AudioCodec {
+		kAudioCodecDCT,
+		kAudioCodecRDFT
+	};
+
+	/** An audio track. */
+	struct AudioTrack {
+		uint16 flags;
+
+		uint32 sampleRate;
+		uint8  channels;
+
+		uint32 outSampleRate;
+		uint8  outChannels;
+
+		AudioCodec codec;
+
+		uint32 sampleCount;
+
+		Common::BitStream *bits;
+
+		bool first;
+
+		uint32 frameLen;
+		uint32 overlapLen;
+
+		uint32 blockSize;
+
+		uint32  bandCount;
+		uint32 *bands;
+
+		float root;
+
+		float coeffs[16 * kAudioBlockSizeMax];
+		int16 prevCoeffs[kAudioBlockSizeMax];
+
+		float *coeffsPtr[kAudioChannelsMax];
+
+		Common::RDFT *rdft;
+		Common::DCT  *dct;
+
+		AudioTrack();
+		~AudioTrack();
+	};
+
+	/** A video frame. */
+	struct VideoFrame {
+		bool keyFrame;
+
+		uint32 offset;
+		uint32 size;
+
+		Common::BitStream *bits;
+
+		VideoFrame();
+		~VideoFrame();
+	};
+
+	/** A decoder state. */
+	struct DecodeContext {
+		VideoFrame *video;
+
+		uint32 planeIdx;
+
+		uint32 blockX;
+		uint32 blockY;
+
+		byte *dest;
+		byte *prev;
+
+		byte *destStart, *destEnd;
+		byte *prevStart, *prevEnd;
+
+		uint32 pitch;
+
+		int coordMap[64];
+		int coordScaledMap1[64];
+		int coordScaledMap2[64];
+		int coordScaledMap3[64];
+		int coordScaledMap4[64];
+	};
+
+	Common::SeekableReadStream *_bink;
+
+	uint32 _id; ///< The BIK FourCC.
+
+	Common::Rational _frameRate;
+
+	Graphics::Surface _surface;
+
+	Audio::SoundHandle _audioHandle;
+	Audio::QueuingAudioStream *_audioStream;
+	bool _audioStarted;
+
+	uint32 _videoFlags; ///< Video frame features.
+
+	bool _hasAlpha;   ///< Do video frames have alpha?
+	bool _swapPlanes; ///< Are the planes ordered (A)YVU instead of (A)YUV?
+
+	uint32 _audioFrame;
+
+	Common::Array<AudioTrack> _audioTracks; ///< All audio tracks.
+	Common::Array<VideoFrame> _frames;      ///< All video frames.
+
+	uint32 _audioTrack; ///< Audio track to use.
+
+	Common::Huffman *_huffman[16]; ///< The 16 Huffman codebooks used in Bink decoding.
+
+	Bundle _bundles[kSourceMAX]; ///< Bundles for decoding all data types.
+
+	/** Huffman codebooks to use for decoding high nibbles in color data types. */
+	Huffman _colHighHuffman[16];
+	/** Value of the last decoded high nibble in color data types. */
+	int _colLastVal;
+
+	byte *_curPlanes[4]; ///< The 4 color planes, YUVA, current frame.
+	byte *_oldPlanes[4]; ///< The 4 color planes, YUVA, last frame.
+
+
+	/** Initialize the bundles. */
+	void initBundles();
+	/** Deinitialize the bundles. */
+	void deinitBundles();
+
+	/** Initialize the Huffman decoders. */
+	void initHuffman();
+
+	/** Decode an audio packet. */
+	void audioPacket(AudioTrack &audio);
+	/** Decode a video packet. */
+	void videoPacket(VideoFrame &video);
+
+	/** Decode a plane. */
+	void decodePlane(VideoFrame &video, int planeIdx, bool isChroma);
+
+	/** Read/Initialize a bundle for decoding a plane. */
+	void readBundle(VideoFrame &video, Source source);
+
+	/** Read the symbols for a Huffman code. */
+	void readHuffman(VideoFrame &video, Huffman &huffman);
+	/** Merge two Huffman symbol lists. */
+	void mergeHuffmanSymbols(VideoFrame &video, byte *dst, const byte *src, int size);
+
+	/** Read and translate a symbol out of a Huffman code. */
+	byte getHuffmanSymbol(VideoFrame &video, Huffman &huffman);
+
+	/** Get a direct value out of a bundle. */
+	int32 getBundleValue(Source source);
+	/** Read a count value out of a bundle. */
+	uint32 readBundleCount(VideoFrame &video, Bundle &bundle);
+
+	// Handle the block types
+	void blockSkip         (DecodeContext &ctx);
+	void blockScaledSkip   (DecodeContext &ctx);
+	void blockScaledRun    (DecodeContext &ctx);
+	void blockScaledIntra  (DecodeContext &ctx);
+	void blockScaledFill   (DecodeContext &ctx);
+	void blockScaledPattern(DecodeContext &ctx);
+	void blockScaledRaw    (DecodeContext &ctx);
+	void blockScaled       (DecodeContext &ctx);
+	void blockMotion       (DecodeContext &ctx);
+	void blockRun          (DecodeContext &ctx);
+	void blockResidue      (DecodeContext &ctx);
+	void blockIntra        (DecodeContext &ctx);
+	void blockFill         (DecodeContext &ctx);
+	void blockInter        (DecodeContext &ctx);
+	void blockPattern      (DecodeContext &ctx);
+	void blockRaw          (DecodeContext &ctx);
+
+	// Read the bundles
+	void readRuns        (VideoFrame &video, Bundle &bundle);
+	void readMotionValues(VideoFrame &video, Bundle &bundle);
+	void readBlockTypes  (VideoFrame &video, Bundle &bundle);
+	void readPatterns    (VideoFrame &video, Bundle &bundle);
+	void readColors      (VideoFrame &video, Bundle &bundle);
+	void readDCS         (VideoFrame &video, Bundle &bundle, int startBits, bool hasSign);
+	void readDCTCoeffs   (VideoFrame &video, int16 *block, bool isIntra);
+	void readResidue     (VideoFrame &video, int16 *block, int masksCount);
+
+	void initAudioTrack(AudioTrack &audio);
+
+	float getFloat(AudioTrack &audio);
+
+	/** Decode an audio block. */
+	void audioBlock    (AudioTrack &audio, int16 *out);
+	/** Decode a DCT'd audio block. */
+	void audioBlockDCT (AudioTrack &audio);
+	/** Decode a RDFT'd audio block. */
+	void audioBlockRDFT(AudioTrack &audio);
+
+	void readAudioCoeffs(AudioTrack &audio, float *coeffs);
+
+	void floatToInt16Interleave(int16 *dst, const float **src, uint32 length, uint8 channels);
+
+	// Bink video IDCT
+	void IDCT(int16 *block);
+	void IDCTPut(DecodeContext &ctx, int16 *block);
+	void IDCTAdd(DecodeContext &ctx, int16 *block);
+};
+
+} // End of namespace Video
+
+#endif // VIDEO_BINK_DECODER_H
+
+#endif // USE_BINK
diff --git a/video/binkdata.h b/video/binkdata.h
new file mode 100644
index 0000000000..02105a7493
--- /dev/null
+++ b/video/binkdata.h
@@ -0,0 +1,578 @@
+/* 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.
+ *
+ */
+
+#ifndef VIDEO_BINKDATA_H
+#define VIDEO_BINKDATA_H
+
+#include "common/scummsys.h"
+
+namespace Video {
+
+static const uint16 binkCriticalFreqs[25] = {
+	  100,  200,  300,  400,  510,  630,   770,   920,
+	 1080, 1270, 1480, 1720, 2000, 2320,  2700,  3150,
+	 3700, 4400, 5300, 6400, 7700, 9500, 12000, 15500,
+	24500,
+};
+
+/** Bink DCT and residue 8x8 block scan order */
+static const uint8 binkScan[64] = {
+	 0,  1,  8,  9,  2,  3, 10, 11,
+	 4,  5, 12, 13,  6,  7, 14, 15,
+	20, 21, 28, 29, 22, 23, 30, 31,
+	16, 17, 24, 25, 32, 33, 40, 41,
+	34, 35, 42, 43, 48, 49, 56, 57,
+	50, 51, 58, 59, 18, 19, 26, 27,
+	36, 37, 44, 45, 38, 39, 46, 47,
+	52, 53, 60, 61, 54, 55, 62, 63
+};
+
+static const uint32 binkHuffmanCodes[16][16] = {
+	{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F },
+	{ 0x00, 0x01, 0x03, 0x05, 0x07, 0x09, 0x0B, 0x0D, 0x0F, 0x13, 0x15, 0x17, 0x19, 0x1B, 0x1D, 0x1F },
+	{ 0x00, 0x02, 0x01, 0x09, 0x05, 0x15, 0x0D, 0x1D, 0x03, 0x13, 0x0B, 0x1B, 0x07, 0x17, 0x0F, 0x1F },
+	{ 0x00, 0x02, 0x06, 0x01, 0x09, 0x05, 0x0D, 0x1D, 0x03, 0x13, 0x0B, 0x1B, 0x07, 0x17, 0x0F, 0x1F },
+	{ 0x00, 0x04, 0x02, 0x06, 0x01, 0x09, 0x05, 0x0D, 0x03, 0x13, 0x0B, 0x1B, 0x07, 0x17, 0x0F, 0x1F },
+	{ 0x00, 0x04, 0x02, 0x0A, 0x06, 0x0E, 0x01, 0x09, 0x05, 0x0D, 0x03, 0x0B, 0x07, 0x17, 0x0F, 0x1F },
+	{ 0x00, 0x02, 0x0A, 0x06, 0x0E, 0x01, 0x09, 0x05, 0x0D, 0x03, 0x0B, 0x1B, 0x07, 0x17, 0x0F, 0x1F },
+	{ 0x00, 0x01, 0x05, 0x03, 0x13, 0x0B, 0x1B, 0x3B, 0x07, 0x27, 0x17, 0x37, 0x0F, 0x2F, 0x1F, 0x3F },
+	{ 0x00, 0x01, 0x03, 0x13, 0x0B, 0x2B, 0x1B, 0x3B, 0x07, 0x27, 0x17, 0x37, 0x0F, 0x2F, 0x1F, 0x3F },
+	{ 0x00, 0x01, 0x05, 0x0D, 0x03, 0x13, 0x0B, 0x1B, 0x07, 0x27, 0x17, 0x37, 0x0F, 0x2F, 0x1F, 0x3F },
+	{ 0x00, 0x02, 0x01, 0x05, 0x0D, 0x03, 0x13, 0x0B, 0x1B, 0x07, 0x17, 0x37, 0x0F, 0x2F, 0x1F, 0x3F },
+	{ 0x00, 0x01, 0x09, 0x05, 0x0D, 0x03, 0x13, 0x0B, 0x1B, 0x07, 0x17, 0x37, 0x0F, 0x2F, 0x1F, 0x3F },
+	{ 0x00, 0x02, 0x01, 0x03, 0x13, 0x0B, 0x1B, 0x3B, 0x07, 0x27, 0x17, 0x37, 0x0F, 0x2F, 0x1F, 0x3F },
+	{ 0x00, 0x01, 0x05, 0x03, 0x07, 0x27, 0x17, 0x37, 0x0F, 0x4F, 0x2F, 0x6F, 0x1F, 0x5F, 0x3F, 0x7F },
+	{ 0x00, 0x01, 0x05, 0x03, 0x07, 0x17, 0x37, 0x77, 0x0F, 0x4F, 0x2F, 0x6F, 0x1F, 0x5F, 0x3F, 0x7F },
+	{ 0x00, 0x02, 0x01, 0x05, 0x03, 0x07, 0x27, 0x17, 0x37, 0x0F, 0x2F, 0x6F, 0x1F, 0x5F, 0x3F, 0x7F }
+};
+
+static const uint8 binkHuffmanLengths[16][16] = {
+	{ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 },
+	{ 1, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 },
+	{ 2, 2, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 },
+	{ 2, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 },
+	{ 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5 },
+	{ 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5 },
+	{ 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5 },
+	{ 1, 3, 3, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6 },
+	{ 1, 2, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6 },
+	{ 1, 3, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6 },
+	{ 2, 2, 3, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6 },
+	{ 1, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6 },
+	{ 2, 2, 2, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6 },
+	{ 1, 3, 3, 3, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7 },
+	{ 1, 3, 3, 3, 5, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7 },
+	{ 2, 2, 3, 3, 3, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7 }
+};
+
+static const uint8 binkPatterns[16][64] = {
+{
+	0x00, 0x08, 0x10, 0x18, 0x20, 0x28, 0x30, 0x38,
+	0x39, 0x31, 0x29, 0x21, 0x19, 0x11, 0x09, 0x01,
+	0x02, 0x0A, 0x12, 0x1A, 0x22, 0x2A, 0x32, 0x3A,
+	0x3B, 0x33, 0x2B, 0x23, 0x1B, 0x13, 0x0B, 0x03,
+	0x04, 0x0C, 0x14, 0x1C, 0x24, 0x2C, 0x34, 0x3C,
+	0x3D, 0x35, 0x2D, 0x25, 0x1D, 0x15, 0x0D, 0x05,
+	0x06, 0x0E, 0x16, 0x1E, 0x26, 0x2E, 0x36, 0x3E,
+	0x3F, 0x37, 0x2F, 0x27, 0x1F, 0x17, 0x0F, 0x07
+},
+{
+	0x3B, 0x3A, 0x39, 0x38, 0x30, 0x31, 0x32, 0x33,
+	0x2B, 0x2A, 0x29, 0x28, 0x20, 0x21, 0x22, 0x23,
+	0x1B, 0x1A, 0x19, 0x18, 0x10, 0x11, 0x12, 0x13,
+	0x0B, 0x0A, 0x09, 0x08, 0x00, 0x01, 0x02, 0x03,
+	0x04, 0x05, 0x06, 0x07, 0x0F, 0x0E, 0x0D, 0x0C,
+	0x14, 0x15, 0x16, 0x17, 0x1F, 0x1E, 0x1D, 0x1C,
+	0x24, 0x25, 0x26, 0x27, 0x2F, 0x2E, 0x2D, 0x2C,
+	0x34, 0x35, 0x36, 0x37, 0x3F, 0x3E, 0x3D, 0x3C
+},
+{
+	0x19, 0x11, 0x12, 0x1A, 0x1B, 0x13, 0x0B, 0x03,
+	0x02, 0x0A, 0x09, 0x01, 0x00, 0x08, 0x10, 0x18,
+	0x20, 0x28, 0x30, 0x38, 0x39, 0x31, 0x29, 0x2A,
+	0x32, 0x3A, 0x3B, 0x33, 0x2B, 0x23, 0x22, 0x21,
+	0x1D, 0x15, 0x16, 0x1E, 0x1F, 0x17, 0x0F, 0x07,
+	0x06, 0x0E, 0x0D, 0x05, 0x04, 0x0C, 0x14, 0x1C,
+	0x24, 0x2C, 0x34, 0x3C, 0x3D, 0x35, 0x2D, 0x2E,
+	0x36, 0x3E, 0x3F, 0x37, 0x2F, 0x27, 0x26, 0x25
+},
+{
+	0x03, 0x0B, 0x02, 0x0A, 0x01, 0x09, 0x00, 0x08,
+	0x10, 0x18, 0x11, 0x19, 0x12, 0x1A, 0x13, 0x1B,
+	0x23, 0x2B, 0x22, 0x2A, 0x21, 0x29, 0x20, 0x28,
+	0x30, 0x38, 0x31, 0x39, 0x32, 0x3A, 0x33, 0x3B,
+	0x3C, 0x34, 0x3D, 0x35, 0x3E, 0x36, 0x3F, 0x37,
+	0x2F, 0x27, 0x2E, 0x26, 0x2D, 0x25, 0x2C, 0x24,
+	0x1C, 0x14, 0x1D, 0x15, 0x1E, 0x16, 0x1F, 0x17,
+	0x0F, 0x07, 0x0E, 0x06, 0x0D, 0x05, 0x0C, 0x04
+},
+{
+	0x18, 0x19, 0x10, 0x11, 0x08, 0x09, 0x00, 0x01,
+	0x02, 0x03, 0x0A, 0x0B, 0x12, 0x13, 0x1A, 0x1B,
+	0x1C, 0x1D, 0x14, 0x15, 0x0C, 0x0D, 0x04, 0x05,
+	0x06, 0x07, 0x0E, 0x0F, 0x16, 0x17, 0x1E, 0x1F,
+	0x27, 0x26, 0x2F, 0x2E, 0x37, 0x36, 0x3F, 0x3E,
+	0x3D, 0x3C, 0x35, 0x34, 0x2D, 0x2C, 0x25, 0x24,
+	0x23, 0x22, 0x2B, 0x2A, 0x33, 0x32, 0x3B, 0x3A,
+	0x39, 0x38, 0x31, 0x30, 0x29, 0x28, 0x21, 0x20
+},
+{
+	0x00, 0x01, 0x02, 0x03, 0x08, 0x09, 0x0A, 0x0B,
+	0x10, 0x11, 0x12, 0x13, 0x18, 0x19, 0x1A, 0x1B,
+	0x20, 0x21, 0x22, 0x23, 0x28, 0x29, 0x2A, 0x2B,
+	0x30, 0x31, 0x32, 0x33, 0x38, 0x39, 0x3A, 0x3B,
+	0x04, 0x05, 0x06, 0x07, 0x0C, 0x0D, 0x0E, 0x0F,
+	0x14, 0x15, 0x16, 0x17, 0x1C, 0x1D, 0x1E, 0x1F,
+	0x24, 0x25, 0x26, 0x27, 0x2C, 0x2D, 0x2E, 0x2F,
+	0x34, 0x35, 0x36, 0x37, 0x3C, 0x3D, 0x3E, 0x3F
+},
+{
+	0x06, 0x07, 0x0F, 0x0E, 0x0D, 0x05, 0x0C, 0x04,
+	0x03, 0x0B, 0x02, 0x0A, 0x09, 0x01, 0x00, 0x08,
+	0x10, 0x18, 0x11, 0x19, 0x12, 0x1A, 0x13, 0x1B,
+	0x14, 0x1C, 0x15, 0x1D, 0x16, 0x1E, 0x17, 0x1F,
+	0x27, 0x2F, 0x26, 0x2E, 0x25, 0x2D, 0x24, 0x2C,
+	0x23, 0x2B, 0x22, 0x2A, 0x21, 0x29, 0x20, 0x28,
+	0x31, 0x30, 0x38, 0x39, 0x3A, 0x32, 0x3B, 0x33,
+	0x3C, 0x34, 0x3D, 0x35, 0x36, 0x37, 0x3F, 0x3E
+},
+{
+	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+	0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08,
+	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+	0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18,
+	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+	0x2F, 0x2E, 0x2D, 0x2C, 0x2B, 0x2A, 0x29, 0x28,
+	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+	0x3F, 0x3E, 0x3D, 0x3C, 0x3B, 0x3A, 0x39, 0x38
+},
+{
+	0x00, 0x08, 0x09, 0x01, 0x02, 0x03, 0x0B, 0x0A,
+	0x12, 0x13, 0x1B, 0x1A, 0x19, 0x11, 0x10, 0x18,
+	0x20, 0x28, 0x29, 0x21, 0x22, 0x23, 0x2B, 0x2A,
+	0x32, 0x31, 0x30, 0x38, 0x39, 0x3A, 0x3B, 0x33,
+	0x34, 0x3C, 0x3D, 0x3E, 0x3F, 0x37, 0x36, 0x35,
+	0x2D, 0x2C, 0x24, 0x25, 0x26, 0x2E, 0x2F, 0x27,
+	0x1F, 0x17, 0x16, 0x1E, 0x1D, 0x1C, 0x14, 0x15,
+	0x0D, 0x0C, 0x04, 0x05, 0x06, 0x0E, 0x0F, 0x07
+},
+{
+	0x18, 0x19, 0x10, 0x11, 0x08, 0x09, 0x00, 0x01,
+	0x02, 0x03, 0x0A, 0x0B, 0x12, 0x13, 0x1A, 0x1B,
+	0x1C, 0x1D, 0x14, 0x15, 0x0C, 0x0D, 0x04, 0x05,
+	0x06, 0x07, 0x0E, 0x0F, 0x16, 0x17, 0x1E, 0x1F,
+	0x26, 0x27, 0x2E, 0x2F, 0x36, 0x37, 0x3E, 0x3F,
+	0x3C, 0x3D, 0x34, 0x35, 0x2C, 0x2D, 0x24, 0x25,
+	0x22, 0x23, 0x2A, 0x2B, 0x32, 0x33, 0x3A, 0x3B,
+	0x38, 0x39, 0x30, 0x31, 0x28, 0x29, 0x20, 0x21
+},
+{
+	0x00, 0x08, 0x01, 0x09, 0x02, 0x0A, 0x03, 0x0B,
+	0x13, 0x1B, 0x12, 0x1A, 0x11, 0x19, 0x10, 0x18,
+	0x20, 0x28, 0x21, 0x29, 0x22, 0x2A, 0x23, 0x2B,
+	0x33, 0x3B, 0x32, 0x3A, 0x31, 0x39, 0x30, 0x38,
+	0x3C, 0x34, 0x3D, 0x35, 0x3E, 0x36, 0x3F, 0x37,
+	0x2F, 0x27, 0x2E, 0x26, 0x2D, 0x25, 0x2C, 0x24,
+	0x1F, 0x17, 0x1E, 0x16, 0x1D, 0x15, 0x1C, 0x14,
+	0x0C, 0x04, 0x0D, 0x05, 0x0E, 0x06, 0x0F, 0x07
+},
+{
+	0x00, 0x08, 0x10, 0x18, 0x19, 0x1A, 0x1B, 0x13,
+	0x0B, 0x03, 0x02, 0x01, 0x09, 0x11, 0x12, 0x0A,
+	0x04, 0x0C, 0x14, 0x1C, 0x1D, 0x1E, 0x1F, 0x17,
+	0x0F, 0x07, 0x06, 0x05, 0x0D, 0x15, 0x16, 0x0E,
+	0x24, 0x2C, 0x34, 0x3C, 0x3D, 0x3E, 0x3F, 0x37,
+	0x2F, 0x27, 0x26, 0x25, 0x2D, 0x35, 0x36, 0x2E,
+	0x20, 0x28, 0x30, 0x38, 0x39, 0x3A, 0x3B, 0x33,
+	0x2B, 0x23, 0x22, 0x21, 0x29, 0x31, 0x32, 0x2A
+},
+{
+	0x00, 0x08, 0x09, 0x01, 0x02, 0x03, 0x0B, 0x0A,
+	0x13, 0x1B, 0x1A, 0x12, 0x11, 0x10, 0x18, 0x19,
+	0x21, 0x20, 0x28, 0x29, 0x2A, 0x22, 0x23, 0x2B,
+	0x33, 0x3B, 0x3A, 0x32, 0x31, 0x39, 0x38, 0x30,
+	0x34, 0x3C, 0x3D, 0x35, 0x36, 0x3E, 0x3F, 0x37,
+	0x2F, 0x27, 0x26, 0x2E, 0x2D, 0x2C, 0x24, 0x25,
+	0x1D, 0x1C, 0x14, 0x15, 0x16, 0x1E, 0x1F, 0x17,
+	0x0E, 0x0F, 0x07, 0x06, 0x05, 0x0D, 0x0C, 0x04
+},
+{
+	0x18, 0x10, 0x08, 0x00, 0x01, 0x02, 0x03, 0x0B,
+	0x13, 0x1B, 0x1A, 0x19, 0x11, 0x0A, 0x09, 0x12,
+	0x1C, 0x14, 0x0C, 0x04, 0x05, 0x06, 0x07, 0x0F,
+	0x17, 0x1F, 0x1E, 0x1D, 0x15, 0x0E, 0x0D, 0x16,
+	0x3C, 0x34, 0x2C, 0x24, 0x25, 0x26, 0x27, 0x2F,
+	0x37, 0x3F, 0x3E, 0x3D, 0x35, 0x2E, 0x2D, 0x36,
+	0x38, 0x30, 0x28, 0x20, 0x21, 0x22, 0x23, 0x2B,
+	0x33, 0x3B, 0x3A, 0x39, 0x31, 0x2A, 0x29, 0x32
+},
+{
+	0x00, 0x08, 0x09, 0x01, 0x02, 0x0A, 0x12, 0x11,
+	0x10, 0x18, 0x19, 0x1A, 0x1B, 0x13, 0x0B, 0x03,
+	0x07, 0x06, 0x0E, 0x0F, 0x17, 0x16, 0x15, 0x0D,
+	0x05, 0x04, 0x0C, 0x14, 0x1C, 0x1D, 0x1E, 0x1F,
+	0x3F, 0x3E, 0x36, 0x37, 0x2F, 0x2E, 0x2D, 0x35,
+	0x3D, 0x3C, 0x34, 0x2C, 0x24, 0x25, 0x26, 0x27,
+	0x38, 0x30, 0x31, 0x39, 0x3A, 0x32, 0x2A, 0x29,
+	0x28, 0x20, 0x21, 0x22, 0x23, 0x2B, 0x33, 0x3B
+},
+{
+	0x00, 0x01, 0x08, 0x09, 0x10, 0x11, 0x18, 0x19,
+	0x20, 0x21, 0x28, 0x29, 0x30, 0x31, 0x38, 0x39,
+	0x3A, 0x3B, 0x32, 0x33, 0x2A, 0x2B, 0x22, 0x23,
+	0x1A, 0x1B, 0x12, 0x13, 0x0A, 0x0B, 0x02, 0x03,
+	0x04, 0x05, 0x0C, 0x0D, 0x14, 0x15, 0x1C, 0x1D,
+	0x24, 0x25, 0x2C, 0x2D, 0x34, 0x35, 0x3C, 0x3D,
+	0x3E, 0x3F, 0x36, 0x37, 0x2E, 0x2F, 0x26, 0x27,
+	0x1E, 0x1F, 0x16, 0x17, 0x0E, 0x0F, 0x06, 0x07
+}
+};
+
+static const uint32 binkIntraQuant[16][64] = {
+{
+	0x010000, 0x016315, 0x01E83D, 0x02A535, 0x014E7B, 0x016577, 0x02F1E6, 0x02724C,
+	0x010000, 0x00EEDA, 0x024102, 0x017F9B, 0x00BE80, 0x00611E, 0x01083C, 0x00A552,
+	0x021F88, 0x01DC53, 0x027FAD, 0x01F697, 0x014819, 0x00A743, 0x015A31, 0x009688,
+	0x02346F, 0x030EE5, 0x01FBFA, 0x02C096, 0x01D000, 0x028396, 0x019247, 0x01F9AA,
+	0x02346F, 0x01FBFA, 0x01DC53, 0x0231B8, 0x012F12, 0x01E06C, 0x00CB10, 0x0119A8,
+	0x01C48C, 0x019748, 0x014E86, 0x0122AF, 0x02C628, 0x027F20, 0x0297B5, 0x023F32,
+	0x025000, 0x01AB6B, 0x01D122, 0x0159B3, 0x012669, 0x008D43, 0x00EE1F, 0x0075ED,
+	0x01490C, 0x010288, 0x00F735, 0x00EF51, 0x00E0F1, 0x0072AD, 0x00A4D8, 0x006517,
+},
+{
+	0x015555, 0x01D971, 0x028AFC, 0x0386F1, 0x01BDF9, 0x01DC9F, 0x03ED33, 0x034311,
+	0x015555, 0x013E78, 0x030158, 0x01FF7A, 0x00FE00, 0x00817D, 0x01604F, 0x00DC6D,
+	0x02D4B5, 0x027B19, 0x0354E7, 0x029E1F, 0x01B577, 0x00DF04, 0x01CD96, 0x00C8B6,
+	0x02F095, 0x0413DC, 0x02A54E, 0x03AB73, 0x026AAB, 0x035A1E, 0x02185E, 0x02A238,
+	0x02F095, 0x02A54E, 0x027B19, 0x02ECF5, 0x019418, 0x028090, 0x010EC0, 0x01778A,
+	0x025B66, 0x021F0B, 0x01BE09, 0x018394, 0x03B2E0, 0x03542A, 0x0374F1, 0x02FEEE,
+	0x031555, 0x0239E4, 0x026C2D, 0x01CCEE, 0x01888C, 0x00BC59, 0x013D7E, 0x009D3C,
+	0x01B6BB, 0x0158B5, 0x01499C, 0x013F17, 0x012BEC, 0x0098E6, 0x00DBCB, 0x0086C9,
+},
+{
+	0x01AAAB, 0x024FCE, 0x032DBB, 0x0468AD, 0x022D78, 0x0253C7, 0x04E87F, 0x0413D5,
+	0x01AAAB, 0x018E16, 0x03C1AE, 0x027F58, 0x013D80, 0x00A1DC, 0x01B863, 0x011388,
+	0x0389E2, 0x0319DF, 0x042A21, 0x0345A7, 0x0222D4, 0x0116C5, 0x0240FC, 0x00FAE3,
+	0x03ACBA, 0x0518D3, 0x034EA1, 0x04964F, 0x030555, 0x0430A5, 0x029E76, 0x034AC5,
+	0x03ACBA, 0x034EA1, 0x0319DF, 0x03A833, 0x01F91E, 0x0320B4, 0x015270, 0x01D56D,
+	0x02F23F, 0x02A6CE, 0x022D8B, 0x01E479, 0x049F98, 0x042935, 0x04522D, 0x03BEA9,
+	0x03DAAB, 0x02C85D, 0x030738, 0x02402A, 0x01EAAF, 0x00EB6F, 0x018CDE, 0x00C48A,
+	0x022469, 0x01AEE2, 0x019C02, 0x018EDD, 0x0176E7, 0x00BF20, 0x0112BE, 0x00A87B,
+},
+{
+	0x020000, 0x02C62A, 0x03D07A, 0x054A69, 0x029CF6, 0x02CAEF, 0x05E3CC, 0x04E499,
+	0x020000, 0x01DDB4, 0x048204, 0x02FF36, 0x017D01, 0x00C23C, 0x021077, 0x014AA3,
+	0x043F0F, 0x03B8A6, 0x04FF5A, 0x03ED2E, 0x029032, 0x014E86, 0x02B461, 0x012D11,
+	0x0468DF, 0x061DCA, 0x03F7F5, 0x05812C, 0x03A000, 0x05072C, 0x03248D, 0x03F353,
+	0x0468DF, 0x03F7F5, 0x03B8A6, 0x046370, 0x025E24, 0x03C0D8, 0x019620, 0x02334F,
+	0x038919, 0x032E91, 0x029D0D, 0x02455E, 0x058C50, 0x04FE3F, 0x052F69, 0x047E65,
+	0x04A000, 0x0356D6, 0x03A243, 0x02B365, 0x024CD2, 0x011A85, 0x01DC3E, 0x00EBD9,
+	0x029218, 0x020510, 0x01EE69, 0x01DEA2, 0x01C1E2, 0x00E559, 0x0149B0, 0x00CA2D,
+},
+{
+	0x02AAAB, 0x03B2E3, 0x0515F8, 0x070DE2, 0x037BF2, 0x03B93E, 0x07DA65, 0x068621,
+	0x02AAAB, 0x027CF0, 0x0602B1, 0x03FEF3, 0x01FC01, 0x0102FA, 0x02C09F, 0x01B8DA,
+	0x05A96A, 0x04F632, 0x06A9CE, 0x053C3E, 0x036AED, 0x01BE09, 0x039B2D, 0x01916B,
+	0x05E129, 0x0827B8, 0x054A9C, 0x0756E5, 0x04D555, 0x06B43B, 0x0430BC, 0x05446F,
+	0x05E129, 0x054A9C, 0x04F632, 0x05D9EB, 0x032830, 0x050121, 0x021D80, 0x02EF14,
+	0x04B6CC, 0x043E16, 0x037C11, 0x030728, 0x0765C0, 0x06A855, 0x06E9E2, 0x05FDDB,
+	0x062AAB, 0x0473C8, 0x04D85A, 0x0399DC, 0x031118, 0x0178B2, 0x027AFD, 0x013A77,
+	0x036D76, 0x02B16A, 0x029337, 0x027E2E, 0x0257D8, 0x0131CC, 0x01B796, 0x010D91,
+},
+{
+	0x038000, 0x04DACA, 0x06ACD5, 0x094238, 0x0492AE, 0x04E322, 0x0A4EA5, 0x08900C,
+	0x038000, 0x0343FB, 0x07E388, 0x053E9F, 0x029AC1, 0x0153E8, 0x039CD0, 0x02429E,
+	0x076E5B, 0x068322, 0x08BEDE, 0x06DF11, 0x047C57, 0x02496B, 0x04BBAB, 0x020EDD,
+	0x07B786, 0x0AB421, 0x06F1ED, 0x09A20D, 0x065800, 0x08CC8E, 0x057FF7, 0x06E9D2,
+	0x07B786, 0x06F1ED, 0x068322, 0x07AE04, 0x0424BF, 0x06917B, 0x02C6B8, 0x03D9CB,
+	0x062FEB, 0x05917D, 0x0492D7, 0x03F964, 0x09B58C, 0x08BCEF, 0x0912F8, 0x07DD30,
+	0x081800, 0x05D7F7, 0x065BF6, 0x04B9F1, 0x040670, 0x01EE69, 0x03416C, 0x019CBC,
+	0x047FAA, 0x0388DC, 0x036138, 0x03459C, 0x03134C, 0x01915C, 0x0240F5, 0x0161CF,
+},
+{
+	0x040000, 0x058C54, 0x07A0F4, 0x0A94D3, 0x0539EC, 0x0595DD, 0x0BC798, 0x09C932,
+	0x040000, 0x03BB68, 0x090409, 0x05FE6D, 0x02FA01, 0x018477, 0x0420EE, 0x029547,
+	0x087E1F, 0x07714C, 0x09FEB5, 0x07DA5D, 0x052064, 0x029D0D, 0x0568C3, 0x025A21,
+	0x08D1BE, 0x0C3B94, 0x07EFEA, 0x0B0258, 0x074000, 0x0A0E59, 0x06491A, 0x07E6A7,
+	0x08D1BE, 0x07EFEA, 0x07714C, 0x08C6E0, 0x04BC48, 0x0781B1, 0x032C3F, 0x04669F,
+	0x071232, 0x065D22, 0x053A1A, 0x048ABC, 0x0B18A0, 0x09FC7F, 0x0A5ED3, 0x08FCC9,
+	0x094000, 0x06ADAC, 0x074487, 0x0566CA, 0x0499A5, 0x02350B, 0x03B87B, 0x01D7B3,
+	0x052430, 0x040A20, 0x03DCD3, 0x03BD45, 0x0383C5, 0x01CAB3, 0x029361, 0x01945A,
+},
+{
+	0x050000, 0x06EF69, 0x098931, 0x0D3A07, 0x068867, 0x06FB55, 0x0EB97E, 0x0C3B7E,
+	0x050000, 0x04AA42, 0x0B450B, 0x077E08, 0x03B881, 0x01E595, 0x05292A, 0x033A99,
+	0x0A9DA7, 0x094D9F, 0x0C7E62, 0x09D0F4, 0x06687D, 0x034450, 0x06C2F4, 0x02F0AA,
+	0x0B062D, 0x0F4A78, 0x09EBE4, 0x0DC2EE, 0x091000, 0x0C91EF, 0x07DB61, 0x09E050,
+	0x0B062D, 0x09EBE4, 0x094D9F, 0x0AF898, 0x05EB59, 0x09621D, 0x03F74F, 0x058046,
+	0x08D6BE, 0x07F46A, 0x0688A0, 0x05AD6B, 0x0DDEC8, 0x0C7B9F, 0x0CF687, 0x0B3BFB,
+	0x0B9000, 0x085917, 0x0915A8, 0x06C07D, 0x05C00E, 0x02C24D, 0x04A69A, 0x024D9F,
+	0x066D3C, 0x050CA7, 0x04D407, 0x04AC96, 0x0464B6, 0x023D5F, 0x033839, 0x01F971,
+},
+{
+	0x060000, 0x08527E, 0x0B716E, 0x0FDF3C, 0x07D6E1, 0x0860CC, 0x11AB63, 0x0EADCB,
+	0x060000, 0x05991C, 0x0D860D, 0x08FDA3, 0x047702, 0x0246B3, 0x063165, 0x03DFEA,
+	0x0CBD2E, 0x0B29F1, 0x0EFE0F, 0x0BC78B, 0x07B096, 0x03EB93, 0x081D24, 0x038732,
+	0x0D3A9C, 0x12595D, 0x0BE7DF, 0x108384, 0x0AE000, 0x0F1585, 0x096DA8, 0x0BD9FA,
+	0x0D3A9C, 0x0BE7DF, 0x0B29F1, 0x0D2A50, 0x071A6B, 0x0B4289, 0x04C25F, 0x0699EE,
+	0x0A9B4A, 0x098BB2, 0x07D727, 0x06D01A, 0x10A4F0, 0x0EFABE, 0x0F8E3C, 0x0D7B2E,
+	0x0DE000, 0x0A0482, 0x0AE6CA, 0x081A2F, 0x06E677, 0x034F90, 0x0594B9, 0x02C38C,
+	0x07B649, 0x060F2F, 0x05CB3C, 0x059BE7, 0x0545A7, 0x02B00C, 0x03DD11, 0x025E87,
+},
+{
+	0x080000, 0x0B18A8, 0x0F41E8, 0x1529A5, 0x0A73D7, 0x0B2BBB, 0x178F2F, 0x139264,
+	0x080000, 0x0776CF, 0x120812, 0x0BFCD9, 0x05F402, 0x0308EF, 0x0841DC, 0x052A8E,
+	0x10FC3E, 0x0EE297, 0x13FD69, 0x0FB4B9, 0x0A40C8, 0x053A1A, 0x0AD186, 0x04B442,
+	0x11A37B, 0x187727, 0x0FDFD4, 0x1604B0, 0x0E8000, 0x141CB1, 0x0C9235, 0x0FCD4D,
+	0x11A37B, 0x0FDFD4, 0x0EE297, 0x118DC0, 0x09788F, 0x0F0362, 0x06587F, 0x08CD3D,
+	0x0E2463, 0x0CBA43, 0x0A7434, 0x091577, 0x163140, 0x13F8FE, 0x14BDA5, 0x11F992,
+	0x128000, 0x0D5B58, 0x0E890D, 0x0ACD94, 0x093349, 0x046A15, 0x0770F7, 0x03AF65,
+	0x0A4861, 0x08143F, 0x07B9A6, 0x077A89, 0x070789, 0x039565, 0x0526C2, 0x0328B4,
+},
+{
+	0x0C0000, 0x10A4FD, 0x16E2DB, 0x1FBE78, 0x0FADC3, 0x10C198, 0x2356C7, 0x1D5B96,
+	0x0C0000, 0x0B3237, 0x1B0C1A, 0x11FB46, 0x08EE03, 0x048D66, 0x0C62CA, 0x07BFD5,
+	0x197A5D, 0x1653E3, 0x1DFC1E, 0x178F16, 0x0F612C, 0x07D727, 0x103A49, 0x070E64,
+	0x1A7539, 0x24B2BB, 0x17CFBD, 0x210709, 0x15C000, 0x1E2B0A, 0x12DB4F, 0x17B3F4,
+	0x1A7539, 0x17CFBD, 0x1653E3, 0x1A54A0, 0x0E34D7, 0x168513, 0x0984BE, 0x0D33DC,
+	0x153695, 0x131765, 0x0FAE4E, 0x0DA033, 0x2149E1, 0x1DF57D, 0x1F1C78, 0x1AF65B,
+	0x1BC000, 0x140904, 0x15CD94, 0x10345E, 0x0DCCEE, 0x069F20, 0x0B2972, 0x058718,
+	0x0F6C91, 0x0C1E5E, 0x0B9678, 0x0B37CE, 0x0A8B4E, 0x056018, 0x07BA22, 0x04BD0E,
+},
+{
+	0x110000, 0x179466, 0x206C0C, 0x2CF87F, 0x16362A, 0x17BCED, 0x321044, 0x299714,
+	0x110000, 0x0FDC79, 0x265125, 0x19794E, 0x0CA685, 0x0672FB, 0x118BF4, 0x0AFA6D,
+	0x241804, 0x1FA181, 0x2A7A80, 0x21600A, 0x15C9A9, 0x0B1B77, 0x16FD3C, 0x09FF0D,
+	0x257B66, 0x33FD33, 0x21BBA2, 0x2EC9F7, 0x1ED000, 0x2ABCF9, 0x1AB6B0, 0x219444,
+	0x257B66, 0x21BBA2, 0x1FA181, 0x254D38, 0x142030, 0x1FE730, 0x0D7C0E, 0x12B423,
+	0x1E0D52, 0x1B0BCF, 0x1636EE, 0x134D9E, 0x2F28A9, 0x2A711B, 0x2C12FF, 0x263256,
+	0x275000, 0x1C621B, 0x1EE33C, 0x16F4DB, 0x138CFB, 0x09616E, 0x0FD00C, 0x07D4B7,
+	0x15D9CE, 0x112B06, 0x106A80, 0x0FE464, 0x0EF004, 0x079D77, 0x0AF25B, 0x06B67F,
+},
+{
+	0x160000, 0x1E83CF, 0x29F53D, 0x3A3286, 0x1CBE90, 0x1EB842, 0x40C9C2, 0x35D293,
+	0x160000, 0x1486BA, 0x319630, 0x20F756, 0x105F06, 0x085891, 0x16B51E, 0x0E3506,
+	0x2EB5AA, 0x28EF20, 0x36F8E1, 0x2B30FE, 0x1C3225, 0x0E5FC7, 0x1DC030, 0x0CEFB7,
+	0x308193, 0x4347AC, 0x2BA786, 0x3C8CE5, 0x27E000, 0x374EE7, 0x229212, 0x2B7494,
+	0x308193, 0x2BA786, 0x28EF20, 0x3045D0, 0x1A0B89, 0x29494D, 0x11735D, 0x183469,
+	0x26E410, 0x230039, 0x1CBF8F, 0x18FB09, 0x3D0771, 0x36ECBA, 0x390986, 0x316E52,
+	0x32E000, 0x24BB33, 0x27F8E4, 0x1DB557, 0x194D09, 0x0C23BB, 0x1476A6, 0x0A2256,
+	0x1C470A, 0x1637AD, 0x153E87, 0x1490FA, 0x1354B9, 0x09DAD6, 0x0E2A94, 0x08AFF0,
+},
+{
+	0x1C0000, 0x26D64D, 0x3566AA, 0x4A11C2, 0x249572, 0x27190E, 0x527525, 0x44805E,
+	0x1C0000, 0x1A1FD6, 0x3F1C3E, 0x29F4F9, 0x14D607, 0x0A9F44, 0x1CE683, 0x1214F0,
+	0x3B72D9, 0x341911, 0x45F6F0, 0x36F889, 0x23E2BB, 0x124B5B, 0x25DD54, 0x1076E9,
+	0x3DBC30, 0x55A109, 0x378F64, 0x4D1069, 0x32C000, 0x46646C, 0x2BFFB9, 0x374E8E,
+	0x3DBC30, 0x378F64, 0x341911, 0x3D7020, 0x2125F5, 0x348BD6, 0x1635BC, 0x1ECE57,
+	0x317F5B, 0x2C8BEB, 0x2496B6, 0x1FCB22, 0x4DAC61, 0x45E778, 0x4897C2, 0x3EE97F,
+	0x40C000, 0x2EBFB5, 0x32DFAE, 0x25CF86, 0x203380, 0x0F734B, 0x1A0B5F, 0x0CE5E2,
+	0x23FD53, 0x1C46DC, 0x1B09C4, 0x1A2CE1, 0x189A60, 0x0C8AE2, 0x1207A5, 0x0B0E77,
+},
+{
+	0x220000, 0x2F28CC, 0x40D818, 0x59F0FE, 0x2C6C53, 0x2F79DA, 0x642089, 0x532E29,
+	0x220000, 0x1FB8F1, 0x4CA24B, 0x32F29C, 0x194D09, 0x0CE5F7, 0x2317E8, 0x15F4DB,
+	0x483007, 0x3F4303, 0x54F4FF, 0x42C014, 0x2B9351, 0x1636EE, 0x2DFA79, 0x13FE1A,
+	0x4AF6CC, 0x67FA67, 0x437743, 0x5D93EE, 0x3DA000, 0x5579F1, 0x356D61, 0x432888,
+	0x4AF6CC, 0x437743, 0x3F4303, 0x4A9A70, 0x284060, 0x3FCE60, 0x1AF81B, 0x256845,
+	0x3C1AA5, 0x36179D, 0x2C6DDD, 0x269B3C, 0x5E5152, 0x54E237, 0x5825FE, 0x4C64AD,
+	0x4EA000, 0x38C437, 0x3DC678, 0x2DE9B5, 0x2719F7, 0x12C2DB, 0x1FA018, 0x0FA96E,
+	0x2BB39B, 0x22560C, 0x20D500, 0x1FC8C8, 0x1DE007, 0x0F3AEE, 0x15E4B7, 0x0D6CFE,
+},
+{
+	0x2C0000, 0x3D079E, 0x53EA79, 0x74650C, 0x397D20, 0x3D7083, 0x819383, 0x6BA525,
+	0x2C0000, 0x290D75, 0x632C61, 0x41EEAC, 0x20BE0C, 0x10B121, 0x2D6A3B, 0x1C6A0C,
+	0x5D6B54, 0x51DE40, 0x6DF1C2, 0x5661FB, 0x38644B, 0x1CBF8F, 0x3B8060, 0x19DF6D,
+	0x610326, 0x868F57, 0x574F0B, 0x7919CA, 0x4FC000, 0x6E9DCE, 0x452423, 0x56E928,
+	0x610326, 0x574F0B, 0x51DE40, 0x608BA0, 0x341713, 0x52929A, 0x22E6BA, 0x3068D2,
+	0x4DC821, 0x460071, 0x397F1E, 0x31F611, 0x7A0EE2, 0x6DD974, 0x72130C, 0x62DCA3,
+	0x65C000, 0x497665, 0x4FF1C9, 0x3B6AAE, 0x329A12, 0x184776, 0x28ED4D, 0x1444AC,
+	0x388E14, 0x2C6F5A, 0x2A7D0F, 0x2921F4, 0x26A973, 0x13B5AD, 0x1C5528, 0x115FDF,
+},
+};
+
+static const uint32 binkInterQuant[16][64] = {
+{
+	0x010000, 0x017946, 0x01A5A9, 0x0248DC, 0x016363, 0x0152A7, 0x0243EC, 0x0209EA,
+	0x012000, 0x00E248, 0x01BBDA, 0x015CBC, 0x00A486, 0x0053E0, 0x00F036, 0x008095,
+	0x01B701, 0x016959, 0x01B0B9, 0x0153FD, 0x00F8E7, 0x007EE4, 0x00EA30, 0x007763,
+	0x01B701, 0x0260EB, 0x019DE9, 0x023E1B, 0x017000, 0x01FE6E, 0x012DB5, 0x01A27B,
+	0x01E0D1, 0x01B0B9, 0x018A33, 0x01718D, 0x00D87A, 0x014449, 0x007B9A, 0x00AB71,
+	0x013178, 0x0112EA, 0x00AD08, 0x009BB9, 0x023D97, 0x020437, 0x021CCC, 0x01E6B4,
+	0x018000, 0x012DB5, 0x0146D9, 0x0100CE, 0x00CFD2, 0x006E5C, 0x00B0E4, 0x005A2D,
+	0x00E9CC, 0x00B7B1, 0x00846F, 0x006B85, 0x008337, 0x0042E5, 0x004A10, 0x002831,
+},
+{
+	0x015555, 0x01F708, 0x023237, 0x030BD0, 0x01D9D9, 0x01C389, 0x03053B, 0x02B7E3,
+	0x018000, 0x012DB5, 0x024FCE, 0x01D0FA, 0x00DB5D, 0x006FD5, 0x014048, 0x00AB71,
+	0x024957, 0x01E1CC, 0x0240F7, 0x01C551, 0x014BDE, 0x00A92F, 0x013840, 0x009F2F,
+	0x024957, 0x032BE4, 0x0227E1, 0x02FD7A, 0x01EAAB, 0x02A893, 0x019247, 0x022DF9,
+	0x028116, 0x0240F7, 0x020D99, 0x01ECBC, 0x0120A3, 0x01B061, 0x00A4CE, 0x00E497,
+	0x01974B, 0x016E8E, 0x00E6B5, 0x00CFA2, 0x02FCC9, 0x02B04A, 0x02D110, 0x0288F1,
+	0x020000, 0x019247, 0x01B3CC, 0x015668, 0x011518, 0x009325, 0x00EBDA, 0x00783D,
+	0x0137BB, 0x00F4ED, 0x00B093, 0x008F5C, 0x00AEF4, 0x005931, 0x0062BF, 0x003597,
+},
+{
+	0x01AAAB, 0x0274CB, 0x02BEC4, 0x03CEC4, 0x02504F, 0x02346C, 0x03C689, 0x0365DC,
+	0x01E000, 0x017922, 0x02E3C1, 0x024539, 0x011235, 0x008BCA, 0x01905A, 0x00D64D,
+	0x02DBAD, 0x025A40, 0x02D134, 0x0236A5, 0x019ED6, 0x00D37B, 0x018650, 0x00C6FB,
+	0x02DBAD, 0x03F6DD, 0x02B1D9, 0x03BCD8, 0x026555, 0x0352B8, 0x01F6D8, 0x02B977,
+	0x03215C, 0x02D134, 0x029100, 0x0267EB, 0x0168CC, 0x021C7A, 0x00CE01, 0x011DBD,
+	0x01FD1E, 0x01CA31, 0x012062, 0x01038A, 0x03BBFB, 0x035C5C, 0x038554, 0x032B2D,
+	0x028000, 0x01F6D8, 0x0220C0, 0x01AC02, 0x015A5E, 0x00B7EF, 0x0126D1, 0x00964C,
+	0x0185A9, 0x013228, 0x00DCB8, 0x00B333, 0x00DAB2, 0x006F7D, 0x007B6F, 0x0042FC,
+},
+{
+	0x020000, 0x02F28D, 0x034B52, 0x0491B8, 0x02C6C5, 0x02A54E, 0x0487D8, 0x0413D5,
+	0x024000, 0x01C48F, 0x0377B5, 0x02B977, 0x01490C, 0x00A7BF, 0x01E06C, 0x01012A,
+	0x036E03, 0x02D2B3, 0x036172, 0x02A7FA, 0x01F1CE, 0x00FDC7, 0x01D460, 0x00EEC7,
+	0x036E03, 0x04C1D6, 0x033BD1, 0x047C37, 0x02E000, 0x03FCDD, 0x025B6A, 0x0344F5,
+	0x03C1A1, 0x036172, 0x031466, 0x02E31B, 0x01B0F5, 0x028892, 0x00F735, 0x0156E2,
+	0x0262F1, 0x0225D5, 0x015A10, 0x013772, 0x047B2D, 0x04086E, 0x043998, 0x03CD69,
+	0x030000, 0x025B6A, 0x028DB3, 0x02019B, 0x019FA3, 0x00DCB8, 0x0161C7, 0x00B45B,
+	0x01D398, 0x016F63, 0x0108DD, 0x00D70A, 0x01066F, 0x0085C9, 0x00941F, 0x005062,
+},
+{
+	0x02AAAB, 0x03EE11, 0x04646D, 0x0617A0, 0x03B3B2, 0x038713, 0x060A75, 0x056FC6,
+	0x030000, 0x025B6A, 0x049F9B, 0x03A1F4, 0x01B6BB, 0x00DFAA, 0x028090, 0x0156E2,
+	0x0492AE, 0x03C399, 0x0481ED, 0x038AA2, 0x0297BD, 0x01525F, 0x027080, 0x013E5E,
+	0x0492AE, 0x0657C8, 0x044FC1, 0x05FAF4, 0x03D555, 0x055126, 0x03248D, 0x045BF2,
+	0x05022D, 0x0481ED, 0x041B33, 0x03D979, 0x024147, 0x0360C3, 0x01499C, 0x01C92E,
+	0x032E96, 0x02DD1C, 0x01CD6A, 0x019F43, 0x05F991, 0x056093, 0x05A220, 0x0511E1,
+	0x040000, 0x03248D, 0x036799, 0x02ACCF, 0x022A2F, 0x01264B, 0x01D7B5, 0x00F079,
+	0x026F75, 0x01E9D9, 0x016127, 0x011EB8, 0x015DE9, 0x00B262, 0x00C57F, 0x006B2D,
+},
+{
+	0x038000, 0x052876, 0x05C3CF, 0x07FF02, 0x04DBD9, 0x04A148, 0x07EDBA, 0x0722B4,
+	0x03F000, 0x0317FB, 0x06117C, 0x04C491, 0x023FD5, 0x01258F, 0x0348BD, 0x01C209,
+	0x060085, 0x04F0B9, 0x05EA87, 0x04A5F5, 0x036728, 0x01BC1C, 0x0333A8, 0x01A1DB,
+	0x060085, 0x085336, 0x05A8AE, 0x07D960, 0x050800, 0x06FA82, 0x041FF9, 0x05B8AE,
+	0x0692DA, 0x05EA87, 0x0563B2, 0x050D6E, 0x02F5AD, 0x046F00, 0x01B09C, 0x02580C,
+	0x042D25, 0x03C235, 0x025D9B, 0x022108, 0x07D78F, 0x070EC1, 0x0764CA, 0x06A777,
+	0x054000, 0x041FF9, 0x0477F9, 0x0382D0, 0x02D75E, 0x018242, 0x026B1D, 0x013B9F,
+	0x03324A, 0x0282ED, 0x01CF83, 0x017851, 0x01CB42, 0x00EA21, 0x010336, 0x008CAC,
+},
+{
+	0x040000, 0x05E519, 0x0696A4, 0x092370, 0x058D8A, 0x054A9C, 0x090FB0, 0x0827AA,
+	0x048000, 0x03891F, 0x06EF69, 0x0572EE, 0x029218, 0x014F7E, 0x03C0D8, 0x020254,
+	0x06DC05, 0x05A565, 0x06C2E4, 0x054FF3, 0x03E39B, 0x01FB8E, 0x03A8C0, 0x01DD8D,
+	0x06DC05, 0x0983AC, 0x0677A2, 0x08F86E, 0x05C000, 0x07F9B9, 0x04B6D4, 0x0689EB,
+	0x078343, 0x06C2E4, 0x0628CC, 0x05C635, 0x0361EA, 0x051124, 0x01EE69, 0x02ADC5,
+	0x04C5E1, 0x044BAA, 0x02B41F, 0x026EE5, 0x08F65A, 0x0810DD, 0x087330, 0x079AD1,
+	0x060000, 0x04B6D4, 0x051B65, 0x040337, 0x033F47, 0x01B970, 0x02C38F, 0x0168B6,
+	0x03A730, 0x02DEC6, 0x0211BA, 0x01AE14, 0x020CDD, 0x010B93, 0x01283E, 0x00A0C4,
+},
+{
+	0x050000, 0x075E60, 0x083C4D, 0x0B6C4C, 0x06F0ED, 0x069D43, 0x0B539C, 0x0A3194,
+	0x05A000, 0x046B67, 0x08AB44, 0x06CFAA, 0x03369E, 0x01A35E, 0x04B10F, 0x0282E8,
+	0x089307, 0x070EBF, 0x08739C, 0x06A3F0, 0x04DC82, 0x027A72, 0x0492F0, 0x0254F0,
+	0x089307, 0x0BE497, 0x08158B, 0x0B3689, 0x073000, 0x09F827, 0x05E489, 0x082C66,
+	0x096413, 0x08739C, 0x07B2FF, 0x0737C2, 0x043A64, 0x06556D, 0x026A04, 0x035936,
+	0x05F75A, 0x055E94, 0x036127, 0x030A9E, 0x0B33F1, 0x0A1514, 0x0A8FFC, 0x098186,
+	0x078000, 0x05E489, 0x06623F, 0x050405, 0x040F19, 0x0227CC, 0x037473, 0x01C2E3,
+	0x0490FC, 0x039677, 0x029629, 0x021999, 0x029015, 0x014E78, 0x01724E, 0x00C8F5,
+},
+{
+	0x060000, 0x08D7A6, 0x09E1F6, 0x0DB528, 0x085450, 0x07EFEA, 0x0D9788, 0x0C3B7E,
+	0x06C000, 0x054DAE, 0x0A671E, 0x082C66, 0x03DB24, 0x01F73E, 0x05A145, 0x03037D,
+	0x0A4A08, 0x087818, 0x0A2455, 0x07F7ED, 0x05D569, 0x02F955, 0x057D20, 0x02CC54,
+	0x0A4A08, 0x0E4582, 0x09B373, 0x0D74A5, 0x08A000, 0x0BF696, 0x07123E, 0x09CEE0,
+	0x0B44E4, 0x0A2455, 0x093D32, 0x08A950, 0x0512DF, 0x0799B6, 0x02E59E, 0x0404A7,
+	0x0728D2, 0x06717F, 0x040E2F, 0x03A657, 0x0D7187, 0x0C194B, 0x0CACC8, 0x0B683A,
+	0x090000, 0x07123E, 0x07A918, 0x0604D2, 0x04DEEA, 0x029629, 0x042556, 0x021D11,
+	0x057AC8, 0x044E28, 0x031A97, 0x02851E, 0x03134C, 0x01915C, 0x01BC5D, 0x00F126,
+},
+{
+	0x080000, 0x0BCA33, 0x0D2D48, 0x1246E0, 0x0B1B15, 0x0A9538, 0x121F5F, 0x104F53,
+	0x090000, 0x07123E, 0x0DDED2, 0x0AE5DD, 0x052430, 0x029EFD, 0x0781B1, 0x0404A7,
+	0x0DB80B, 0x0B4ACB, 0x0D85C7, 0x0A9FE7, 0x07C736, 0x03F71D, 0x075180, 0x03BB1A,
+	0x0DB80B, 0x130757, 0x0CEF44, 0x11F0DC, 0x0B8000, 0x0FF372, 0x096DA8, 0x0D13D6,
+	0x0F0686, 0x0D85C7, 0x0C5198, 0x0B8C6A, 0x06C3D4, 0x0A2248, 0x03DCD3, 0x055B8A,
+	0x098BC3, 0x089754, 0x05683E, 0x04DDC9, 0x11ECB4, 0x1021B9, 0x10E661, 0x0F35A3,
+	0x0C0000, 0x096DA8, 0x0A36CB, 0x08066E, 0x067E8E, 0x0372E1, 0x05871E, 0x02D16B,
+	0x074E60, 0x05BD8B, 0x042374, 0x035C28, 0x0419BB, 0x021726, 0x02507C, 0x014188,
+},
+{
+	0x0C0000, 0x11AF4C, 0x13C3EC, 0x1B6A50, 0x10A89F, 0x0FDFD4, 0x1B2F0F, 0x1876FD,
+	0x0D8000, 0x0A9B5D, 0x14CE3C, 0x1058CB, 0x07B649, 0x03EE7B, 0x0B4289, 0x0606FB,
+	0x149410, 0x10F030, 0x1448AB, 0x0FEFDA, 0x0BAAD2, 0x05F2AB, 0x0AFA40, 0x0598A7,
+	0x149410, 0x1C8B03, 0x1366E6, 0x1AE949, 0x114000, 0x17ED2B, 0x0E247C, 0x139DC1,
+	0x1689C8, 0x1448AB, 0x127A63, 0x11529F, 0x0A25BE, 0x0F336D, 0x05CB3C, 0x08094E,
+	0x0E51A4, 0x0CE2FE, 0x081C5D, 0x074CAE, 0x1AE30E, 0x183296, 0x195991, 0x16D074,
+	0x120000, 0x0E247C, 0x0F5230, 0x0C09A5, 0x09BDD5, 0x052C51, 0x084AAC, 0x043A21,
+	0x0AF590, 0x089C51, 0x06352E, 0x050A3B, 0x062698, 0x0322B9, 0x0378BA, 0x01E24D,
+},
+{
+	0x110000, 0x190DAC, 0x1C0039, 0x26D69C, 0x17998C, 0x167D16, 0x2682AB, 0x22A891,
+	0x132000, 0x0F06C3, 0x1D797F, 0x172876, 0x0AECE7, 0x0591D9, 0x0FF398, 0x0889E3,
+	0x1D2717, 0x17FEEF, 0x1CBC47, 0x1693CA, 0x108754, 0x086D1D, 0x0F8D30, 0x07ED98,
+	0x1D2717, 0x286F9A, 0x1B7C71, 0x261FD3, 0x187000, 0x21E552, 0x140904, 0x1BCA27,
+	0x1FEDDC, 0x1CBC47, 0x1A2D62, 0x188A62, 0x0E6022, 0x1588DA, 0x083540, 0x0B6284,
+	0x1448FE, 0x124192, 0x0B7D84, 0x0A574B, 0x2616FF, 0x2247AA, 0x23E98D, 0x2051FA,
+	0x198000, 0x140904, 0x15B46F, 0x110DAA, 0x0DCCEE, 0x07541E, 0x0BBF1F, 0x05FD04,
+	0x0F868B, 0x0C32C8, 0x08CB57, 0x0723D4, 0x08B6AD, 0x047130, 0x04EB08, 0x02AB42,
+},
+{
+	0x160000, 0x206C0C, 0x243C86, 0x3242E8, 0x1E8A79, 0x1D1A59, 0x31D646, 0x2CDA25,
+	0x18C000, 0x13722A, 0x2624C3, 0x1DF820, 0x0E2385, 0x073537, 0x14A4A7, 0x0B0CCC,
+	0x25BA1D, 0x1F0DAE, 0x252FE4, 0x1D37BB, 0x1563D6, 0x0AE78E, 0x142021, 0x0A4288,
+	0x25BA1D, 0x345430, 0x2391FB, 0x31565C, 0x1FA000, 0x2BDD7A, 0x19ED8D, 0x23F68C,
+	0x2951EF, 0x252FE4, 0x21E061, 0x1FC224, 0x129A87, 0x1BDE47, 0x0A9F44, 0x0EBBBA,
+	0x1A4058, 0x17A026, 0x0EDEAB, 0x0D61E9, 0x314AEF, 0x2C5CBE, 0x2E798A, 0x29D380,
+	0x210000, 0x19ED8D, 0x1C16AE, 0x1611AE, 0x11DC06, 0x097BEA, 0x0F3391, 0x07BFE7,
+	0x141787, 0x0FC93E, 0x0B617F, 0x093D6D, 0x0B46C1, 0x05BFA8, 0x065D55, 0x037437,
+},
+{
+	0x1C0000, 0x2943B2, 0x2E1E7C, 0x3FF810, 0x26DEC9, 0x250A43, 0x3F6DCE, 0x3915A3,
+	0x1F8000, 0x18BFD8, 0x308BE1, 0x262485, 0x11FEA9, 0x092C75, 0x1A45EB, 0x0E1049,
+	0x300425, 0x2785C6, 0x2F5439, 0x252FA8, 0x1B393F, 0x0DE0E4, 0x199D41, 0x0D0EDC,
+	0x300425, 0x4299B2, 0x2D456E, 0x3ECB00, 0x284000, 0x37D40F, 0x20FFCB, 0x2DC56D,
+	0x3496D3, 0x2F5439, 0x2B1D93, 0x286B74, 0x17AD66, 0x2377FE, 0x0D84E2, 0x12C062,
+	0x21692A, 0x1E11A5, 0x12ECDA, 0x110840, 0x3EBC76, 0x387608, 0x3B2652, 0x353BBA,
+	0x2A0000, 0x20FFCB, 0x23BFC6, 0x1C1681, 0x16BAF1, 0x0C1213, 0x1358E8, 0x09DCF8,
+	0x19924F, 0x141767, 0x0E7C16, 0x0BC28A, 0x0E5A0D, 0x075104, 0x0819B2, 0x04655D,
+},
+{
+	0x220000, 0x321B58, 0x380072, 0x4DAD38, 0x2F3318, 0x2CFA2D, 0x4D0556, 0x455122,
+	0x264000, 0x1E0D86, 0x3AF2FE, 0x2E50EB, 0x15D9CE, 0x0B23B2, 0x1FE730, 0x1113C7,
+	0x3A4E2D, 0x2FFDDF, 0x39788E, 0x2D2795, 0x210EA8, 0x10DA39, 0x1F1A61, 0x0FDB2F,
+	0x3A4E2D, 0x50DF33, 0x36F8E1, 0x4C3FA5, 0x30E000, 0x43CAA5, 0x281209, 0x37944D,
+	0x3FDBB7, 0x39788E, 0x345AC4, 0x3114C3, 0x1CC044, 0x2B11B4, 0x106A80, 0x16C509,
+	0x2891FC, 0x248324, 0x16FB08, 0x14AE97, 0x4C2DFD, 0x448F54, 0x47D31B, 0x40A3F5,
+	0x330000, 0x281209, 0x2B68DF, 0x221B53, 0x1B99DB, 0x0EA83B, 0x177E3E, 0x0BFA09,
+	0x1F0D17, 0x18658F, 0x1196AE, 0x0E47A8, 0x116D5A, 0x08E260, 0x09D60F, 0x055684,
+},
+{
+	0x2C0000, 0x40D818, 0x48790C, 0x6485D0, 0x3D14F2, 0x3A34B2, 0x63AC8D, 0x59B44A,
+	0x318000, 0x26E454, 0x4C4986, 0x3BF03F, 0x1C470A, 0x0E6A6E, 0x29494D, 0x161998,
+	0x4B743A, 0x3E1B5C, 0x4A5FC7, 0x3A6F75, 0x2AC7AC, 0x15CF1D, 0x284041, 0x148510,
+	0x4B743A, 0x68A861, 0x4723F6, 0x62ACB8, 0x3F4000, 0x57BAF3, 0x33DB1A, 0x47ED19,
+	0x52A3DE, 0x4A5FC7, 0x43C0C2, 0x3F8448, 0x25350D, 0x37BC8E, 0x153E87, 0x1D7775,
+	0x3480B0, 0x2F404C, 0x1DBD56, 0x1AC3D2, 0x6295DE, 0x58B97B, 0x5CF313, 0x53A701,
+	0x420000, 0x33DB1A, 0x382D5C, 0x2C235D, 0x23B80D, 0x12F7D4, 0x1E6723, 0x0F7FCF,
+	0x282F0E, 0x1F927D, 0x16C2FF, 0x127AD9, 0x168D83, 0x0B7F50, 0x0CBAAA, 0x06E86E,
+},
+};
+
+} // End of namespace Video
+
+#endif // GRAPHICS_VIDEO_BINKDATA_H
diff --git a/video/module.mk b/video/module.mk
index d813218785..ceeac94384 100644
--- a/video/module.mk
+++ b/video/module.mk
@@ -19,5 +19,10 @@ MODULE_OBJS := \
 	codecs/smc.o \
 	codecs/truemotion1.o
 
+ifdef USE_BINK
+MODULE_OBJS += \
+	bink_decoder.o
+endif
+
 # Include common rules
 include $(srcdir)/rules.mk
diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp
index 05a20ecd8d..dce80eda2c 100644
--- a/video/smk_decoder.cpp
+++ b/video/smk_decoder.cpp
@@ -372,17 +372,11 @@ bool SmackerDecoder::loadStream(Common::SeekableReadStream *stream) {
 
 	_fileStream = stream;
 
-	// Seek to the first frame
+	// Read in the Smacker header
 	_header.signature = _fileStream->readUint32BE();
 
-	// No BINK support available
-	if (_header.signature == MKTAG('B','I','K','i')) {
-		delete _fileStream;
-		_fileStream = 0;
+	if (_header.signature != MKTAG('S', 'M', 'K', '2') && _header.signature != MKTAG('S', 'M', 'K', '4'))
 		return false;
-	}
-
-	assert(_header.signature == MKTAG('S','M','K','2') || _header.signature == MKTAG('S','M','K','4'));
 
 	uint32 width = _fileStream->readUint32LE();
 	uint32 height = _fileStream->readUint32LE();