[Scummvm-cvs-logs] SF.net SVN: scummvm:[41164] scummvm/trunk/engines/sci
waltervn at users.sourceforge.net
waltervn at users.sourceforge.net
Thu Jun 4 13:35:17 CEST 2009
Revision: 41164
http://scummvm.svn.sourceforge.net/scummvm/?rev=41164&view=rev
Author: waltervn
Date: 2009-06-04 11:35:17 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
SCI: Support for 16-bit DPCM.
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kscripts.cpp
scummvm/trunk/engines/sci/resource.cpp
Modified: scummvm/trunk/engines/sci/engine/kscripts.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kscripts.cpp 2009-06-04 11:28:05 UTC (rev 41163)
+++ scummvm/trunk/engines/sci/engine/kscripts.cpp 2009-06-04 11:35:17 UTC (rev 41164)
@@ -169,7 +169,7 @@
uint seq = UKPV(5);
warning("ResCheck: checking for currently unsupported %s resource: module %i; tuple (%i, %i, %i, %i)",
getResourceTypeName(restype), module, noun, verb, cond, seq);
- return NULL_REG;
+ return make_reg(0, 1);
}
default:
Resource *res = s->resmgr->testResource(restype, UKPV(1));
Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp 2009-06-04 11:28:05 UTC (rev 41163)
+++ scummvm/trunk/engines/sci/resource.cpp 2009-06-04 11:35:17 UTC (rev 41164)
@@ -1178,7 +1178,7 @@
AudioResource::AudioResource(ResourceManager *resMgr, int sciVersion) {
_resMgr = resMgr;
_sciVersion = sciVersion;
- _audioRate = 0;
+ _audioRate = 11025;
_lang = 0;
_audioMapSCI1 = 0;
_audioMapSCI11 = 0;
@@ -1269,8 +1269,8 @@
// b cond
// b seq
// tb cOffset (cumulative offset)
- // w syncSize (iff seq has bits 7 and 6 set)
- // w syncAscSize (iff seq has bits 7 and 6 set)
+ // w syncSize (iff seq has bit 7 set)
+ // w syncAscSize (iff seq has bit 6 set)
uint32 n;
offset = 0;
@@ -1316,21 +1316,32 @@
int syncSkip = 0;
- if ((n & 0xc0) == 0xc0) {
- n ^= 0xc0;
+ if (n & 0x80) {
+ n ^= 0x80;
if (getSync) {
if (size)
*size = READ_UINT16(ptr);
} else {
- syncSkip = READ_UINT16(ptr) + READ_UINT16(ptr + 2);
- offset += syncSkip;
+ syncSkip = READ_UINT16(ptr);
}
+ ptr += 2;
+
+ if (n & 0x40) {
+ n ^= 0x40;
+
+ if (!getSync)
+ syncSkip += READ_UINT16(ptr);
+
+ ptr += 2;
+ }
+
+ offset += syncSkip;
+
if (n == audioNumber)
return true;
- ptr += 4;
} else {
if (n == audioNumber)
return !getSync;
@@ -1343,10 +1354,64 @@
return false;
}
+// FIXME: Move this to sound/adpcm.cpp?
+// Note that the 16-bit version is also used in coktelvideo.cpp
+static const uint16 tableDPCM16[128] = {
+ 0x0000, 0x0008, 0x0010, 0x0020, 0x0030, 0x0040, 0x0050, 0x0060, 0x0070, 0x0080,
+ 0x0090, 0x00A0, 0x00B0, 0x00C0, 0x00D0, 0x00E0, 0x00F0, 0x0100, 0x0110, 0x0120,
+ 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, 0x0180, 0x0190, 0x01A0, 0x01B0, 0x01C0,
+ 0x01D0, 0x01E0, 0x01F0, 0x0200, 0x0208, 0x0210, 0x0218, 0x0220, 0x0228, 0x0230,
+ 0x0238, 0x0240, 0x0248, 0x0250, 0x0258, 0x0260, 0x0268, 0x0270, 0x0278, 0x0280,
+ 0x0288, 0x0290, 0x0298, 0x02A0, 0x02A8, 0x02B0, 0x02B8, 0x02C0, 0x02C8, 0x02D0,
+ 0x02D8, 0x02E0, 0x02E8, 0x02F0, 0x02F8, 0x0300, 0x0308, 0x0310, 0x0318, 0x0320,
+ 0x0328, 0x0330, 0x0338, 0x0340, 0x0348, 0x0350, 0x0358, 0x0360, 0x0368, 0x0370,
+ 0x0378, 0x0380, 0x0388, 0x0390, 0x0398, 0x03A0, 0x03A8, 0x03B0, 0x03B8, 0x03C0,
+ 0x03C8, 0x03D0, 0x03D8, 0x03E0, 0x03E8, 0x03F0, 0x03F8, 0x0400, 0x0440, 0x0480,
+ 0x04C0, 0x0500, 0x0540, 0x0580, 0x05C0, 0x0600, 0x0640, 0x0680, 0x06C0, 0x0700,
+ 0x0740, 0x0780, 0x07C0, 0x0800, 0x0900, 0x0A00, 0x0B00, 0x0C00, 0x0D00, 0x0E00,
+ 0x0F00, 0x1000, 0x1400, 0x1800, 0x1C00, 0x2000, 0x3000, 0x4000
+};
+
+static const byte tableDPCM8[8] = {0, 1, 2, 3, 6, 10, 15, 21};
+
+static void deDPCM16(byte *soundBuf, Common::SeekableReadStream &audioStream, uint32 n) {
+ int16 *out = (int16 *) soundBuf;
+
+ int32 s = 0;
+ for (uint32 i = 0; i < n; i++) {
+ byte b = audioStream.readByte();
+ if (b & 0x80)
+ s -= tableDPCM16[b & 0x7f];
+ else
+ s += tableDPCM16[b];
+
+ s = CLIP<int32>(s, -32768, 32767);
+ *out++ = TO_BE_16(s);
+ }
+}
+
+static void deDPCM8Nibble(byte *soundBuf, int32 &s, byte b) {
+ if (b & 8)
+ s -= tableDPCM8[7 - (b & 7)];
+ else
+ s += tableDPCM8[b & 7];
+ s = CLIP<int32>(s, 0, 255);
+ *soundBuf = s;
+}
+
+static void deDPCM8(byte *soundBuf, Common::SeekableReadStream &audioStream, uint32 n) {
+ int32 s = 0x80;
+
+ for (uint i = 0; i < n; i++) {
+ byte b = audioStream.readByte();
+
+ deDPCM8Nibble(soundBuf++, s, b >> 4);
+ deDPCM8Nibble(soundBuf++, s, b & 0xf);
+ }
+}
+
// Sierra SOL audio file reader
// Check here for more info: http://wiki.multimedia.cx/index.php?title=Sierra_Audio
-// TODO: improve this for later versions of the format, as this currently only reads
-// raw PCM encoded files (not ADPCM compressed ones)
byte* readSOLAudio(Common::SeekableReadStream *audioStream, uint32 *size, uint16 *audioRate, byte *flags) {
byte audioFlags;
byte type = audioStream->readByte();
@@ -1365,7 +1430,7 @@
*flags = 0;
if (audioFlags & kSolFlag16Bit)
*flags |= Audio::Mixer::FLAG_16BITS;
- if ((audioFlags & kSolFlagCompressed) || !(audioFlags & kSolFlagIsSigned))
+ if (!(audioFlags & kSolFlagIsSigned))
*flags |= Audio::Mixer::FLAG_UNSIGNED;
*size = audioStream->readUint16LE();
@@ -1376,26 +1441,13 @@
byte *buffer;
if (audioFlags & kSolFlagCompressed) {
- if (audioFlags & kSolFlag16Bit) {
- warning("Unsupported DPCM mode");
- return NULL;
- }
-
buffer = new byte[*size * 2];
- byte sample = 0x80;
+ if (audioFlags & kSolFlag16Bit)
+ deDPCM16(buffer, *audioStream, *size);
+ else
+ deDPCM8(buffer, *audioStream, *size);
- for (uint i = 0; i < *size; i++) {
- const int delta[] = {0, 1, 2, 3, 6, 10, 15, 21, -21, -15, -10, -6, -3, -2, -1, -0};
-
- byte b = audioStream->readByte();
-
- sample += delta[b >> 4];
- buffer[i * 2] = sample;
- sample += delta[b & 0xf];
- buffer[i * 2 + 1] = sample;
- }
-
*size *= 2;
} else {
// We assume that the sound data is raw PCM
@@ -1498,7 +1550,10 @@
}
}
- *sampleLen = size * 60 / _audioRate;
+ *sampleLen = (Audio::Mixer::FLAG_16BITS ? size >> 1 : size) * 60 / _audioRate;
+ } else {
+ warning("Failed to find audio entry (%i, %i, %i, %i, %i)", volume, (audioNumber >> 24) & 0xff,
+ (audioNumber >> 16) & 0xff, (audioNumber >> 8) & 0xff, audioNumber & 0xff);
}
return audioStream;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list