diff options
| author | Max Horn | 2011-04-13 12:48:37 +0200 |
|---|---|---|
| committer | Max Horn | 2011-04-13 12:48:58 +0200 |
| commit | 8f70e089ac721176fb543b88f00b4c97ac945b14 (patch) | |
| tree | 1cbe9fbb18b78d05f19ecf8eb9b77b481490c47d /video | |
| parent | 1759209b3b89b0edacaa79383ea54f850f22235b (diff) | |
| download | scummvm-rg350-8f70e089ac721176fb543b88f00b4c97ac945b14.tar.gz scummvm-rg350-8f70e089ac721176fb543b88f00b4c97ac945b14.tar.bz2 scummvm-rg350-8f70e089ac721176fb543b88f00b4c97ac945b14.zip | |
VIDEO: Use shared ADPCM data tables in VMDDecoder
Diffstat (limited to 'video')
| -rw-r--r-- | video/coktel_decoder.cpp | 27 | ||||
| -rw-r--r-- | video/coktel_decoder.h | 2 |
2 files changed, 4 insertions, 25 deletions
diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp index a755d18bb0..0ab12e91cc 100644 --- a/video/coktel_decoder.cpp +++ b/video/coktel_decoder.cpp @@ -34,6 +34,7 @@ #include "audio/audiostream.h" #include "audio/decoders/raw.h" +#include "audio/decoders/adpcm_intern.h" #include "common/memstream.h" static const uint32 kVideoCodecIndeo3 = MKTAG('i','v','3','2'); @@ -1516,26 +1517,6 @@ const uint16 VMDDecoder::_tableDPCM[128] = { 0x0F00, 0x1000, 0x1400, 0x1800, 0x1C00, 0x2000, 0x3000, 0x4000 }; -const int32 VMDDecoder::_tableADPCM[] = { - 7, 8, 9, 10, 11, 12, 13, 14, - 16, 17, 19, 21, 23, 25, 28, 31, - 34, 37, 41, 45, 50, 55, 60, 66, - 73, 80, 88, 97, 107, 118, 130, 143, - 157, 173, 190, 209, 230, 253, 279, 307, - 337, 371, 408, 449, 494, 544, 598, 658, - 724, 796, 876, 963, 1060, 1166, 1282, 1411, - 1552, 1707, 1878, 2066, 2272, 2499, 2749, 3024, - 3327, 3660, 4026, 4428, 4871, 5358, 5894, 6484, - 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, - 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, - 32767, 0 -}; - -const int32 VMDDecoder::_tableADPCMStep[] = { - -1, -1, -1, -1, 2, 4, 6, 8, - -1, -1, -1, -1, 2, 4, 6, 8 -}; - VMDDecoder::VMDDecoder(Audio::Mixer *mixer, Audio::Mixer::SoundType soundType) : CoktelDecoder(mixer, soundType), _stream(0), _version(0), _flags(0), _frameInfoOffset(0), _partsPerFrame(0), _frames(0), _soundFlags(0), _soundFreq(0), _soundSliceSize(0), _soundSlicesCount(0), @@ -2617,7 +2598,7 @@ byte *VMDDecoder::deADPCM(const byte *data, uint32 &size, int32 init, int32 inde index = CLIP<int32>(index, 0, 88); - int32 predictor = _tableADPCM[index]; + int32 predictor = Audio::Ima_ADPCMStream::_imaTable[index]; uint32 dataByte = 0; bool newByte = true; @@ -2634,7 +2615,7 @@ byte *VMDDecoder::deADPCM(const byte *data, uint32 &size, int32 init, int32 inde newByte = !newByte; - index += _tableADPCMStep[code]; + index += Audio::ADPCMStream::_stepAdjustTable[code]; index = CLIP<int32>(index, 0, 88); int32 value = predictor / 8; @@ -2653,7 +2634,7 @@ byte *VMDDecoder::deADPCM(const byte *data, uint32 &size, int32 init, int32 inde init = CLIP<int32>(init, -32768, 32767); - predictor = _tableADPCM[index]; + predictor = Audio::Ima_ADPCMStream::_imaTable[index]; *out++ = TO_BE_16(init); } diff --git a/video/coktel_decoder.h b/video/coktel_decoder.h index 9c8263be9d..e83e1d29ed 100644 --- a/video/coktel_decoder.h +++ b/video/coktel_decoder.h @@ -431,8 +431,6 @@ private: // Tables for the audio decompressors static const uint16 _tableDPCM[128]; - static const int32 _tableADPCM[]; - static const int32 _tableADPCMStep[]; Common::SeekableReadStream *_stream; |