[Scummvm-cvs-logs] SF.net SVN: scummvm:[41486] scummvm/trunk/engines/sci
waltervn at users.sourceforge.net
waltervn at users.sourceforge.net
Sat Jun 13 01:46:23 CEST 2009
Revision: 41486
http://scummvm.svn.sourceforge.net/scummvm/?rev=41486&view=rev
Author: waltervn
Date: 2009-06-12 23:46:23 +0000 (Fri, 12 Jun 2009)
Log Message:
-----------
SCI: Moved audio code from AudioResource to the sfx core.
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/ksound.cpp
scummvm/trunk/engines/sci/resource.cpp
scummvm/trunk/engines/sci/resource.h
scummvm/trunk/engines/sci/sfx/core.cpp
scummvm/trunk/engines/sci/sfx/core.h
Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp 2009-06-12 23:29:27 UTC (rev 41485)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp 2009-06-12 23:46:23 UTC (rev 41486)
@@ -975,49 +975,42 @@
// Used for speech playback in CD games
reg_t kDoAudio(EngineState *s, int funct_nr, int argc, reg_t *argv) {
Audio::Mixer *mixer = g_system->getMixer();
- int sampleLen = 0;
- if (!s->_sound._audioResource)
- s->_sound._audioResource = new AudioResource(s->resmgr, s->_version);
-
switch (argv[0].toUint16()) {
case kSciAudioWPlay:
- case kSciAudioPlay:
- s->_sound._audioResource->stop();
+ case kSciAudioPlay: {
+ uint16 module;
+ uint32 number;
- if (argc == 2) { // KQ5CD, KQ6 floppy
- Audio::AudioStream *audioStream = s->_sound._audioResource->getAudioStream(argv[1].toUint16(), 65535, &sampleLen);
+ s->_sound.stopAudio();
- if (audioStream)
- mixer->playInputStream(Audio::Mixer::kSpeechSoundType, s->_sound._audioResource->getAudioHandle(), audioStream);
- } else if (argc == 6) { // SQ4CD or newer
- // Make a BE number
- uint32 audioNumber = (((argv[2].toUint16() & 0xFF) << 24) & 0xFF000000) |
- (((argv[3].toUint16() & 0xFF) << 16) & 0x00FF0000) |
- (((argv[4].toUint16() & 0xFF) << 8) & 0x0000FF00) |
- ( (argv[5].toUint16() & 0xFF) & 0x000000FF);
-
- Audio::AudioStream *audioStream = s->_sound._audioResource->getAudioStream(audioNumber, argv[1].toUint16(), &sampleLen);
-
- if (audioStream)
- mixer->playInputStream(Audio::Mixer::kSpeechSoundType, s->_sound._audioResource->getAudioHandle(), audioStream);
- } else { // Hopefully, this should never happen
+ if (argc == 2) {
+ module = 65535;
+ number = argv[1].toUint16();
+ } else if (argc == 6) {
+ module = argv[1].toUint16();
+ number = ((argv[2].toUint16() & 0xff) << 24) | ((argv[3].toUint16() & 0xff) << 16) |
+ ((argv[4].toUint16() & 0xff) << 8) | (argv[5].toUint16() & 0xff);
+ } else {
warning("kDoAudio: Play called with an unknown number of parameters (%d)", argc);
+ return NULL_REG;
}
- return make_reg(0, sampleLen); // return sample length in ticks
+
+ return make_reg(0, s->_sound.startAudio(module, number)); // return sample length in ticks
+ }
case kSciAudioStop:
- s->_sound._audioResource->stop();
+ s->_sound.stopAudio();
break;
case kSciAudioPause:
- s->_sound._audioResource->pause();
+ s->_sound.pauseAudio();
break;
case kSciAudioResume:
- s->_sound._audioResource->resume();
+ s->_sound.resumeAudio();
break;
case kSciAudioPosition:
- return make_reg(0, s->_sound._audioResource->getAudioPosition());
+ return make_reg(0, s->_sound.getAudioPosition());
case kSciAudioRate:
- s->_sound._audioResource->setAudioRate(argv[1].toUint16());
+ s->_sound.setAudioRate(argv[1].toUint16());
break;
case kSciAudioVolume:
mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, argv[1].toUint16());
@@ -1042,8 +1035,10 @@
case kSciAudioSyncStart: {
ResourceId id;
- if (s->_sound._soundSync)
- s->resmgr->unlockResource(s->_sound._soundSync);
+ if (s->_sound._syncResource) {
+ s->resmgr->unlockResource(s->_sound._syncResource);
+ s->_sound._syncResource = NULL;
+ }
// Load sound sync resource and lock it
if (argc == 3) {
@@ -1056,10 +1051,11 @@
return s->r_acc;
}
- s->_sound._soundSync = (ResourceSync *)s->resmgr->findResource(id, 1);
+ s->_sound._syncResource = s->resmgr->findResource(id, 1);
- if (s->_sound._soundSync) {
- s->_sound._soundSync->startSync(s, argv[1]);
+ if (s->_sound._syncResource) {
+ PUT_SEL32V(argv[1], syncCue, 0);
+ s->_sound._syncOffset = 0;
} else {
warning("DoSync: failed to find resource %s", id.toString().c_str());
// Notify the scripts to stop sound sync
@@ -1067,20 +1063,32 @@
}
break;
}
- case kSciAudioSyncNext:
- if (s->_sound._soundSync) {
- s->_sound._soundSync->nextSync(s, argv[1]);
+ case kSciAudioSyncNext: {
+ Resource *res = s->_sound._syncResource;
+ if (res && (s->_sound._syncOffset < res->size - 1)) {
+ int16 syncCue = -1;
+ int16 syncTime = (int16)READ_LE_UINT16(res->data + s->_sound._syncOffset);
+
+ s->_sound._syncOffset += 2;
+
+ if ((syncTime != -1) && (s->_sound._syncOffset < res->size - 1)) {
+ syncCue = (int16)READ_LE_UINT16(res->data + s->_sound._syncOffset);
+ s->_sound._syncOffset += 2;
+ }
+
+ PUT_SEL32V(argv[1], syncTime, syncTime);
+ PUT_SEL32V(argv[1], syncCue, syncCue);
}
break;
+ }
case kSciAudioSyncStop:
- if (s->_sound._soundSync) {
- s->_sound._soundSync->stopSync();
- s->resmgr->unlockResource(s->_sound._soundSync);
- s->_sound._soundSync = NULL;
+ if (s->_sound._syncResource) {
+ s->resmgr->unlockResource(s->_sound._syncResource);
+ s->_sound._syncResource = NULL;
}
break;
default:
- warning("kDoSync: Unhandled case %d", argv[0].toUint16());
+ warning("DoSync: Unhandled subfunction %d", argv[0].toUint16());
}
return s->r_acc;
Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp 2009-06-12 23:29:27 UTC (rev 41485)
+++ scummvm/trunk/engines/sci/resource.cpp 2009-06-12 23:46:23 UTC (rev 41486)
@@ -56,13 +56,6 @@
const int sci_max_resource_nr[] = {65536, 1000, 2048, 2048, 2048, 65536, 65536, 65536};
-enum SolFlags {
- kSolFlagCompressed = 1 << 0,
- kSolFlagUnknown = 1 << 1,
- kSolFlag16Bit = 1 << 2,
- kSolFlagIsSigned = 1 << 3
-};
-
static const char *sci_error_types[] = {
"No error",
"I/O error",
@@ -888,15 +881,7 @@
}
// Prepare destination, if neccessary
if (_resMap.contains(resId) == false) {
- // FIXME: code duplication
- switch (restype) {
- case kResourceTypeSync:
- newrsc = new ResourceSync;
- break;
- default:
- newrsc = new Resource;
- break;
- }
+ newrsc = new Resource;
_resMap.setVal(resId, newrsc);
} else
newrsc = _resMap.getVal(resId);
@@ -1059,15 +1044,7 @@
resId = ResourceId((ResourceType)type, number);
// adding new resource only if it does not exist
if (_resMap.contains(resId) == false) {
- switch (type) {
- case kResourceTypeSync:
- res = new ResourceSync;
- break;
- default:
- res = new Resource;
- break;
- }
-
+ res = new Resource;
_resMap.setVal(resId, res);
res->id = resId;
res->source = getVolume(map, volume_nr);
@@ -1081,11 +1058,7 @@
void ResourceManager::addResource(ResourceId resId, ResourceSource *src, uint32 offset, uint32 size) {
// Adding new resource only if it does not exist
if (_resMap.contains(resId) == false) {
- Resource *res;
- if ((resId.type == kResourceTypeSync) || (resId.type == kResourceTypeSync36))
- res = new ResourceSync;
- else
- res = new Resource;
+ Resource *res = new Resource;
_resMap.setVal(resId, res);
res->id = resId;
res->source = src;
@@ -1458,203 +1431,4 @@
return error;
}
-void ResourceSync::startSync(EngineState *s, reg_t obj) {
- _syncTime = _syncCue = -1;
- PUT_SEL32V(obj, syncCue, 0);
- _ptr = (uint16 *)data;
- //syncStarted = true; // not used
-}
-
-void ResourceSync::nextSync(EngineState *s, reg_t obj) {
- if (_ptr) {
- _syncTime = (int16)READ_LE_UINT16(_ptr);
- if (_syncTime == -1) {
- stopSync();
- } else {
- _syncCue = (int16)READ_LE_UINT16(_ptr + 1);
- _ptr += 2;
- }
- PUT_SEL32V(obj, syncTime, _syncTime);
- PUT_SEL32V(obj, syncCue, _syncCue);
- }
-}
-//--------------------------------
-void ResourceSync::stopSync() {
- _ptr = 0;
- _syncCue = -1;
- //syncStarted = false; // not used
-}
-
-
-AudioResource::AudioResource(ResourceManager *resMgr, int sciVersion) {
- _resMgr = resMgr;
- _sciVersion = sciVersion;
- _audioRate = 11025;
-}
-
-int AudioResource::getAudioPosition() {
- if (g_system->getMixer()->isSoundHandleActive(_audioHandle)) {
- return g_system->getMixer()->getSoundElapsedTime(_audioHandle) * 6 / 100; // return elapsed time in ticks
- } else {
- return -1; // Sound finished
- }
-}
-
-// 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
-static bool readSOLHeader(Common::SeekableReadStream *audioStream, int headerSize, uint32 &size, uint16 &audioRate, byte &audioFlags) {
- if (headerSize != 11 && headerSize != 12) {
- warning("SOL audio header of size %i not supported", headerSize);
- return false;
- }
-
- audioStream->readUint32LE(); // skip "SOL" + 0 (4 bytes)
- audioRate = audioStream->readUint16LE();
- audioFlags = audioStream->readByte();
-
- size = audioStream->readUint32LE();
- return true;
-}
-
-static byte* readSOLAudio(Common::SeekableReadStream *audioStream, uint32 &size, byte audioFlags, byte &flags) {
- byte *buffer;
-
- // Convert the SOL stream flags to our own format
- flags = 0;
- if (audioFlags & kSolFlag16Bit)
- flags |= Audio::Mixer::FLAG_16BITS;
- if (!(audioFlags & kSolFlagIsSigned))
- flags |= Audio::Mixer::FLAG_UNSIGNED;
-
- if (audioFlags & kSolFlagCompressed) {
- buffer = (byte *)malloc(size * 2);
-
- if (audioFlags & kSolFlag16Bit)
- deDPCM16(buffer, *audioStream, size);
- else
- deDPCM8(buffer, *audioStream, size);
-
- size *= 2;
- } else {
- // We assume that the sound data is raw PCM
- buffer = (byte *)malloc(size);
- audioStream->read(buffer, size);
- }
-
- return buffer;
-}
-
-Audio::AudioStream* AudioResource::getAudioStream(uint32 audioNumber, uint32 volume, int *sampleLen) {
- Audio::AudioStream *audioStream = 0;
- uint32 size;
- byte *data = 0;
- byte flags = 0;
- Sci::Resource* audioRes;
-
- if (volume == 65535) {
- audioRes = _resMgr->findResource(ResourceId(kResourceTypeAudio, audioNumber), false);
- if (!audioRes) {
- warning("Failed to find audio entry %i", audioNumber);
- return NULL;
- }
- } else {
- audioRes = _resMgr->findResource(ResourceId(kResourceTypeAudio36, volume, audioNumber), false);
- if (!audioRes) {
- warning("Failed to find audio entry (%i, %i, %i, %i, %i)", volume, (audioNumber >> 24) & 0xff,
- (audioNumber >> 16) & 0xff, (audioNumber >> 8) & 0xff, audioNumber & 0xff);
- return NULL;
- }
- }
-
- byte audioFlags;
-
- if (audioRes->headerSize > 0) {
- // SCI1.1
- Common::MemoryReadStream *headerStream =
- new Common::MemoryReadStream(audioRes->header, audioRes->headerSize, false);
-
- if (readSOLHeader(headerStream, audioRes->headerSize, size, _audioRate, audioFlags)) {
- Common::MemoryReadStream *dataStream =
- new Common::MemoryReadStream(audioRes->data, audioRes->size, false);
- data = readSOLAudio(dataStream, size, audioFlags, flags);
- delete dataStream;
- }
- delete headerStream;
- } else {
- // SCI1
- size = audioRes->size;
- data = (byte *)malloc(size);
- assert(data);
- memcpy(data, audioRes->data, size);
- flags = Audio::Mixer::FLAG_UNSIGNED;
- }
-
- if (data) {
- audioStream = Audio::makeLinearInputStream(data, size, _audioRate,
- flags | Audio::Mixer::FLAG_AUTOFREE, 0, 0);
- if (audioStream) {
- *sampleLen = (flags & Audio::Mixer::FLAG_16BITS ? size >> 1 : size) * 60 / _audioRate;
- return audioStream;
- }
- }
-
- return NULL;
-}
-
} // End of namespace Sci
Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h 2009-06-12 23:29:27 UTC (rev 41485)
+++ scummvm/trunk/engines/sci/resource.h 2009-06-12 23:46:23 UTC (rev 41486)
@@ -378,50 +378,6 @@
int guessSciVersion();
};
-/**
- * Used for lip and animation syncing in CD talkie games
- */
-class ResourceSync : public Resource {
-public:
- ResourceSync() {}
- ~ResourceSync() {}
-
- void startSync(EngineState *s, reg_t obj);
- void nextSync(EngineState *s, reg_t obj);
- void stopSync();
-
-protected:
- uint16 *_ptr;
- int16 _syncTime, _syncCue;
- //bool _syncStarted; // not used
-};
-
-/**
- * Used for speech playback and digital music playback
- * in CD talkie games
- */
-class AudioResource {
-public:
- AudioResource(ResourceManager *resMgr, int sciVersion);
-
- void setAudioRate(uint16 audioRate) { _audioRate = audioRate; }
-
- Audio::SoundHandle* getAudioHandle() { return &_audioHandle; }
- int getAudioPosition();
-
- Audio::AudioStream* getAudioStream(uint32 audioNumber, uint32 volume, int *sampleLen);
-
- void stop() { g_system->getMixer()->stopHandle(_audioHandle); }
- void pause() { g_system->getMixer()->pauseHandle(_audioHandle, true); }
- void resume() { g_system->getMixer()->pauseHandle(_audioHandle, false); }
-
-private:
- Audio::SoundHandle _audioHandle;
- uint16 _audioRate;
- ResourceManager *_resMgr;
- int _sciVersion;
-};
-
} // End of namespace Sci
#endif // SCI_SCICORE_RESOURCE_H
Modified: scummvm/trunk/engines/sci/sfx/core.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/core.cpp 2009-06-12 23:29:27 UTC (rev 41485)
+++ scummvm/trunk/engines/sci/sfx/core.cpp 2009-06-12 23:46:23 UTC (rev 41486)
@@ -348,11 +348,13 @@
_flags = 0;
_song = NULL;
_suspended = 0;
- _soundSync = 0;
- _audioResource = 0;
+ _syncResource = NULL;
+ _audioRate = 11025;
}
SfxState::~SfxState() {
+ if (_syncResource)
+ _resMgr->unlockResource(_syncResource);
}
@@ -526,7 +528,7 @@
debugMessage += " none\n";
}
- debugC(2, kDebugLevelSound, debugMessage.c_str());
+ debugC(2, kDebugLevelSound, "%s", debugMessage.c_str());
_song = newsong;
thawTime(); /* Recover song delay time */
@@ -641,8 +643,8 @@
_songlib._lib = 0;
_song = NULL;
_flags = flags;
- _soundSync = NULL;
- _audioResource = NULL;
+ _syncResource = NULL;
+ _syncOffset = 0;
player = NULL;
@@ -676,6 +678,8 @@
delete player;
player = NULL;
}
+
+ _resMgr = resmgr;
}
void SfxState::sfx_exit() {
@@ -689,12 +693,6 @@
g_system->getMixer()->stopAll();
_songlib.freeSounds();
-
- // Delete audio resources for CD talkie games
- if (_audioResource) {
- delete _audioResource;
- _audioResource = 0;
- }
}
void SfxState::sfx_suspend(bool suspend) {
@@ -1004,4 +1002,187 @@
update();
}
+int SfxState::startAudio(uint16 module, uint32 number) {
+ int sampleLen;
+ Audio::AudioStream *audioStream = getAudioStream(number, module, &sampleLen);
+
+ if (audioStream) {
+ g_system->getMixer()->playInputStream(Audio::Mixer::kSpeechSoundType, &_audioHandle, audioStream);
+ return sampleLen;
+ }
+
+ return 0;
+}
+
+int SfxState::getAudioPosition() {
+ if (g_system->getMixer()->isSoundHandleActive(_audioHandle))
+ return g_system->getMixer()->getSoundElapsedTime(_audioHandle) * 6 / 100; // return elapsed time in ticks
+ else
+ return -1; // Sound finished
+}
+
+enum SolFlags {
+ kSolFlagCompressed = 1 << 0,
+ kSolFlagUnknown = 1 << 1,
+ kSolFlag16Bit = 1 << 2,
+ kSolFlagIsSigned = 1 << 3
+};
+
+// 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
+static bool readSOLHeader(Common::SeekableReadStream *audioStream, int headerSize, uint32 &size, uint16 &audioRate, byte &audioFlags) {
+ if (headerSize != 11 && headerSize != 12) {
+ warning("SOL audio header of size %i not supported", headerSize);
+ return false;
+ }
+
+ audioStream->readUint32LE(); // skip "SOL" + 0 (4 bytes)
+ audioRate = audioStream->readUint16LE();
+ audioFlags = audioStream->readByte();
+
+ size = audioStream->readUint32LE();
+ return true;
+}
+
+static byte* readSOLAudio(Common::SeekableReadStream *audioStream, uint32 &size, byte audioFlags, byte &flags) {
+ byte *buffer;
+
+ // Convert the SOL stream flags to our own format
+ flags = 0;
+ if (audioFlags & kSolFlag16Bit)
+ flags |= Audio::Mixer::FLAG_16BITS;
+ if (!(audioFlags & kSolFlagIsSigned))
+ flags |= Audio::Mixer::FLAG_UNSIGNED;
+
+ if (audioFlags & kSolFlagCompressed) {
+ buffer = (byte *)malloc(size * 2);
+
+ if (audioFlags & kSolFlag16Bit)
+ deDPCM16(buffer, *audioStream, size);
+ else
+ deDPCM8(buffer, *audioStream, size);
+
+ size *= 2;
+ } else {
+ // We assume that the sound data is raw PCM
+ buffer = (byte *)malloc(size);
+ audioStream->read(buffer, size);
+ }
+
+ return buffer;
+}
+
+Audio::AudioStream* SfxState::getAudioStream(uint32 number, uint32 volume, int *sampleLen) {
+ Audio::AudioStream *audioStream = 0;
+ uint32 size;
+ byte *data = 0;
+ byte flags = 0;
+ Sci::Resource* audioRes;
+
+ if (volume == 65535) {
+ audioRes = _resMgr->findResource(ResourceId(kResourceTypeAudio, number), false);
+ if (!audioRes) {
+ warning("Failed to find audio entry %i", number);
+ return NULL;
+ }
+ } else {
+ audioRes = _resMgr->findResource(ResourceId(kResourceTypeAudio36, volume, number), false);
+ if (!audioRes) {
+ warning("Failed to find audio entry (%i, %i, %i, %i, %i)", volume, (number >> 24) & 0xff,
+ (number >> 16) & 0xff, (number >> 8) & 0xff, number & 0xff);
+ return NULL;
+ }
+ }
+
+ byte audioFlags;
+
+ if (audioRes->headerSize > 0) {
+ // SCI1.1
+ Common::MemoryReadStream *headerStream =
+ new Common::MemoryReadStream(audioRes->header, audioRes->headerSize, false);
+
+ if (readSOLHeader(headerStream, audioRes->headerSize, size, _audioRate, audioFlags)) {
+ Common::MemoryReadStream *dataStream =
+ new Common::MemoryReadStream(audioRes->data, audioRes->size, false);
+ data = readSOLAudio(dataStream, size, audioFlags, flags);
+ delete dataStream;
+ }
+ delete headerStream;
+ } else {
+ // SCI1
+ size = audioRes->size;
+ data = (byte *)malloc(size);
+ assert(data);
+ memcpy(data, audioRes->data, size);
+ flags = Audio::Mixer::FLAG_UNSIGNED;
+ }
+
+ if (data) {
+ audioStream = Audio::makeLinearInputStream(data, size, _audioRate,
+ flags | Audio::Mixer::FLAG_AUTOFREE, 0, 0);
+ if (audioStream) {
+ *sampleLen = (flags & Audio::Mixer::FLAG_16BITS ? size >> 1 : size) * 60 / _audioRate;
+ return audioStream;
+ }
+ }
+
+ return NULL;
+}
+
} // End of namespace Sci
Modified: scummvm/trunk/engines/sci/sfx/core.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/core.h 2009-06-12 23:29:27 UTC (rev 41485)
+++ scummvm/trunk/engines/sci/sfx/core.h 2009-06-12 23:46:23 UTC (rev 41486)
@@ -50,8 +50,9 @@
SongLibrary _songlib; /**< Song library */
Song *_song; /**< Active song, or start of active song chain */
bool _suspended; /**< Whether we are suspended */
- ResourceSync *_soundSync; /**< Used by kDoSync for speech syncing in CD talkie games */
- AudioResource *_audioResource; /**< Used for audio resources in CD talkie games */
+ Resource *_syncResource; /**< Used by kDoSync for speech syncing in CD talkie games */
+ uint _syncOffset;
+ ResourceManager *_resMgr;
public:
SfxState();
@@ -164,6 +165,15 @@
Common::Error sfx_send_midi(SongHandle handle, int channel,
int command, int arg1, int arg2);
+ // Functions for digital sound
+ void setAudioRate(uint16 rate) { _audioRate = rate; }
+ Audio::SoundHandle* getAudioHandle() { return &_audioHandle; }
+ int getAudioPosition();
+ int startAudio(uint16 module, uint32 tuple);
+ void stopAudio() { g_system->getMixer()->stopHandle(_audioHandle); }
+ void pauseAudio() { g_system->getMixer()->pauseHandle(_audioHandle, true); }
+ void resumeAudio() { g_system->getMixer()->pauseHandle(_audioHandle, false); }
+
protected:
void freezeTime();
void thawTime();
@@ -173,9 +183,13 @@
void updateSingleSong();
void updateMultiSong();
void update();
+
+private:
+ uint16 _audioRate;
+ Audio::SoundHandle _audioHandle;
+ Audio::AudioStream* getAudioStream(uint32 number, uint32 volume, int *sampleLen);
};
-
} // End of namespace Sci
#endif // SCI_SFX_CORE_H
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