aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--video/codecs/svq1.cpp927
-rw-r--r--video/codecs/svq1.h24
-rw-r--r--video/codecs/svq1_vlc.h574
3 files changed, 670 insertions, 855 deletions
diff --git a/video/codecs/svq1.cpp b/video/codecs/svq1.cpp
index 38abbc7230..0ccdc22fc9 100644
--- a/video/codecs/svq1.cpp
+++ b/video/codecs/svq1.cpp
@@ -33,6 +33,7 @@
#include "common/system.h"
#include "common/debug.h"
#include "common/textconsole.h"
+#include "common/huffman.h"
#include "graphics/yuv_to_rgb.h"
@@ -43,69 +44,338 @@ namespace Video {
#define SVQ1_BLOCK_INTER_4V 2
#define SVQ1_BLOCK_INTRA 3
-struct VLC {
- int32 bits;
- int16 (*table)[2]; // code, bits
- int32 table_size;
- int32 table_allocated;
-};
-
-/**
- * parses a vlc code, faster then get_vlc()
- * @param bits is the number of bits which will be read at once, must be
- * identical to nb_bits in init_vlc()
- * @param max_depth is the number of times bits bits must be read to completely
- * read the longest vlc code
- * = (max_vlc_length + bits - 1) / bits
- */
-static int getVlc2(Common::BitStream *s, int16 (*table)[2], int bits, int maxDepth) {
- int index = s->getBits(bits);
- int code = table[index][0];
- int n = table[index][1];
-
- if (maxDepth > 1 && n < 0) {
- index = s->getBits(-n) + code;
- code = table[index][0];
- n = table[index][1];
-
- if(maxDepth > 2 && n < 0) {
- index = s->getBits(-n) + code;
- code = table[index][0];
- n = table[index][1];
- }
+SVQ1Decoder::SVQ1Decoder(uint16 width, uint16 height) {
+ _surface = new Graphics::Surface();
+ _surface->create(width, height, g_system->getScreenFormat());
+
+ _current[0] = new byte[width*height];
+ _current[1] = new byte[(width/4)*(height/4)];
+ _current[2] = new byte[(width/4)*(height/4)];
+
+ _last[0] = 0;
+ _last[1] = 0;
+ _last[2] = 0;
+
+ // Setup Variable Length Code Tables
+ _blockType = new Common::Huffman(0, 4, s_svq1BlockTypeCodes, s_svq1BlockTypeLengths);
+
+ for (int i = 0; i < 6; i++) {
+ _intraMultistage[i] = new Common::Huffman(0, 8, s_svq1IntraMultistageCodes[i], s_svq1IntraMultistageLengths[i]);
+ _interMultistage[i] = new Common::Huffman(0, 8, s_svq1InterMultistageCodes[i], s_svq1InterMultistageLengths[i]);
}
- return code;
+ _intraMean = new Common::Huffman(0, 256, s_svq1IntraMeanCodes, s_svq1IntraMeanLengths);
+ _interMean = new Common::Huffman(0, 512, s_svq1InterMeanCodes, s_svq1InterMeanLengths);
+ _motionComponent = new Common::Huffman(0, 33, s_svq1MotionComponentCodes, s_svq1MotionComponentLengths);
}
-static int allocTable(VLC *vlc, int size, int use_static) {
- int index;
- int16 (*temp)[2] = NULL;
- index = vlc->table_size;
- vlc->table_size += size;
- if (vlc->table_size > vlc->table_allocated) {
- if(use_static)
- error("SVQ1 cant do anything, init_vlc() is used with too little memory");
- vlc->table_allocated += (1 << vlc->bits);
- temp = (int16 (*)[2])realloc(vlc->table, sizeof(int16 *) * 2 * vlc->table_allocated);
- if (!temp) {
- free(vlc->table);
- vlc->table = NULL;
- return -1;
- }
- vlc->table = temp;
+SVQ1Decoder::~SVQ1Decoder() {
+ _surface->free();
+ delete _surface;
+
+ delete[] _current[0];
+ delete[] _current[1];
+ delete[] _current[2];
+
+ delete[] _last[0];
+ delete[] _last[1];
+ delete[] _last[2];
+
+ delete _blockType;
+ delete _intraMean;
+ delete _interMean;
+ delete _motionComponent;
+
+ for (int i = 0; i < 6; i++) {
+ delete _intraMultistage[i];
+ delete _interMultistage[i];
}
- return index;
}
-static VLC svq1_block_type;
-static VLC svq1_motion_component;
-static VLC svq1_intra_multistage[6];
-static VLC svq1_inter_multistage[6];
-static VLC svq1_intra_mean;
-static VLC svq1_inter_mean;
+const Graphics::Surface *SVQ1Decoder::decodeImage(Common::SeekableReadStream *stream) {
+ debug(1, "SVQ1Decoder::decodeImage()");
+
+ Common::BitStream32BEMSB frameData(*stream);
+
+ uint32 frameCode = frameData.getBits(22);
+ debug(1, " frameCode: %d", frameCode);
+
+ if ((frameCode & ~0x70) || !(frameCode & 0x60)) { // Invalid
+ warning("Invalid Image at frameCode");
+ return _surface;
+ }
+
+ // swap some header bytes (why?)
+ //if (frameCode != 0x20) {
+ // uint32 *src = stream;
+ //
+ // for (i = 4; i < 8; i++) {
+ // src[i] = ((src[i] << 16) | (src[i] >> 16)) ^ src[7 - i];
+ // }
+ //}
+
+#if 0
+ static const uint16 checksum_table[256] = {
+ 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
+ 0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
+ 0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
+ 0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE,
+ 0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485,
+ 0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D,
+ 0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4,
+ 0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC,
+ 0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823,
+ 0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B,
+ 0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12,
+ 0xDBFD, 0xCBDC, 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A,
+ 0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41,
+ 0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49,
+ 0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70,
+ 0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78,
+ 0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F,
+ 0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067,
+ 0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E,
+ 0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256,
+ 0xB5EA, 0xA5CB, 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D,
+ 0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
+ 0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C,
+ 0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634,
+ 0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB,
+ 0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3,
+ 0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A,
+ 0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92,
+ 0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9,
+ 0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1,
+ 0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8,
+ 0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0
+ };
+#endif
+
+ byte temporalReference = frameData.getBits(8);
+ debug(1, " temporalReference: %d", temporalReference);
+ const char* types[4] = { "I (Key)", "P (Delta from Previous)", "B (Delta from Next)", "Invalid" };
+ byte frameType = frameData.getBits(2);
+ debug(1, " frameType: %d = %s Frame", frameType, types[frameType]);
+ if (frameType == 0) { // I Frame
+ // TODO: Validate checksum if present
+ if (frameCode == 0x50 || frameCode == 0x60) {
+ uint32 checksum = frameData.getBits(16);
+ debug(1, " checksum:0x%02x", checksum);
+ //uint16 calculate_packet_checksum (const uint8 *data, const int length) {
+ // int value;
+ //for (int i = 0; i < length; i++)
+ // value = checksum_table[data[i] ^ (value >> 8)] ^ ((value & 0xFF) << 8);
+ }
+ } else if (frameType == 2) { // B Frame
+ warning("B Frames not supported by SVQ1 decoder");
+ return _surface;
+ } else if (frameType == 3) { // Invalid
+ warning("Invalid Frame Type");
+ return _surface;
+ }
+
+ static const uint8 stringXORTable[256] = {
+ 0x00, 0xD5, 0x7F, 0xAA, 0xFE, 0x2B, 0x81, 0x54,
+ 0x29, 0xFC, 0x56, 0x83, 0xD7, 0x02, 0xA8, 0x7D,
+ 0x52, 0x87, 0x2D, 0xF8, 0xAC, 0x79, 0xD3, 0x06,
+ 0x7B, 0xAE, 0x04, 0xD1, 0x85, 0x50, 0xFA, 0x2F,
+ 0xA4, 0x71, 0xDB, 0x0E, 0x5A, 0x8F, 0x25, 0xF0,
+ 0x8D, 0x58, 0xF2, 0x27, 0x73, 0xA6, 0x0C, 0xD9,
+ 0xF6, 0x23, 0x89, 0x5C, 0x08, 0xDD, 0x77, 0xA2,
+ 0xDF, 0x0A, 0xA0, 0x75, 0x21, 0xF4, 0x5E, 0x8B,
+ 0x9D, 0x48, 0xE2, 0x37, 0x63, 0xB6, 0x1C, 0xC9,
+ 0xB4, 0x61, 0xCB, 0x1E, 0x4A, 0x9F, 0x35, 0xE0,
+ 0xCF, 0x1A, 0xB0, 0x65, 0x31, 0xE4, 0x4E, 0x9B,
+ 0xE6, 0x33, 0x99, 0x4C, 0x18, 0xCD, 0x67, 0xB2,
+ 0x39, 0xEC, 0x46, 0x93, 0xC7, 0x12, 0xB8, 0x6D,
+ 0x10, 0xC5, 0x6F, 0xBA, 0xEE, 0x3B, 0x91, 0x44,
+ 0x6B, 0xBE, 0x14, 0xC1, 0x95, 0x40, 0xEA, 0x3F,
+ 0x42, 0x97, 0x3D, 0xE8, 0xBC, 0x69, 0xC3, 0x16,
+ 0xEF, 0x3A, 0x90, 0x45, 0x11, 0xC4, 0x6E, 0xBB,
+ 0xC6, 0x13, 0xB9, 0x6C, 0x38, 0xED, 0x47, 0x92,
+ 0xBD, 0x68, 0xC2, 0x17, 0x43, 0x96, 0x3C, 0xE9,
+ 0x94, 0x41, 0xEB, 0x3E, 0x6A, 0xBF, 0x15, 0xC0,
+ 0x4B, 0x9E, 0x34, 0xE1, 0xB5, 0x60, 0xCA, 0x1F,
+ 0x62, 0xB7, 0x1D, 0xC8, 0x9C, 0x49, 0xE3, 0x36,
+ 0x19, 0xCC, 0x66, 0xB3, 0xE7, 0x32, 0x98, 0x4D,
+ 0x30, 0xE5, 0x4F, 0x9A, 0xCE, 0x1B, 0xB1, 0x64,
+ 0x72, 0xA7, 0x0D, 0xD8, 0x8C, 0x59, 0xF3, 0x26,
+ 0x5B, 0x8E, 0x24, 0xF1, 0xA5, 0x70, 0xDA, 0x0F,
+ 0x20, 0xF5, 0x5F, 0x8A, 0xDE, 0x0B, 0xA1, 0x74,
+ 0x09, 0xDC, 0x76, 0xA3, 0xF7, 0x22, 0x88, 0x5D,
+ 0xD6, 0x03, 0xA9, 0x7C, 0x28, 0xFD, 0x57, 0x82,
+ 0xFF, 0x2A, 0x80, 0x55, 0x01, 0xD4, 0x7E, 0xAB,
+ 0x84, 0x51, 0xFB, 0x2E, 0x7A, 0xAF, 0x05, 0xD0,
+ 0xAD, 0x78, 0xD2, 0x07, 0x53, 0x86, 0x2C, 0xF9
+ };
+
+ if ((frameCode ^ 0x10) >= 0x50) {
+ // Decode embedded string
+ Common::String str;
+ uint8 stringLen = frameData.getBits(8);
+ byte xorVal = stringXORTable[stringLen];
+
+ for (uint16 i = 0; i < stringLen-1; i++) {
+ byte data = frameData.getBits(8);
+ str += data ^ xorVal;
+ xorVal = stringXORTable[data];
+ }
+ debug(1, " Embedded String of %d Characters: \"%s\"", stringLen, str.c_str());
+ }
+
+ byte unk1 = frameData.getBits(2); // Unknown
+ debug(1, " unk1: %d", unk1);
+ byte unk2 = frameData.getBits(2); // Unknown
+ debug(1, " unk2: %d", unk2);
+ bool unk3 = frameData.getBit(); // Unknown
+ debug(1, " unk3: %d", unk3);
+
+ static const struct { uint w, h; } standardFrameSizes[7] = {
+ { 160, 120 }, // 0
+ { 128, 96 }, // 1
+ { 176, 144 }, // 2
+ { 352, 288 }, // 3
+ { 704, 576 }, // 4
+ { 240, 180 }, // 5
+ { 320, 240 } // 6
+ };
+
+ byte frameSizeCode = frameData.getBits(3);
+ debug(1, " frameSizeCode: %d", frameSizeCode);
+ uint16 frameWidth, frameHeight;
+ if (frameSizeCode == 7) {
+ frameWidth = frameData.getBits(12);
+ frameHeight = frameData.getBits(12);
+ } else {
+ frameWidth = standardFrameSizes[frameSizeCode].w;
+ frameHeight = standardFrameSizes[frameSizeCode].h;
+ }
+ debug(1, " frameWidth: %d", frameWidth);
+ debug(1, " frameHeight: %d", frameHeight);
+ if (frameWidth == 0 || frameHeight == 0) { // Invalid
+ warning("Invalid Frame Size");
+ return _surface;
+ }
+ bool checksumPresent = frameData.getBit();
+ debug(1, " checksumPresent: %d", checksumPresent);
+ if (checksumPresent) {
+ bool usePacketChecksum = frameData.getBit();
+ debug(1, " usePacketChecksum: %d", usePacketChecksum);
+ bool componentChecksumsAfterImageData = frameData.getBit();
+ debug(1, " componentChecksumsAfterImageData: %d", componentChecksumsAfterImageData);
+ byte unk4 = frameData.getBits(2);
+ debug(1, " unk4: %d", unk4);
+ if (unk4 != 0)
+ warning("Invalid Frame Header in SVQ1 Frame Decode");
+ }
-static int svq1DecodeBlockIntra(Common::BitStream *s, uint8 *pixels, int pitch) {
+ bool unk5 = frameData.getBit();
+ debug(1, " unk5: %d", unk5);
+ if (unk5) {
+ bool unk6 = frameData.getBit();
+ debug(1, " unk6: %d", unk6);
+ byte unk7 = frameData.getBits(4);
+ debug(1, " unk7: %d", unk7);
+ bool unk8 = frameData.getBit();
+ debug(1, " unk8: %d", unk8);
+ byte unk9 = frameData.getBits(2);
+ debug(1, " unk9: %d", unk9);
+ while (frameData.getBit()) {
+ byte unk10 = frameData.getBits(8);
+ debug(1, " unk10: %d", unk10);
+ }
+ }
+
+ if (frameWidth == _surface->w && frameHeight == _surface->h) {
+ // Decode Y, U and V component planes
+ for (int i = 0; i < 3; i++) {
+ int linesize, width, height;
+ if (i == 0) {
+ // Y Size is width * height
+ width = frameWidth;
+ if (width % 16) {
+ width /= 16;
+ width++;
+ width *= 16;
+ }
+ assert(width % 16 == 0);
+ height = frameHeight;
+ if (height % 16) {
+ height /= 16;
+ height++;
+ height *= 16;
+ }
+ assert(height % 16 == 0);
+ linesize = width;
+ } else {
+ // U and V size is width/4 * height/4
+ width = frameWidth/4;
+ if (width % 16) {
+ width /= 16;
+ width++;
+ width *= 16;
+ }
+ assert(width % 16 == 0);
+ height = frameHeight/4;
+ if (height % 16) {
+ height /= 16;
+ height++;
+ height *= 16;
+ }
+ assert(height % 16 == 0);
+ linesize = width;
+ }
+
+ if (frameType == 0) { // I Frame
+ // Keyframe (I)
+ byte *current = _current[i];
+ for (uint16 y = 0; y < height; y += 16) {
+ for (uint16 x = 0; x < width; x += 16) {
+ if (int result = svq1DecodeBlockIntra(&frameData, &current[x], linesize) != 0) {
+ warning("Error in svq1DecodeBlock %i (keyframe)", result);
+ return _surface;
+ }
+ }
+ current += 16 * linesize;
+ }
+ } else {
+ // Delta frame (P or B)
+
+ // Prediction Motion Vector
+ Common::Point *pmv = new Common::Point[(width/8) + 3];
+
+ byte *previous;
+ if(frameType == 2) { // B Frame
+ warning("B Frame not supported currently");
+ //previous = _next[i];
+ } else
+ previous = _last[i];
+
+ byte *current = _current[i];
+ for (uint16 y = 0; y < height; y += 16) {
+ for (uint16 x = 0; x < width; x += 16) {
+ if (int result = svq1DecodeDeltaBlock(&frameData, &current[x], previous, linesize, pmv, x, y) != 0) {
+ warning("Error in svq1DecodeDeltaBlock %i", result);
+ return _surface;
+ }
+ }
+
+ pmv[0].x = pmv[0].y = 0;
+
+ current += 16*linesize;
+ }
+ delete[] pmv;
+ }
+ }
+
+ convertYUV410ToRGB(_surface, _current[0], _current[1], _current[2], frameWidth, frameHeight, frameWidth, frameWidth/2);
+ } else
+ warning("FrameWidth/Height Sanity Check Failed!");
+
+ return _surface;
+}
+
+int SVQ1Decoder::svq1DecodeBlockIntra(Common::BitStream *s, uint8 *pixels, int pitch) {
uint8 *list[63];
uint32 *dst;
int entries[6];
@@ -141,7 +411,7 @@ static int svq1DecodeBlockIntra(Common::BitStream *s, uint8 *pixels, int pitch)
height = 1 << ((3 + level) /2);
// get number of stages (-1 skips vector, 0 for mean only)
- stages = getVlc2(s, svq1_intra_multistage[level].table, 3, 3) - 1;
+ stages = _intraMultistage[level]->getSymbol(*s) - 1;
if (stages == -1) {
for (y=0; y < height; y++) {
@@ -155,7 +425,7 @@ static int svq1DecodeBlockIntra(Common::BitStream *s, uint8 *pixels, int pitch)
return -1; // invalid vector
}
- mean = getVlc2(s, svq1_intra_mean.table, 8, 3);
+ mean = _intraMean->getSymbol(*s);
if (stages == 0) {
for (y=0; y < height; y++) {
@@ -211,7 +481,7 @@ static int svq1DecodeBlockIntra(Common::BitStream *s, uint8 *pixels, int pitch)
return 0;
}
-static int svq1DecodeBlockNonIntra(Common::BitStream *s, uint8 *pixels, int pitch) {
+int SVQ1Decoder::svq1DecodeBlockNonIntra(Common::BitStream *s, uint8 *pixels, int pitch) {
uint8 *list[63];
uint32 *dst;
int entries[6];
@@ -247,7 +517,7 @@ static int svq1DecodeBlockNonIntra(Common::BitStream *s, uint8 *pixels, int pitc
height = 1 << ((3 + level) /2);
// get number of stages (-1 skips vector, 0 for mean only)
- stages = getVlc2(s, svq1_inter_multistage[level].table, 3, 2) - 1;
+ stages = _interMultistage[level]->getSymbol(*s) - 1;
if (stages == -1) continue; // skip vector
@@ -256,7 +526,7 @@ static int svq1DecodeBlockNonIntra(Common::BitStream *s, uint8 *pixels, int pitc
return -1; // invalid vector
}
- mean = getVlc2(s, svq1_inter_mean.table, 9, 3) - 256;
+ mean = _interMean->getSymbol(*s) - 256;
// SVQ1_CALC_CODEBOOK_ENTRIES(svq1_inter_codebooks);
const uint32 *codebook = (const uint32 *) svq1_inter_codebooks[level];
@@ -323,10 +593,10 @@ static inline int mid_pred(int a, int b, int c) {
return b;
}
-static int svq1DecodeMotionVector(Common::BitStream *s, Common::Point *mv, Common::Point **pmv) {
+int SVQ1Decoder::svq1DecodeMotionVector(Common::BitStream *s, Common::Point *mv, Common::Point **pmv) {
for (int i=0; i < 2; i++) {
// get motion code
- int diff = getVlc2(s, svq1_motion_component.table, 7, 2);
+ int diff = _motionComponent->getSymbol(*s);
if (diff < 0)
return -1;
else if (diff) {
@@ -343,7 +613,7 @@ static int svq1DecodeMotionVector(Common::BitStream *s, Common::Point *mv, Commo
return 0;
}
-static void svq1SkipBlock(uint8 *current, uint8 *previous, int pitch, int x, int y) {
+void SVQ1Decoder::svq1SkipBlock(uint8 *current, uint8 *previous, int pitch, int x, int y) {
uint8 *src;
uint8 *dst;
@@ -357,7 +627,7 @@ static void svq1SkipBlock(uint8 *current, uint8 *previous, int pitch, int x, int
}
}
-static int svq1MotionInterBlock(Common::BitStream *ss,
+int SVQ1Decoder::svq1MotionInterBlock(Common::BitStream *ss,
uint8 *current, uint8 *previous, int pitch,
Common::Point *motion, int x, int y) {
uint8 *src;
@@ -409,7 +679,7 @@ static int svq1MotionInterBlock(Common::BitStream *ss,
return 0;
}
-static int svq1MotionInter4vBlock(Common::BitStream *ss,
+int SVQ1Decoder::svq1MotionInter4vBlock(Common::BitStream *ss,
uint8 *current, uint8 *previous, int pitch,
Common::Point *motion, int x, int y) {
uint8 *src;
@@ -497,14 +767,14 @@ static int svq1MotionInter4vBlock(Common::BitStream *ss,
return 0;
}
-static int svq1DecodeDeltaBlock(Common::BitStream *ss,
+int SVQ1Decoder::svq1DecodeDeltaBlock(Common::BitStream *ss,
uint8 *current, uint8 *previous, int pitch,
Common::Point *motion, int x, int y) {
uint32 block_type;
int result = 0;
// get block type
- block_type = getVlc2(ss, svq1_block_type.table, 2, 2);
+ block_type = _blockType->getSymbol(*ss);
// reset motion vectors
if (block_type == SVQ1_BLOCK_SKIP || block_type == SVQ1_BLOCK_INTRA) {
@@ -547,527 +817,4 @@ static int svq1DecodeDeltaBlock(Common::BitStream *ss,
return result;
}
-#define GET_DATA(v, table, i, wrap, size)\
-{\
- const uint8 *ptr = (const uint8 *)table + i * wrap;\
- switch(size) {\
- case 1:\
- v = *(const uint8 *)ptr;\
- break;\
- case 2:\
- v = *(const uint16 *)ptr;\
- break;\
- default:\
- v = *(const uint32 *)ptr;\
- break;\
- }\
-}
-
-static int build_table(VLC *vlc, int table_nb_bits,
- int nb_codes,
- const void *bits, int bits_wrap, int bits_size,
- const void *codes, int codes_wrap, int codes_size,
- const void *symbols, int symbols_wrap, int symbols_size,
- int code_prefix, int n_prefix, int flags)
-{
- int i, j, k, n, table_size, table_index, nb, n1, index, code_prefix2, symbol;
- uint32 code;
- int16 (*table)[2];
-
- table_size = 1 << table_nb_bits;
- table_index = allocTable(vlc, table_size, flags & 4);
- if (table_index < 0)
- return -1;
- table = &vlc->table[table_index];
-
- for(i = 0; i < table_size; i++) {
- table[i][1] = 0; //bits
- table[i][0] = -1; //codes
- }
-
- // first pass: map codes and compute auxillary table sizes
- for(i = 0; i < nb_codes; i++) {
- GET_DATA(n, bits, i, bits_wrap, bits_size);
- GET_DATA(code, codes, i, codes_wrap, codes_size);
- // we accept tables with holes
- if (n <= 0)
- continue;
- if (!symbols)
- symbol = i;
- else
- GET_DATA(symbol, symbols, i, symbols_wrap, symbols_size);
- // if code matches the prefix, it is in the table
- n -= n_prefix;
- if(flags & 2)
- code_prefix2= code & (n_prefix>=32 ? 0xffffffff : (1 << n_prefix)-1);
- else
- code_prefix2= code >> n;
- if (n > 0 && code_prefix2 == code_prefix) {
- if (n <= table_nb_bits) {
- // no need to add another table
- j = (code << (table_nb_bits - n)) & (table_size - 1);
- nb = 1 << (table_nb_bits - n);
- for(k = 0; k < nb; k++) {
- if(flags & 2)
- j = (code >> n_prefix) + (k<<n);
- if (table[j][1] /*bits*/ != 0) {
- error("SVQ1 incorrect codes");
- return -1;
- }
- table[j][1] = n; //bits
- table[j][0] = symbol;
- j++;
- }
- } else {
- n -= table_nb_bits;
- j = (code >> ((flags & 2) ? n_prefix : n)) & ((1 << table_nb_bits) - 1);
- // compute table size
- n1 = -table[j][1]; //bits
- if (n > n1)
- n1 = n;
- table[j][1] = -n1; //bits
- }
- }
- }
-
- // second pass : fill auxillary tables recursively
- for(i = 0;i < table_size; i++) {
- n = table[i][1]; //bits
- if (n < 0) {
- n = -n;
- if (n > table_nb_bits) {
- n = table_nb_bits;
- table[i][1] = -n; //bits
- }
- index = build_table(vlc, n, nb_codes,
- bits, bits_wrap, bits_size,
- codes, codes_wrap, codes_size,
- symbols, symbols_wrap, symbols_size,
- (flags & 2) ? (code_prefix | (i << n_prefix)) : ((code_prefix << table_nb_bits) | i),
- n_prefix + table_nb_bits, flags);
- if (index < 0)
- return -1;
- // note: realloc has been done, so reload tables
- table = &vlc->table[table_index];
- table[i][0] = index; //code
- }
- }
- return table_index;
-}
-
-/* Build VLC decoding tables suitable for use with get_vlc().
-
- 'nb_bits' set thee decoding table size (2^nb_bits) entries. The
- bigger it is, the faster is the decoding. But it should not be too
- big to save memory and L1 cache. '9' is a good compromise.
-
- 'nb_codes' : number of vlcs codes
-
- 'bits' : table which gives the size (in bits) of each vlc code.
-
- 'codes' : table which gives the bit pattern of of each vlc code.
-
- 'symbols' : table which gives the values to be returned from get_vlc().
-
- 'xxx_wrap' : give the number of bytes between each entry of the
- 'bits' or 'codes' tables.
-
- 'xxx_size' : gives the number of bytes of each entry of the 'bits'
- or 'codes' tables.
-
- 'wrap' and 'size' allows to use any memory configuration and types
- (byte/word/long) to store the 'bits', 'codes', and 'symbols' tables.
-
- 'use_static' should be set to 1 for tables, which should be freed
- with av_free_static(), 0 if free_vlc() will be used.
-*/
-void initVlcSparse(VLC *vlc, int nb_bits, int nb_codes,
- const void *bits, int bits_wrap, int bits_size,
- const void *codes, int codes_wrap, int codes_size,
- const void *symbols, int symbols_wrap, int symbols_size) {
- vlc->bits = nb_bits;
-
- if(vlc->table_size && vlc->table_size == vlc->table_allocated) {
- return;
- } else if(vlc->table_size) {
- error("called on a partially initialized table");
- }
-
- if (build_table(vlc, nb_bits, nb_codes,
- bits, bits_wrap, bits_size,
- codes, codes_wrap, codes_size,
- symbols, symbols_wrap, symbols_size,
- 0, 0, 4 | 2) < 0) {
- free(&vlc->table);
- return; // Error
- }
-
- if(vlc->table_size != vlc->table_allocated)
- error("SVQ1 needed %d had %d", vlc->table_size, vlc->table_allocated);
-}
-
-SVQ1Decoder::SVQ1Decoder(uint16 width, uint16 height) {
- _surface = new Graphics::Surface();
- _surface->create(width, height, g_system->getScreenFormat());
-
- _current[0] = new byte[width*height];
- _current[1] = new byte[(width/4)*(height/4)];
- _current[2] = new byte[(width/4)*(height/4)];
-
- _last[0] = 0;
- _last[1] = 0;
- _last[2] = 0;
-
- // Setup Variable Length Code Tables
- static int16 tableA[6][2];
- svq1_block_type.table = tableA;
- svq1_block_type.table_allocated = 6;
- svq1_block_type.table_size = 0;
- initVlcSparse(&svq1_block_type, 2, 4,
- &svq1_block_type_vlc[0][1], 2, 1,
- &svq1_block_type_vlc[0][0], 2, 1, NULL, 0, 0);
-
- static int16 tableB[176][2];
- svq1_motion_component.table = tableB;
- svq1_motion_component.table_allocated = 176;
- svq1_motion_component.table_size = 0;
- initVlcSparse(&svq1_motion_component, 7, 33,
- &mvtab[0][1], 2, 1,
- &mvtab[0][0], 2, 1, NULL, 0, 0);
-
- uint16 offset = 0;
- for (uint8 i = 0; i < 6; i++) {
- static const uint8 sizes[2][6] = {{14, 10, 14, 18, 16, 18}, {10, 10, 14, 14, 14, 16}};
- static int16 tableC[168][2];
-
- svq1_intra_multistage[i].table = &tableC[offset];
- svq1_intra_multistage[i].table_allocated = sizes[0][i];
- svq1_intra_multistage[i].table_size = 0;
- offset += sizes[0][i];
- initVlcSparse(&svq1_intra_multistage[i], 3, 8,
- &svq1_intra_multistage_vlc[i][0][1], 2, 1,
- &svq1_intra_multistage_vlc[i][0][0], 2, 1, NULL, 0, 0);
-
- svq1_inter_multistage[i].table = &tableC[offset];
- svq1_inter_multistage[i].table_allocated = sizes[1][i];
- svq1_inter_multistage[i].table_size = 0;
- offset += sizes[1][i];
- initVlcSparse(&svq1_inter_multistage[i], 3, 8,
- &svq1_inter_multistage_vlc[i][0][1], 2, 1,
- &svq1_inter_multistage_vlc[i][0][0], 2, 1, NULL, 0, 0);
- }
-
- static int16 tableD[632][2];
- svq1_intra_mean.table = tableD;
- svq1_intra_mean.table_allocated = 632;
- svq1_intra_mean.table_size = 0;
- initVlcSparse(&svq1_intra_mean, 8, 256,
- &svq1_intra_mean_vlc[0][1], 4, 2,
- &svq1_intra_mean_vlc[0][0], 4, 2, NULL, 0, 0);
-
- static int16 tableE[1434][2];
- svq1_inter_mean.table = tableE;
- svq1_inter_mean.table_allocated = 1434;
- svq1_inter_mean.table_size = 0;
- initVlcSparse(&svq1_inter_mean, 9, 512,
- &svq1_inter_mean_vlc[0][1], 4, 2,
- &svq1_inter_mean_vlc[0][0], 4, 2, NULL, 0, 0);
-}
-
-SVQ1Decoder::~SVQ1Decoder() {
- _surface->free();
- delete _surface;
-
- delete[] _current[0];
- delete[] _current[1];
- delete[] _current[2];
-
- delete[] _last[0];
- delete[] _last[1];
- delete[] _last[2];
-}
-
-const Graphics::Surface *SVQ1Decoder::decodeImage(Common::SeekableReadStream *stream) {
- debug(1, "SVQ1Decoder::decodeImage()");
-
- Common::BitStream32BEMSB frameData(*stream);
-
- uint32 frameCode = frameData.getBits(22);
- debug(1, " frameCode: %d", frameCode);
-
- if ((frameCode & ~0x70) || !(frameCode & 0x60)) { // Invalid
- warning("Invalid Image at frameCode");
- return _surface;
- }
-
- // swap some header bytes (why?)
- //if (frameCode != 0x20) {
- // uint32 *src = stream;
- //
- // for (i = 4; i < 8; i++) {
- // src[i] = ((src[i] << 16) | (src[i] >> 16)) ^ src[7 - i];
- // }
- //}
-
-#if 0
- static const uint16 checksum_table[256] = {
- 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
- 0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
- 0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
- 0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE,
- 0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485,
- 0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D,
- 0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4,
- 0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC,
- 0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823,
- 0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B,
- 0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12,
- 0xDBFD, 0xCBDC, 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A,
- 0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41,
- 0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49,
- 0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70,
- 0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78,
- 0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F,
- 0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067,
- 0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E,
- 0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256,
- 0xB5EA, 0xA5CB, 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D,
- 0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
- 0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C,
- 0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634,
- 0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB,
- 0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3,
- 0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A,
- 0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92,
- 0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9,
- 0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1,
- 0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8,
- 0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0
- };
-#endif
-
- byte temporalReference = frameData.getBits(8);
- debug(1, " temporalReference: %d", temporalReference);
- const char* types[4] = { "I (Key)", "P (Delta from Previous)", "B (Delta from Next)", "Invalid" };
- byte frameType = frameData.getBits(2);
- debug(1, " frameType: %d = %s Frame", frameType, types[frameType]);
- if (frameType == 0) { // I Frame
- // TODO: Validate checksum if present
- if (frameCode == 0x50 || frameCode == 0x60) {
- uint32 checksum = frameData.getBits(16);
- debug(1, " checksum:0x%02x", checksum);
- //uint16 calculate_packet_checksum (const uint8 *data, const int length) {
- // int value;
- //for (int i = 0; i < length; i++)
- // value = checksum_table[data[i] ^ (value >> 8)] ^ ((value & 0xFF) << 8);
- }
- } else if (frameType == 2) { // B Frame
- warning("B Frames not supported by SVQ1 decoder");
- return _surface;
- } else if (frameType == 3) { // Invalid
- warning("Invalid Frame Type");
- return _surface;
- }
-
- static const uint8 stringXORTable[256] = {
- 0x00, 0xD5, 0x7F, 0xAA, 0xFE, 0x2B, 0x81, 0x54,
- 0x29, 0xFC, 0x56, 0x83, 0xD7, 0x02, 0xA8, 0x7D,
- 0x52, 0x87, 0x2D, 0xF8, 0xAC, 0x79, 0xD3, 0x06,
- 0x7B, 0xAE, 0x04, 0xD1, 0x85, 0x50, 0xFA, 0x2F,
- 0xA4, 0x71, 0xDB, 0x0E, 0x5A, 0x8F, 0x25, 0xF0,
- 0x8D, 0x58, 0xF2, 0x27, 0x73, 0xA6, 0x0C, 0xD9,
- 0xF6, 0x23, 0x89, 0x5C, 0x08, 0xDD, 0x77, 0xA2,
- 0xDF, 0x0A, 0xA0, 0x75, 0x21, 0xF4, 0x5E, 0x8B,
- 0x9D, 0x48, 0xE2, 0x37, 0x63, 0xB6, 0x1C, 0xC9,
- 0xB4, 0x61, 0xCB, 0x1E, 0x4A, 0x9F, 0x35, 0xE0,
- 0xCF, 0x1A, 0xB0, 0x65, 0x31, 0xE4, 0x4E, 0x9B,
- 0xE6, 0x33, 0x99, 0x4C, 0x18, 0xCD, 0x67, 0xB2,
- 0x39, 0xEC, 0x46, 0x93, 0xC7, 0x12, 0xB8, 0x6D,
- 0x10, 0xC5, 0x6F, 0xBA, 0xEE, 0x3B, 0x91, 0x44,
- 0x6B, 0xBE, 0x14, 0xC1, 0x95, 0x40, 0xEA, 0x3F,
- 0x42, 0x97, 0x3D, 0xE8, 0xBC, 0x69, 0xC3, 0x16,
- 0xEF, 0x3A, 0x90, 0x45, 0x11, 0xC4, 0x6E, 0xBB,
- 0xC6, 0x13, 0xB9, 0x6C, 0x38, 0xED, 0x47, 0x92,
- 0xBD, 0x68, 0xC2, 0x17, 0x43, 0x96, 0x3C, 0xE9,
- 0x94, 0x41, 0xEB, 0x3E, 0x6A, 0xBF, 0x15, 0xC0,
- 0x4B, 0x9E, 0x34, 0xE1, 0xB5, 0x60, 0xCA, 0x1F,
- 0x62, 0xB7, 0x1D, 0xC8, 0x9C, 0x49, 0xE3, 0x36,
- 0x19, 0xCC, 0x66, 0xB3, 0xE7, 0x32, 0x98, 0x4D,
- 0x30, 0xE5, 0x4F, 0x9A, 0xCE, 0x1B, 0xB1, 0x64,
- 0x72, 0xA7, 0x0D, 0xD8, 0x8C, 0x59, 0xF3, 0x26,
- 0x5B, 0x8E, 0x24, 0xF1, 0xA5, 0x70, 0xDA, 0x0F,
- 0x20, 0xF5, 0x5F, 0x8A, 0xDE, 0x0B, 0xA1, 0x74,
- 0x09, 0xDC, 0x76, 0xA3, 0xF7, 0x22, 0x88, 0x5D,
- 0xD6, 0x03, 0xA9, 0x7C, 0x28, 0xFD, 0x57, 0x82,
- 0xFF, 0x2A, 0x80, 0x55, 0x01, 0xD4, 0x7E, 0xAB,
- 0x84, 0x51, 0xFB, 0x2E, 0x7A, 0xAF, 0x05, 0xD0,
- 0xAD, 0x78, 0xD2, 0x07, 0x53, 0x86, 0x2C, 0xF9
- };
-
- if ((frameCode ^ 0x10) >= 0x50) {
- // Decode embedded string
- Common::String str;
- uint8 stringLen = frameData.getBits(8);
- byte xorVal = stringXORTable[stringLen];
-
- for (uint16 i = 0; i < stringLen-1; i++) {
- byte data = frameData.getBits(8);
- str += data ^ xorVal;
- xorVal = stringXORTable[data];
- }
- debug(1, " Embedded String of %d Characters: \"%s\"", stringLen, str.c_str());
- }
-
- byte unk1 = frameData.getBits(2); // Unknown
- debug(1, " unk1: %d", unk1);
- byte unk2 = frameData.getBits(2); // Unknown
- debug(1, " unk2: %d", unk2);
- bool unk3 = frameData.getBit(); // Unknown
- debug(1, " unk3: %d", unk3);
-
- static const struct { uint w, h; } standardFrameSizes[7] = {
- { 160, 120 }, // 0
- { 128, 96 }, // 1
- { 176, 144 }, // 2
- { 352, 288 }, // 3
- { 704, 576 }, // 4
- { 240, 180 }, // 5
- { 320, 240 } // 6
- };
-
- byte frameSizeCode = frameData.getBits(3);
- debug(1, " frameSizeCode: %d", frameSizeCode);
- uint16 frameWidth, frameHeight;
- if (frameSizeCode == 7) {
- frameWidth = frameData.getBits(12);
- frameHeight = frameData.getBits(12);
- } else {
- frameWidth = standardFrameSizes[frameSizeCode].w;
- frameHeight = standardFrameSizes[frameSizeCode].h;
- }
- debug(1, " frameWidth: %d", frameWidth);
- debug(1, " frameHeight: %d", frameHeight);
- if (frameWidth == 0 || frameHeight == 0) { // Invalid
- warning("Invalid Frame Size");
- return _surface;
- }
- bool checksumPresent = frameData.getBit();
- debug(1, " checksumPresent: %d", checksumPresent);
- if (checksumPresent) {
- bool usePacketChecksum = frameData.getBit();
- debug(1, " usePacketChecksum: %d", usePacketChecksum);
- bool componentChecksumsAfterImageData = frameData.getBit();
- debug(1, " componentChecksumsAfterImageData: %d", componentChecksumsAfterImageData);
- byte unk4 = frameData.getBits(2);
- debug(1, " unk4: %d", unk4);
- if (unk4 != 0)
- warning("Invalid Frame Header in SVQ1 Frame Decode");
- }
-
- bool unk5 = frameData.getBit();
- debug(1, " unk5: %d", unk5);
- if (unk5) {
- bool unk6 = frameData.getBit();
- debug(1, " unk6: %d", unk6);
- byte unk7 = frameData.getBits(4);
- debug(1, " unk7: %d", unk7);
- bool unk8 = frameData.getBit();
- debug(1, " unk8: %d", unk8);
- byte unk9 = frameData.getBits(2);
- debug(1, " unk9: %d", unk9);
- while (frameData.getBit()) {
- byte unk10 = frameData.getBits(8);
- debug(1, " unk10: %d", unk10);
- }
- }
-
- if (frameWidth == _surface->w && frameHeight == _surface->h) {
- // Decode Y, U and V component planes
- for (int i = 0; i < 3; i++) {
- int linesize, width, height;
- if (i == 0) {
- // Y Size is width * height
- width = frameWidth;
- if (width % 16) {
- width /= 16;
- width++;
- width *= 16;
- }
- assert(width % 16 == 0);
- height = frameHeight;
- if (height % 16) {
- height /= 16;
- height++;
- height *= 16;
- }
- assert(height % 16 == 0);
- linesize = width;
- } else {
- // U and V size is width/4 * height/4
- width = frameWidth/4;
- if (width % 16) {
- width /= 16;
- width++;
- width *= 16;
- }
- assert(width % 16 == 0);
- height = frameHeight/4;
- if (height % 16) {
- height /= 16;
- height++;
- height *= 16;
- }
- assert(height % 16 == 0);
- linesize = width;
- }
-
- if (frameType == 0) { // I Frame
- // Keyframe (I)
- byte *current = _current[i];
- for (uint16 y = 0; y < height; y += 16) {
- for (uint16 x = 0; x < width; x += 16) {
- if (int result = svq1DecodeBlockIntra(&frameData, &current[x], linesize) != 0) {
- warning("Error in svq1DecodeBlock %i (keyframe)", result);
- return _surface;
- }
- }
- current += 16 * linesize;
- }
- } else {
- // Delta frame (P or B)
-
- // Prediction Motion Vector
- Common::Point *pmv = new Common::Point[(width/8) + 3];
-
- byte *previous;
- if(frameType == 2) { // B Frame
- warning("B Frame not supported currently");
- //previous = _next[i];
- } else
- previous = _last[i];
-
- byte *current = _current[i];
- for (uint16 y = 0; y < height; y += 16) {
- for (uint16 x = 0; x < width; x += 16) {
- if (int result = svq1DecodeDeltaBlock(&frameData, &current[x], previous, linesize, pmv, x, y) != 0) {
- warning("Error in svq1DecodeDeltaBlock %i", result);
- return _surface;
- }
- }
-
- pmv[0].x = pmv[0].y = 0;
-
- current += 16*linesize;
- }
- delete[] pmv;
- }
- }
-
- convertYUV410ToRGB(_surface, _current[0], _current[1], _current[2], frameWidth, frameHeight, frameWidth, frameWidth/2);
- } else
- warning("FrameWidth/Height Sanity Check Failed!");
-
- return _surface;
-}
-
} // End of namespace Video
diff --git a/video/codecs/svq1.h b/video/codecs/svq1.h
index 786a2bbd80..2271bf4d2b 100644
--- a/video/codecs/svq1.h
+++ b/video/codecs/svq1.h
@@ -25,6 +25,12 @@
#include "video/codecs/codec.h"
+namespace Common {
+class BitStream;
+class Huffman;
+class Point;
+}
+
namespace Video {
class SVQ1Decoder : public Codec {
@@ -40,6 +46,24 @@ private:
byte *_current[3];
byte *_last[3];
+
+ Common::Huffman *_blockType;
+ Common::Huffman *_intraMultistage[6];
+ Common::Huffman *_interMultistage[6];
+ Common::Huffman *_intraMean;
+ Common::Huffman *_interMean;
+ Common::Huffman *_motionComponent;
+
+ int svq1DecodeBlockIntra(Common::BitStream *s, uint8 *pixels, int pitch);
+ int svq1DecodeBlockNonIntra(Common::BitStream *s, uint8 *pixels, int pitch);
+ int svq1DecodeMotionVector(Common::BitStream *s, Common::Point *mv, Common::Point **pmv);
+ void svq1SkipBlock(uint8 *current, uint8 *previous, int pitch, int x, int y);
+ int svq1MotionInterBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch,
+ Common::Point *motion, int x, int y);
+ int svq1MotionInter4vBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch,
+ Common::Point *motion, int x, int y);
+ int svq1DecodeDeltaBlock(Common::BitStream *ss, uint8 *current, uint8 *previous, int pitch,
+ Common::Point *motion, int x, int y);
};
} // End of namespace Video
diff --git a/video/codecs/svq1_vlc.h b/video/codecs/svq1_vlc.h
index 0b9477ffa7..eb70eb582e 100644
--- a/video/codecs/svq1_vlc.h
+++ b/video/codecs/svq1_vlc.h
@@ -23,272 +23,316 @@
#ifndef VIDEO_CODECS_SVQ1_VLC_H
#define VIDEO_CODECS_SVQ1_VLC_H
-// values in this table range from 0..3; adjust retrieved value by +0
-const uint8 svq1_block_type_vlc[4][2] = {
- // { code, length }
- { 0x1, 1 }, { 0x1, 2 }, { 0x1, 3 }, { 0x0, 3 }
-
-};
-
-// values in this table range from -1..6; adjust retrieved value by -1
-const uint8 svq1_intra_multistage_vlc[6][8][2] = {
- // { code, length }
-{
- { 0x1, 5 }, { 0x1, 1 }, { 0x3, 3 }, { 0x2, 3 },
- { 0x3, 4 }, { 0x2, 4 }, { 0x0, 5 }, { 0x1, 4 }
-},{
- { 0x1, 4 }, { 0x3, 2 }, { 0x5, 3 }, { 0x4, 3 },
- { 0x3, 3 }, { 0x2, 3 }, { 0x0, 4 }, { 0x1, 3 }
-},{
- { 0x1, 5 }, { 0x1, 1 }, { 0x3, 3 }, { 0x0, 5 },
- { 0x3, 4 }, { 0x2, 3 }, { 0x2, 4 }, { 0x1, 4 }
-},{
- { 0x1, 6 }, { 0x1, 1 }, { 0x1, 2 }, { 0x0, 6 },
- { 0x3, 4 }, { 0x2, 4 }, { 0x1, 5 }, { 0x1, 4 }
-},{
- { 0x1, 6 }, { 0x1, 1 }, { 0x1, 2 }, { 0x3, 5 },
- { 0x2, 5 }, { 0x0, 6 }, { 0x1, 5 }, { 0x1, 3 }
-},{
- { 0x1, 7 }, { 0x1, 1 }, { 0x1, 2 }, { 0x1, 3 },
- { 0x1, 4 }, { 0x1, 6 }, { 0x0, 7 }, { 0x1, 5 }
-}
-};
-
-// values in this table range from -1..6; adjust retrieved value by -1
-const uint8 svq1_inter_multistage_vlc[6][8][2] = {
- // { code, length }
-{
- { 0x3, 2 }, { 0x5, 3 }, { 0x4, 3 }, { 0x3, 3 },
- { 0x2, 3 }, { 0x1, 3 }, { 0x1, 4 }, { 0x0, 4 }
-},{
- { 0x3, 2 }, { 0x5, 3 }, { 0x4, 3 }, { 0x3, 3 },
- { 0x2, 3 }, { 0x1, 3 }, { 0x1, 4 }, { 0x0, 4 }
-},{
- { 0x1, 1 }, { 0x3, 3 }, { 0x2, 3 }, { 0x3, 4 },
- { 0x2, 4 }, { 0x1, 4 }, { 0x1, 5 }, { 0x0, 5 }
-},{
- { 0x1, 1 }, { 0x3, 3 }, { 0x2, 3 }, { 0x3, 4 },
- { 0x2, 4 }, { 0x1, 4 }, { 0x1, 5 }, { 0x0, 5 }
-},{
- { 0x1, 1 }, { 0x3, 3 }, { 0x2, 3 }, { 0x3, 4 },
- { 0x2, 4 }, { 0x1, 4 }, { 0x1, 5 }, { 0x0, 5 }
-},{
- { 0x1, 1 }, { 0x1, 2 }, { 0x1, 3 }, { 0x3, 5 },
- { 0x2, 5 }, { 0x1, 5 }, { 0x1, 6 }, { 0x0, 6 }
-}
-};
-
-// values in this table range from 0..255; adjust retrieved value by +0
-const uint16 svq1_intra_mean_vlc[256][2] = {
- // { code, length }
- { 0x37, 6 }, { 0x56, 7 }, { 0x1, 17 }, { 0x1, 20 },
- { 0x2, 20 }, { 0x3, 20 }, { 0x0, 20 }, { 0x4, 20 },
- { 0x5, 20 }, { 0x3, 19 }, { 0x15, 11 }, { 0x42, 9 },
- { 0x14, 11 }, { 0x3, 14 }, { 0x2, 14 }, { 0x1, 15 },
- { 0x1, 16 }, { 0x1, 12 }, { 0x2B, 10 }, { 0x18, 11 },
- { 0xC, 11 }, { 0x41, 9 }, { 0x78, 8 }, { 0x6C, 8 },
- { 0x55, 7 }, { 0xF, 4 }, { 0xE, 4 }, { 0x34, 6 },
- { 0x51, 7 }, { 0x72, 8 }, { 0x6E, 8 }, { 0x40, 9 },
- { 0x3F, 9 }, { 0x3E, 9 }, { 0x3D, 9 }, { 0x3C, 9 },
- { 0x3B, 9 }, { 0x3A, 9 }, { 0x39, 9 }, { 0x38, 9 },
- { 0x37, 9 }, { 0x43, 9 }, { 0x46, 9 }, { 0x47, 9 },
- { 0x45, 9 }, { 0x44, 9 }, { 0x49, 9 }, { 0x48, 9 },
- { 0x4A, 8 }, { 0x79, 8 }, { 0x76, 8 }, { 0x77, 8 },
- { 0x71, 8 }, { 0x75, 8 }, { 0x74, 8 }, { 0x73, 8 },
- { 0x6A, 8 }, { 0x55, 8 }, { 0x70, 8 }, { 0x6F, 8 },
- { 0x52, 8 }, { 0x6D, 8 }, { 0x4C, 8 }, { 0x6B, 8 },
- { 0x40, 7 }, { 0x69, 8 }, { 0x68, 8 }, { 0x67, 8 },
- { 0x66, 8 }, { 0x65, 8 }, { 0x64, 8 }, { 0x63, 8 },
- { 0x62, 8 }, { 0x61, 8 }, { 0x60, 8 }, { 0x5F, 8 },
- { 0x5E, 8 }, { 0x5D, 8 }, { 0x5C, 8 }, { 0x5B, 8 },
- { 0x5A, 8 }, { 0x59, 8 }, { 0x58, 8 }, { 0x57, 8 },
- { 0x56, 8 }, { 0x3D, 7 }, { 0x54, 8 }, { 0x53, 8 },
- { 0x3F, 7 }, { 0x51, 8 }, { 0x50, 8 }, { 0x4F, 8 },
- { 0x4E, 8 }, { 0x4D, 8 }, { 0x41, 7 }, { 0x4B, 8 },
- { 0x53, 7 }, { 0x3E, 7 }, { 0x48, 8 }, { 0x4F, 7 },
- { 0x52, 7 }, { 0x45, 8 }, { 0x50, 7 }, { 0x43, 8 },
- { 0x42, 8 }, { 0x41, 8 }, { 0x42, 7 }, { 0x43, 7 },
- { 0x3E, 8 }, { 0x44, 7 }, { 0x3C, 8 }, { 0x45, 7 },
- { 0x46, 7 }, { 0x47, 7 }, { 0x48, 7 }, { 0x49, 7 },
- { 0x4A, 7 }, { 0x4B, 7 }, { 0x4C, 7 }, { 0x4D, 7 },
- { 0x4E, 7 }, { 0x58, 7 }, { 0x59, 7 }, { 0x5A, 7 },
- { 0x5B, 7 }, { 0x5C, 7 }, { 0x5D, 7 }, { 0x44, 8 },
- { 0x49, 8 }, { 0x29, 8 }, { 0x3F, 8 }, { 0x3D, 8 },
- { 0x3B, 8 }, { 0x2C, 8 }, { 0x28, 8 }, { 0x25, 8 },
- { 0x26, 8 }, { 0x5E, 7 }, { 0x57, 7 }, { 0x54, 7 },
- { 0x5F, 7 }, { 0x62, 7 }, { 0x63, 7 }, { 0x64, 7 },
- { 0x61, 7 }, { 0x65, 7 }, { 0x67, 7 }, { 0x66, 7 },
- { 0x35, 6 }, { 0x36, 6 }, { 0x60, 7 }, { 0x39, 8 },
- { 0x3A, 8 }, { 0x38, 8 }, { 0x37, 8 }, { 0x36, 8 },
- { 0x35, 8 }, { 0x34, 8 }, { 0x33, 8 }, { 0x32, 8 },
- { 0x31, 8 }, { 0x30, 8 }, { 0x2D, 8 }, { 0x2B, 8 },
- { 0x2A, 8 }, { 0x27, 8 }, { 0x40, 8 }, { 0x46, 8 },
- { 0x47, 8 }, { 0x26, 9 }, { 0x25, 9 }, { 0x24, 9 },
- { 0x23, 9 }, { 0x22, 9 }, { 0x2E, 8 }, { 0x2F, 8 },
- { 0x1F, 9 }, { 0x36, 9 }, { 0x1D, 9 }, { 0x21, 9 },
- { 0x1B, 9 }, { 0x1C, 9 }, { 0x19, 9 }, { 0x1A, 9 },
- { 0x18, 9 }, { 0x17, 9 }, { 0x16, 9 }, { 0x1E, 9 },
- { 0x20, 9 }, { 0x27, 9 }, { 0x28, 9 }, { 0x29, 9 },
- { 0x2A, 9 }, { 0x2B, 9 }, { 0x2C, 9 }, { 0x2D, 9 },
- { 0x2E, 9 }, { 0x2F, 9 }, { 0x30, 9 }, { 0x35, 9 },
- { 0x31, 9 }, { 0x32, 9 }, { 0x33, 9 }, { 0x34, 9 },
- { 0x19, 10 }, { 0x2A, 10 }, { 0x17, 10 }, { 0x16, 10 },
- { 0x15, 10 }, { 0x28, 10 }, { 0x26, 10 }, { 0x25, 10 },
- { 0x22, 10 }, { 0x21, 10 }, { 0x18, 10 }, { 0x14, 10 },
- { 0x29, 10 }, { 0x12, 10 }, { 0xD, 10 }, { 0xE, 10 },
- { 0xF, 10 }, { 0x10, 10 }, { 0x11, 10 }, { 0x1A, 10 },
- { 0x1B, 10 }, { 0x1C, 10 }, { 0x1D, 10 }, { 0x1E, 10 },
- { 0x1F, 10 }, { 0x20, 10 }, { 0x13, 10 }, { 0x23, 10 },
- { 0x24, 10 }, { 0x9, 11 }, { 0x8, 11 }, { 0x7, 11 },
- { 0x27, 10 }, { 0x5, 11 }, { 0xB, 11 }, { 0x6, 11 },
- { 0x4, 11 }, { 0x3, 11 }, { 0x2, 11 }, { 0x1, 11 },
- { 0xA, 11 }, { 0x16, 11 }, { 0x19, 11 }, { 0x17, 11 },
- { 0xD, 11 }, { 0xE, 11 }, { 0xF, 11 }, { 0x10, 11 },
- { 0x11, 11 }, { 0x12, 11 }, { 0x13, 11 }, { 0x1, 14 }
-};
-
-// values in this table range from -256..255; adjust retrieved value by -256
-const uint16 svq1_inter_mean_vlc[512][2] = {
- // { code, length }
- { 0x5A, 22 }, { 0xD4, 22 }, { 0xD5, 22 }, { 0xD6, 22 },
- { 0xD7, 22 }, { 0xD8, 22 }, { 0xD9, 22 }, { 0xDA, 22 },
- { 0xDB, 22 }, { 0xDC, 22 }, { 0xDD, 22 }, { 0xDE, 22 },
- { 0xDF, 22 }, { 0xE0, 22 }, { 0xE1, 22 }, { 0xE2, 22 },
- { 0xE3, 22 }, { 0xE4, 22 }, { 0xE5, 22 }, { 0xE6, 22 },
- { 0xE8, 22 }, { 0xCB, 22 }, { 0xE9, 22 }, { 0xEA, 22 },
- { 0xE7, 22 }, { 0xEC, 22 }, { 0xED, 22 }, { 0xEE, 22 },
- { 0xEF, 22 }, { 0xF0, 22 }, { 0xF1, 22 }, { 0xF2, 22 },
- { 0xF3, 22 }, { 0xF4, 22 }, { 0xF5, 22 }, { 0xF6, 22 },
- { 0xF7, 22 }, { 0xF8, 22 }, { 0x102, 22 }, { 0xEB, 22 },
- { 0xF9, 22 }, { 0xFC, 22 }, { 0xFD, 22 }, { 0xFE, 22 },
- { 0x100, 22 }, { 0x5C, 22 }, { 0x60, 22 }, { 0x101, 22 },
- { 0x71, 22 }, { 0x104, 22 }, { 0x105, 22 }, { 0xFB, 22 },
- { 0xFF, 22 }, { 0x86, 21 }, { 0xFA, 22 }, { 0x7C, 22 },
- { 0x75, 22 }, { 0x103, 22 }, { 0x78, 22 }, { 0xD3, 22 },
- { 0x7B, 22 }, { 0x82, 22 }, { 0xD2, 22 }, { 0xD1, 22 },
- { 0xD0, 22 }, { 0xCF, 22 }, { 0xCE, 22 }, { 0xCD, 22 },
- { 0xCC, 22 }, { 0xC3, 22 }, { 0xCA, 22 }, { 0xC9, 22 },
- { 0xC8, 22 }, { 0xC7, 22 }, { 0xC6, 22 }, { 0xC5, 22 },
- { 0x8B, 22 }, { 0xC4, 22 }, { 0xC2, 22 }, { 0xC1, 22 },
- { 0xC0, 22 }, { 0xBF, 22 }, { 0xBE, 22 }, { 0xBD, 22 },
- { 0xBC, 22 }, { 0xBB, 22 }, { 0xBA, 22 }, { 0xB9, 22 },
- { 0x61, 22 }, { 0x84, 22 }, { 0x85, 22 }, { 0x86, 22 },
- { 0x87, 22 }, { 0x88, 22 }, { 0x89, 22 }, { 0x8A, 22 },
- { 0x8C, 22 }, { 0x8D, 22 }, { 0x8E, 22 }, { 0x8F, 22 },
- { 0x90, 22 }, { 0x91, 22 }, { 0x92, 22 }, { 0x93, 22 },
- { 0x94, 22 }, { 0x95, 22 }, { 0x96, 22 }, { 0x97, 22 },
- { 0x98, 22 }, { 0x99, 22 }, { 0x9A, 22 }, { 0x9B, 22 },
- { 0x9C, 22 }, { 0x9D, 22 }, { 0x9E, 22 }, { 0x9F, 22 },
- { 0xA0, 22 }, { 0xA1, 22 }, { 0xA2, 22 }, { 0xA3, 22 },
- { 0xA4, 22 }, { 0xA5, 22 }, { 0xA6, 22 }, { 0xA7, 22 },
- { 0xA8, 22 }, { 0xA9, 22 }, { 0xAA, 22 }, { 0xAB, 22 },
- { 0x7F, 22 }, { 0x8F, 21 }, { 0xAC, 22 }, { 0xAD, 22 },
- { 0xAE, 22 }, { 0xAF, 22 }, { 0xB0, 22 }, { 0xB1, 22 },
- { 0x53, 20 }, { 0x90, 21 }, { 0xB2, 22 }, { 0x91, 21 },
- { 0xB3, 22 }, { 0xB4, 22 }, { 0x54, 20 }, { 0xB5, 22 },
- { 0xB6, 22 }, { 0x8C, 21 }, { 0x34, 19 }, { 0x3D, 18 },
- { 0x55, 20 }, { 0xB7, 22 }, { 0xB8, 22 }, { 0x8B, 21 },
- { 0x56, 20 }, { 0x3D, 19 }, { 0x57, 20 }, { 0x58, 20 },
- { 0x40, 19 }, { 0x43, 19 }, { 0x47, 19 }, { 0x2A, 18 },
- { 0x2E, 19 }, { 0x2C, 18 }, { 0x46, 19 }, { 0x59, 20 },
- { 0x49, 19 }, { 0x2D, 19 }, { 0x38, 18 }, { 0x36, 18 },
- { 0x39, 18 }, { 0x45, 19 }, { 0x28, 18 }, { 0x30, 18 },
- { 0x35, 18 }, { 0x20, 17 }, { 0x44, 19 }, { 0x32, 18 },
- { 0x31, 18 }, { 0x1F, 17 }, { 0x2F, 18 }, { 0x2E, 18 },
- { 0x2D, 18 }, { 0x21, 17 }, { 0x22, 17 }, { 0x23, 17 },
- { 0x24, 17 }, { 0x27, 16 }, { 0x23, 16 }, { 0x20, 16 },
- { 0x1D, 16 }, { 0x25, 16 }, { 0x1E, 16 }, { 0x24, 16 },
- { 0x2A, 16 }, { 0x26, 16 }, { 0x21, 15 }, { 0x29, 16 },
- { 0x22, 15 }, { 0x23, 15 }, { 0x24, 15 }, { 0x1B, 15 },
- { 0x1A, 15 }, { 0x1D, 15 }, { 0x1F, 15 }, { 0x27, 15 },
- { 0x17, 14 }, { 0x18, 14 }, { 0x19, 14 }, { 0x1B, 14 },
- { 0x1C, 14 }, { 0x1E, 14 }, { 0x25, 14 }, { 0x20, 14 },
- { 0x21, 14 }, { 0x13, 13 }, { 0x14, 13 }, { 0x15, 13 },
- { 0x16, 13 }, { 0x17, 13 }, { 0x18, 13 }, { 0x19, 13 },
- { 0x1A, 13 }, { 0x18, 12 }, { 0x17, 12 }, { 0x15, 12 },
- { 0x14, 12 }, { 0x13, 12 }, { 0x12, 12 }, { 0xF, 11 },
- { 0x10, 11 }, { 0x12, 11 }, { 0x13, 11 }, { 0x1B, 11 },
- { 0x1A, 11 }, { 0xE, 10 }, { 0x13, 10 }, { 0xF, 10 },
- { 0x10, 10 }, { 0x11, 10 }, { 0x12, 10 }, { 0xD, 9 },
- { 0x14, 9 }, { 0x15, 9 }, { 0xC, 9 }, { 0x13, 9 },
- { 0xF, 8 }, { 0xE, 8 }, { 0x10, 8 }, { 0x11, 8 },
- { 0xC, 7 }, { 0x9, 7 }, { 0xA, 7 }, { 0x8, 6 },
- { 0x9, 6 }, { 0x9, 5 }, { 0x8, 5 }, { 0x5, 4 },
- { 0x1, 1 }, { 0x3, 3 }, { 0x7, 5 }, { 0x6, 5 },
- { 0xB, 6 }, { 0xA, 6 }, { 0xE, 7 }, { 0xF, 7 },
- { 0xB, 7 }, { 0xD, 7 }, { 0xB, 8 }, { 0xD, 8 },
- { 0xC, 8 }, { 0xF, 9 }, { 0x10, 9 }, { 0x11, 9 },
- { 0xE, 9 }, { 0x12, 9 }, { 0x17, 10 }, { 0x14, 10 },
- { 0x16, 10 }, { 0x15, 10 }, { 0x19, 11 }, { 0x18, 11 },
- { 0x17, 11 }, { 0x16, 11 }, { 0x15, 11 }, { 0x14, 11 },
- { 0x11, 11 }, { 0x19, 12 }, { 0x1A, 12 }, { 0x16, 12 },
- { 0x1D, 12 }, { 0x1B, 12 }, { 0x1C, 12 }, { 0x20, 13 },
- { 0x1C, 13 }, { 0x23, 13 }, { 0x22, 13 }, { 0x21, 13 },
- { 0x1F, 13 }, { 0x1E, 13 }, { 0x1B, 13 }, { 0x1D, 13 },
- { 0x24, 14 }, { 0x16, 14 }, { 0x1A, 14 }, { 0x22, 14 },
- { 0x1D, 14 }, { 0x1F, 14 }, { 0x15, 14 }, { 0x23, 14 },
- { 0x18, 15 }, { 0x20, 15 }, { 0x29, 15 }, { 0x28, 15 },
- { 0x26, 15 }, { 0x25, 15 }, { 0x19, 15 }, { 0x1C, 15 },
- { 0x1E, 15 }, { 0x17, 15 }, { 0x2C, 16 }, { 0x2B, 16 },
- { 0x1C, 16 }, { 0x21, 16 }, { 0x2D, 16 }, { 0x28, 16 },
- { 0x1F, 16 }, { 0x1B, 16 }, { 0x1A, 16 }, { 0x22, 16 },
- { 0x2D, 17 }, { 0x32, 17 }, { 0x2C, 17 }, { 0x27, 17 },
- { 0x31, 17 }, { 0x33, 17 }, { 0x2F, 17 }, { 0x2B, 17 },
- { 0x37, 18 }, { 0x2A, 17 }, { 0x2E, 17 }, { 0x30, 17 },
- { 0x29, 17 }, { 0x28, 17 }, { 0x26, 17 }, { 0x25, 17 },
- { 0x2F, 19 }, { 0x33, 18 }, { 0x34, 18 }, { 0x30, 19 },
- { 0x3A, 18 }, { 0x3B, 18 }, { 0x31, 19 }, { 0x3C, 18 },
- { 0x2B, 18 }, { 0x29, 18 }, { 0x48, 19 }, { 0x27, 18 },
- { 0x42, 19 }, { 0x41, 19 }, { 0x26, 18 }, { 0x52, 20 },
- { 0x51, 20 }, { 0x3F, 19 }, { 0x3E, 19 }, { 0x39, 19 },
- { 0x3C, 19 }, { 0x3B, 19 }, { 0x3A, 19 }, { 0x25, 18 },
- { 0x38, 19 }, { 0x50, 20 }, { 0x37, 19 }, { 0x36, 19 },
- { 0x87, 21 }, { 0x4F, 20 }, { 0x35, 19 }, { 0x4E, 20 },
- { 0x33, 19 }, { 0x32, 19 }, { 0x4D, 20 }, { 0x4C, 20 },
- { 0x83, 22 }, { 0x4B, 20 }, { 0x81, 22 }, { 0x80, 22 },
- { 0x8E, 21 }, { 0x7E, 22 }, { 0x7D, 22 }, { 0x84, 21 },
- { 0x8D, 21 }, { 0x7A, 22 }, { 0x79, 22 }, { 0x4A, 20 },
- { 0x77, 22 }, { 0x76, 22 }, { 0x89, 21 }, { 0x74, 22 },
- { 0x73, 22 }, { 0x72, 22 }, { 0x49, 20 }, { 0x70, 22 },
- { 0x6F, 22 }, { 0x6E, 22 }, { 0x6D, 22 }, { 0x6C, 22 },
- { 0x6B, 22 }, { 0x6A, 22 }, { 0x69, 22 }, { 0x68, 22 },
- { 0x67, 22 }, { 0x66, 22 }, { 0x65, 22 }, { 0x64, 22 },
- { 0x63, 22 }, { 0x62, 22 }, { 0x8A, 21 }, { 0x88, 21 },
- { 0x5F, 22 }, { 0x5E, 22 }, { 0x5D, 22 }, { 0x85, 21 },
- { 0x5B, 22 }, { 0x83, 21 }, { 0x59, 22 }, { 0x58, 22 },
- { 0x57, 22 }, { 0x56, 22 }, { 0x55, 22 }, { 0x54, 22 },
- { 0x53, 22 }, { 0x52, 22 }, { 0x51, 22 }, { 0x50, 22 },
- { 0x4F, 22 }, { 0x4E, 22 }, { 0x4D, 22 }, { 0x4C, 22 },
- { 0x4B, 22 }, { 0x4A, 22 }, { 0x49, 22 }, { 0x48, 22 },
- { 0x47, 22 }, { 0x46, 22 }, { 0x45, 22 }, { 0x44, 22 },
- { 0x43, 22 }, { 0x42, 22 }, { 0x41, 22 }, { 0x40, 22 },
- { 0x3F, 22 }, { 0x3E, 22 }, { 0x3D, 22 }, { 0x3C, 22 },
- { 0x3B, 22 }, { 0x3A, 22 }, { 0x39, 22 }, { 0x38, 22 },
- { 0x37, 22 }, { 0x36, 22 }, { 0x35, 22 }, { 0x34, 22 },
- { 0x33, 22 }, { 0x32, 22 }, { 0x31, 22 }, { 0x30, 22 },
- { 0x2F, 22 }, { 0x2E, 22 }, { 0x2D, 22 }, { 0x2C, 22 },
- { 0x2B, 22 }, { 0x2A, 22 }, { 0x29, 22 }, { 0x28, 22 },
- { 0x27, 22 }, { 0x26, 22 }, { 0x25, 22 }, { 0x24, 22 },
- { 0x23, 22 }, { 0x22, 22 }, { 0x21, 22 }, { 0x20, 22 },
- { 0x1F, 22 }, { 0x1E, 22 }, { 0x1D, 22 }, { 0x1C, 22 },
- { 0x1B, 22 }, { 0x1A, 22 }, { 0x19, 22 }, { 0x18, 22 },
- { 0x17, 22 }, { 0x16, 22 }, { 0x15, 22 }, { 0x14, 22 },
- { 0x13, 22 }, { 0x12, 22 }, { 0x11, 22 }, { 0x10, 22 },
- { 0xF, 22 }, { 0xE, 22 }, { 0xD, 22 }, { 0xC, 22 },
- { 0xB, 22 }, { 0xA, 22 }, { 0x9, 22 }, { 0x8, 22 },
- { 0x7, 22 }, { 0x6, 22 }, { 0x5, 22 }, { 0x4, 22 },
- { 0x3, 22 }, { 0x2, 22 }, { 0x1, 22 }, { 0x0, 22 }
-};
-
-// From H263 Data Tables
-const uint8 mvtab[33][2] =
-{
- {1,1}, {1,2}, {1,3}, {1,4}, {3,6}, {5,7}, {4,7}, {3,7},
- {11,9}, {10,9}, {9,9}, {17,10}, {16,10}, {15,10}, {14,10}, {13,10},
- {12,10}, {11,10}, {10,10}, {9,10}, {8,10}, {7,10}, {6,10}, {5,10},
- {4,10}, {7,11}, {6,11}, {5,11}, {4,11}, {3,11}, {2,11}, {3,12},
- {2,12}
+#include "common/scummsys.h"
+
+namespace Video {
+
+static const byte s_svq1BlockTypeLengths[4] = {
+ 1, 2, 3, 3
+};
+
+static const uint32 s_svq1BlockTypeCodes[4] = {
+ 1, 1, 1, 0
+};
+
+static const byte s_svq1IntraMultistageLengths0[8] = {
+ 5, 1, 3, 3, 4, 4, 5, 4
+};
+
+static const uint32 s_svq1IntraMultistageCodes0[8] = {
+ 1, 1, 3, 2, 3, 2, 0, 1
+};
+
+static const byte s_svq1IntraMultistageLengths1[8] = {
+ 4, 2, 3, 3, 3, 3, 4, 3
+};
+
+static const uint32 s_svq1IntraMultistageCodes1[8] = {
+ 1, 3, 5, 4, 3, 2, 0, 1
+};
+
+static const byte s_svq1IntraMultistageLengths2[8] = {
+ 5, 1, 3, 5, 4, 3, 4, 4
+};
+
+static const uint32 s_svq1IntraMultistageCodes2[8] = {
+ 1, 1, 3, 0, 3, 2, 2, 1
+};
+
+static const byte s_svq1IntraMultistageLengths3[8] = {
+ 6, 1, 2, 6, 4, 4, 5, 4
+};
+
+static const uint32 s_svq1IntraMultistageCodes3[8] = {
+ 1, 1, 1, 0, 3, 2, 1, 1
+};
+
+static const byte s_svq1IntraMultistageLengths4[8] = {
+ 6, 1, 2, 5, 5, 6, 5, 3
+};
+
+static const uint32 s_svq1IntraMultistageCodes4[8] = {
+ 1, 1, 1, 3, 2, 0, 1, 1
+};
+
+static const byte s_svq1IntraMultistageLengths5[8] = {
+ 7, 1, 2, 3, 4, 6, 7, 5
+};
+
+static const uint32 s_svq1IntraMultistageCodes5[8] = {
+ 1, 1, 1, 1, 1, 1, 0, 1
+};
+
+static const byte *s_svq1IntraMultistageLengths[6] = {
+ s_svq1IntraMultistageLengths0, s_svq1IntraMultistageLengths1, s_svq1IntraMultistageLengths2,
+ s_svq1IntraMultistageLengths3, s_svq1IntraMultistageLengths4, s_svq1IntraMultistageLengths5
+};
+
+static const uint32 *s_svq1IntraMultistageCodes[6] = {
+ s_svq1IntraMultistageCodes0, s_svq1IntraMultistageCodes1, s_svq1IntraMultistageCodes2,
+ s_svq1IntraMultistageCodes3, s_svq1IntraMultistageCodes4, s_svq1IntraMultistageCodes5
+};
+
+static const byte s_svq1InterMultistageLengths0[8] = {
+ 2, 3, 3, 3, 3, 3, 4, 4
+};
+
+static const uint32 s_svq1InterMultistageCodes0[8] = {
+ 3, 5, 4, 3, 2, 1, 1, 0
+};
+
+static const byte s_svq1InterMultistageLengths1[8] = {
+ 2, 3, 3, 3, 3, 3, 4, 4
+};
+
+static const uint32 s_svq1InterMultistageCodes1[8] = {
+ 3, 5, 4, 3, 2, 1, 1, 0
+};
+
+static const byte s_svq1InterMultistageLengths2[8] = {
+ 1, 3, 3, 4, 4, 4, 5, 5
+};
+
+static const uint32 s_svq1InterMultistageCodes2[8] = {
+ 1, 3, 2, 3, 2, 1, 1, 0
+};
+
+static const byte s_svq1InterMultistageLengths3[8] = {
+ 1, 3, 3, 4, 4, 4, 5, 5
+};
+
+static const uint32 s_svq1InterMultistageCodes3[8] = {
+ 1, 3, 2, 3, 2, 1, 1, 0
+};
+
+static const byte s_svq1InterMultistageLengths4[8] = {
+ 1, 3, 3, 4, 4, 4, 5, 5
+};
+
+static const uint32 s_svq1InterMultistageCodes4[8] = {
+ 1, 3, 2, 3, 2, 1, 1, 0
+};
+
+static const byte s_svq1InterMultistageLengths5[8] = {
+ 1, 2, 3, 5, 5, 5, 6, 6
+};
+
+static const uint32 s_svq1InterMultistageCodes5[8] = {
+ 1, 1, 1, 3, 2, 1, 1, 0
+};
+
+static const byte *s_svq1InterMultistageLengths[6] = {
+ s_svq1InterMultistageLengths0, s_svq1InterMultistageLengths1, s_svq1InterMultistageLengths2,
+ s_svq1InterMultistageLengths3, s_svq1InterMultistageLengths4, s_svq1InterMultistageLengths5
+};
+
+static const uint32 *s_svq1InterMultistageCodes[6] = {
+ s_svq1InterMultistageCodes0, s_svq1InterMultistageCodes1, s_svq1InterMultistageCodes2,
+ s_svq1InterMultistageCodes3, s_svq1InterMultistageCodes4, s_svq1InterMultistageCodes5
+};
+
+static const byte s_svq1IntraMeanLengths[256] = {
+ 6, 7, 17, 20, 20, 20, 20, 20, 20, 19,
+ 11, 9, 11, 14, 14, 15, 16, 12, 10, 11,
+ 11, 9, 8, 8, 7, 4, 4, 6, 7, 8,
+ 8, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 7, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 7, 8, 8, 7, 8,
+ 8, 8, 8, 8, 7, 8, 7, 7, 8, 7,
+ 7, 8, 7, 8, 8, 8, 7, 7, 8, 7,
+ 8, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 7, 7, 6, 6,
+ 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 9,
+ 9, 9, 9, 9, 8, 8, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 11, 11, 11, 10, 11, 11, 11,
+ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+ 11, 11, 11, 11, 11, 14
+};
+
+static const uint32 s_svq1IntraMeanCodes[256] = {
+ 55, 86, 1, 1, 2, 3, 0, 4, 5, 3,
+ 21, 66, 20, 3, 2, 1, 1, 1, 43, 24,
+ 12, 65, 120, 108, 85, 15, 14, 52, 81, 114,
+ 110, 64, 63, 62, 61, 60, 59, 58, 57, 56,
+ 55, 67, 70, 71, 69, 68, 73, 72, 74, 121,
+ 118, 119, 113, 117, 116, 115, 106, 85, 112, 111,
+ 82, 109, 76, 107, 64, 105, 104, 103, 102, 101,
+ 100, 99, 98, 97, 96, 95, 94, 93, 92, 91,
+ 90, 89, 88, 87, 86, 61, 84, 83, 63, 81,
+ 80, 79, 78, 77, 65, 75, 83, 62, 72, 79,
+ 82, 69, 80, 67, 66, 65, 66, 67, 62, 68,
+ 60, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 88, 89, 90, 91, 92, 93, 68, 73, 41,
+ 63, 61, 59, 44, 40, 37, 38, 94, 87, 84,
+ 95, 98, 99, 100, 97, 101, 103, 102, 53, 54,
+ 96, 57, 58, 56, 55, 54, 53, 52, 51, 50,
+ 49, 48, 45, 43, 42, 39, 64, 70, 71, 38,
+ 37, 36, 35, 34, 46, 47, 31, 54, 29, 33,
+ 27, 28, 25, 26, 24, 23, 22, 30, 32, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 53,
+ 49, 50, 51, 52, 25, 42, 23, 22, 21, 40,
+ 38, 37, 34, 33, 24, 20, 41, 18, 13, 14,
+ 15, 16, 17, 26, 27, 28, 29, 30, 31, 32,
+ 19, 35, 36, 9, 8, 7, 39, 5, 11, 6,
+ 4, 3, 2, 1, 10, 22, 25, 23, 13, 14,
+ 15, 16, 17, 18, 19, 1
+};
+
+static const byte s_svq1InterMeanLengths[512] = {
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 21, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 21,
+ 22, 22, 22, 22, 22, 22, 20, 21, 22, 21,
+ 22, 22, 20, 22, 22, 21, 19, 18, 20, 22,
+ 22, 21, 20, 19, 20, 20, 19, 19, 19, 18,
+ 19, 18, 19, 20, 19, 19, 18, 18, 18, 19,
+ 18, 18, 18, 17, 19, 18, 18, 17, 18, 18,
+ 18, 17, 17, 17, 17, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 15, 16, 15, 15, 15, 15,
+ 15, 15, 15, 15, 14, 14, 14, 14, 14, 14,
+ 14, 14, 14, 13, 13, 13, 13, 13, 13, 13,
+ 13, 12, 12, 12, 12, 12, 12, 11, 11, 11,
+ 11, 11, 11, 10, 10, 10, 10, 10, 10, 9,
+ 9, 9, 9, 9, 8, 8, 8, 8, 7, 7,
+ 7, 6, 6, 5, 5, 4, 1, 3, 5, 5,
+ 6, 6, 7, 7, 7, 7, 8, 8, 8, 9,
+ 9, 9, 9, 9, 10, 10, 10, 10, 11, 11,
+ 11, 11, 11, 11, 11, 12, 12, 12, 12, 12,
+ 12, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 14, 14, 14, 14, 14, 14, 14, 14, 15, 15,
+ 15, 15, 15, 15, 15, 15, 15, 15, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16, 17, 17,
+ 17, 17, 17, 17, 17, 17, 18, 17, 17, 17,
+ 17, 17, 17, 17, 19, 18, 18, 19, 18, 18,
+ 19, 18, 18, 18, 19, 18, 19, 19, 18, 20,
+ 20, 19, 19, 19, 19, 19, 19, 18, 19, 20,
+ 19, 19, 21, 20, 19, 20, 19, 19, 20, 20,
+ 22, 20, 22, 22, 21, 22, 22, 21, 21, 22,
+ 22, 20, 22, 22, 21, 22, 22, 22, 20, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 21, 21, 22, 22, 22, 21,
+ 22, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22
+};
+
+static const uint32 s_svq1InterMeanCodes[512] = {
+ 90, 212, 213, 214, 215, 216, 217, 218, 219, 220,
+ 221, 222, 223, 224, 225, 226, 227, 228, 229, 230,
+ 232, 203, 233, 234, 231, 236, 237, 238, 239, 240,
+ 241, 242, 243, 244, 245, 246, 247, 248, 258, 235,
+ 249, 252, 253, 254, 256, 92, 96, 257, 113, 260,
+ 261, 251, 255, 134, 250, 124, 117, 259, 120, 211,
+ 123, 130, 210, 209, 208, 207, 206, 205, 204, 195,
+ 202, 201, 200, 199, 198, 197, 139, 196, 194, 193,
+ 192, 191, 190, 189, 188, 187, 186, 185, 97, 132,
+ 133, 134, 135, 136, 137, 138, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
+ 154, 155, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, 165, 166, 167, 168, 169, 170, 171, 127, 143,
+ 172, 173, 174, 175, 176, 177, 83, 144, 178, 145,
+ 179, 180, 84, 181, 182, 140, 52, 61, 85, 183,
+ 184, 139, 86, 61, 87, 88, 64, 67, 71, 42,
+ 46, 44, 70, 89, 73, 45, 56, 54, 57, 69,
+ 40, 48, 53, 32, 68, 50, 49, 31, 47, 46,
+ 45, 33, 34, 35, 36, 39, 35, 32, 29, 37,
+ 30, 36, 42, 38, 33, 41, 34, 35, 36, 27,
+ 26, 29, 31, 39, 23, 24, 25, 27, 28, 30,
+ 37, 32, 33, 19, 20, 21, 22, 23, 24, 25,
+ 26, 24, 23, 21, 20, 19, 18, 15, 16, 18,
+ 19, 27, 26, 14, 19, 15, 16, 17, 18, 13,
+ 20, 21, 12, 19, 15, 14, 16, 17, 12, 9,
+ 10, 8, 9, 9, 8, 5, 1, 3, 7, 6,
+ 11, 10, 14, 15, 11, 13, 11, 13, 12, 15,
+ 16, 17, 14, 18, 23, 20, 22, 21, 25, 24,
+ 23, 22, 21, 20, 17, 25, 26, 22, 29, 27,
+ 28, 32, 28, 35, 34, 33, 31, 30, 27, 29,
+ 36, 22, 26, 34, 29, 31, 21, 35, 24, 32,
+ 41, 40, 38, 37, 25, 28, 30, 23, 44, 43,
+ 28, 33, 45, 40, 31, 27, 26, 34, 45, 50,
+ 44, 39, 49, 51, 47, 43, 55, 42, 46, 48,
+ 41, 40, 38, 37, 47, 51, 52, 48, 58, 59,
+ 49, 60, 43, 41, 72, 39, 66, 65, 38, 82,
+ 81, 63, 62, 57, 60, 59, 58, 37, 56, 80,
+ 55, 54, 135, 79, 53, 78, 51, 50, 77, 76,
+ 131, 75, 129, 128, 142, 126, 125, 132, 141, 122,
+ 121, 74, 119, 118, 137, 116, 115, 114, 73, 112,
+ 111, 110, 109, 108, 107, 106, 105, 104, 103, 102,
+ 101, 100, 99, 98, 138, 136, 95, 94, 93, 133,
+ 91, 131, 89, 88, 87, 86, 85, 84, 83, 82,
+ 81, 80, 79, 78, 77, 76, 75, 74, 73, 72,
+ 71, 70, 69, 68, 67, 66, 65, 64, 63, 62,
+ 61, 60, 59, 58, 57, 56, 55, 54, 53, 52,
+ 51, 50, 49, 48, 47, 46, 45, 44, 43, 42,
+ 41, 40, 39, 38, 37, 36, 35, 34, 33, 32,
+ 31, 30, 29, 28, 27, 26, 25, 24, 23, 22,
+ 21, 20, 19, 18, 17, 16, 15, 14, 13, 12,
+ 11, 10, 9, 8, 7, 6, 5, 4, 3, 2,
+ 1, 0
+};
+
+static const byte s_svq1MotionComponentLengths[33] = {
+ 1, 2, 3, 4, 6, 7, 7, 7, 9, 9,
+ 9, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+ 10, 10, 10, 10, 10, 11, 11, 11, 11, 11,
+ 11, 12, 12
+};
+
+static const uint32 s_svq1MotionComponentCodes[33] = {
+ 1, 1, 1, 1, 3, 5, 4, 3, 11, 10,
+ 9, 17, 16, 15, 14, 13, 12, 11, 10, 9,
+ 8, 7, 6, 5, 4, 7, 6, 5, 4, 3,
+ 2, 3, 2
};
+} // End of namespace Video
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 15:57:34 +0000