SCI: Moved audio code from AudioResource to the sfx core.
svn-id: r41486
This commit is contained in:
Walter van Niftrik
parent
019be026d9
commit
1fb78d577f
5 changed files with 261 additions and 328 deletions
|
|
@ -348,11 +348,13 @@ SfxState::SfxState() {
|
|||
_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 @@ void SfxState::updateSingleSong() {
|
|||
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 @@ void SfxState::sfx_init(ResourceManager *resmgr, int flags) {
|
|||
_songlib._lib = 0;
|
||||
_song = NULL;
|
||||
_flags = flags;
|
||||
_soundSync = NULL;
|
||||
_audioResource = NULL;
|
||||
_syncResource = NULL;
|
||||
_syncOffset = 0;
|
||||
|
||||
player = NULL;
|
||||
|
||||
|
|
@ -676,6 +678,8 @@ void SfxState::sfx_init(ResourceManager *resmgr, int flags) {
|
|||
delete player;
|
||||
player = NULL;
|
||||
}
|
||||
|
||||
_resMgr = resmgr;
|
||||
}
|
||||
|
||||
void SfxState::sfx_exit() {
|
||||
|
|
@ -689,12 +693,6 @@ void SfxState::sfx_exit() {
|
|||
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 @@ void SfxState::sfx_all_stop() {
|
|||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue