diff options
author | Colin Snover | 2017-01-08 22:59:30 -0600 |
---|---|---|
committer | Colin Snover | 2017-03-30 19:46:27 -0500 |
commit | 0826501ef63c5b8e6b40299d25142a3562c6fde9 (patch) | |
tree | 4cf7542e623c452b6d80062ef8d0ccadea094ba3 /engines/sci/sound | |
parent | 4c942758c073ac007f8eefc819bcf7e2ac58557c (diff) | |
download | scummvm-rg350-0826501ef63c5b8e6b40299d25142a3562c6fde9.tar.gz scummvm-rg350-0826501ef63c5b8e6b40299d25142a3562c6fde9.tar.bz2 scummvm-rg350-0826501ef63c5b8e6b40299d25142a3562c6fde9.zip |
SCI32: Fix audio, wave, VMD, Duck, CLUT, TGA, ZZZ, Etc patches
Specifically, audio patches are used in at least PQ:SWAT
(40103.AUD), Lighthouse (9103.AUD), and the GK2 demo (300.AUD).
Diffstat (limited to 'engines/sci/sound')
-rw-r--r-- | engines/sci/sound/audio.cpp | 9 | ||||
-rw-r--r-- | engines/sci/sound/audio32.cpp | 26 | ||||
-rw-r--r-- | engines/sci/sound/decoders/sol.cpp | 73 | ||||
-rw-r--r-- | engines/sci/sound/decoders/sol.h | 9 |
4 files changed, 25 insertions, 92 deletions
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp index e470b315cc..273c4c1a0d 100644 --- a/engines/sci/sound/audio.cpp +++ b/engines/sci/sound/audio.cpp @@ -397,12 +397,13 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32 #endif } else { // Original source file - if (audioRes->_headerSize > 0) { + if ((audioRes->getUint8At(0) & 0x7f) == kResourceTypeAudio && audioRes->getUint32BEAt(2) == MKTAG('S','O','L',0)) { // SCI1.1 - Common::MemoryReadStream headerStream(audioRes->_header, audioRes->_headerSize, DisposeAfterUse::NO); + const uint8 headerSize = audioRes->getUint8At(1); + Common::MemoryReadStream headerStream = audioRes->subspan(kResourceHeaderSize, headerSize).toStream(); - if (readSOLHeader(&headerStream, audioRes->_headerSize, size, _audioRate, audioFlags, audioRes->size())) { - Common::MemoryReadStream dataStream(audioRes->toStream()); + if (readSOLHeader(&headerStream, headerSize, size, _audioRate, audioFlags, audioRes->size())) { + Common::MemoryReadStream dataStream(audioRes->subspan(kResourceHeaderSize + headerSize).toStream()); data = readSOLAudio(&dataStream, size, audioFlags, flags); } } else if (audioRes->size() > 4 && audioRes->getUint32BEAt(0) == MKTAG('R','I','F','F')) { diff --git a/engines/sci/sound/audio32.cpp b/engines/sci/sound/audio32.cpp index ca2402c859..69a83ebc8e 100644 --- a/engines/sci/sound/audio32.cpp +++ b/engines/sci/sound/audio32.cpp @@ -46,10 +46,6 @@ namespace Sci { bool detectSolAudio(Common::SeekableReadStream &stream) { const size_t initialPosition = stream.pos(); -// TODO: Resource manager for audio resources reads past the -// header so even though this is the detection algorithm -// in SSCI, ScummVM can't use it -#if 0 byte header[6]; if (stream.read(header, sizeof(header)) != sizeof(header)) { stream.seek(initialPosition); @@ -58,26 +54,11 @@ bool detectSolAudio(Common::SeekableReadStream &stream) { stream.seek(initialPosition); - if (header[0] != 0x8d || READ_BE_UINT32(header + 2) != MKTAG('S', 'O', 'L', 0)) { + if ((header[0] & 0x7f) != kResourceTypeAudio || READ_BE_UINT32(header + 2) != MKTAG('S', 'O', 'L', 0)) { return false; } return true; -#else - byte header[4]; - if (stream.read(header, sizeof(header)) != sizeof(header)) { - stream.seek(initialPosition); - return false; - } - - stream.seek(initialPosition); - - if (READ_BE_UINT32(header) != MKTAG('S', 'O', 'L', 0)) { - return false; - } - - return true; -#endif } bool detectWaveAudio(Common::SeekableReadStream &stream) { @@ -723,11 +704,10 @@ uint16 Audio32::play(int16 channelIndex, const ResourceId resourceId, const bool _monitoredChannelIndex = channelIndex; } - Common::MemoryReadStream headerStream(resource->_header, resource->_headerSize, DisposeAfterUse::NO); Common::SeekableReadStream *dataStream = channel.resourceStream = resource->makeStream(); - if (detectSolAudio(headerStream)) { - channel.stream = makeSOLStream(&headerStream, dataStream, DisposeAfterUse::NO); + if (detectSolAudio(*dataStream)) { + channel.stream = makeSOLStream(dataStream, DisposeAfterUse::NO); } else if (detectWaveAudio(*dataStream)) { channel.stream = Audio::makeWAVStream(dataStream, DisposeAfterUse::NO); } else { diff --git a/engines/sci/sound/decoders/sol.cpp b/engines/sci/sound/decoders/sol.cpp index 2dbe98c9e0..973ebf309c 100644 --- a/engines/sci/sound/decoders/sol.cpp +++ b/engines/sci/sound/decoders/sol.cpp @@ -25,8 +25,9 @@ #include "audio/decoders/raw.h" #include "common/substream.h" #include "common/util.h" -#include "engines/sci/sci.h" -#include "engines/sci/sound/decoders/sol.h" +#include "sci/sci.h" +#include "sci/sound/decoders/sol.h" +#include "sci/resource.h" namespace Sci { @@ -127,16 +128,11 @@ static void deDPCM8Stereo(int16 *out, Common::ReadStream &audioStream, uint32 nu # pragma mark - template<bool STEREO, bool S16BIT> -SOLStream<STEREO, S16BIT>::SOLStream(Common::SeekableReadStream *stream, const DisposeAfterUse::Flag disposeAfterUse, const int32 dataOffset, const uint16 sampleRate, const int32 rawDataSize) : +SOLStream<STEREO, S16BIT>::SOLStream(Common::SeekableReadStream *stream, const DisposeAfterUse::Flag disposeAfterUse, const uint16 sampleRate, const int32 rawDataSize) : _stream(stream, disposeAfterUse), - _dataOffset(dataOffset), _sampleRate(sampleRate), // SSCI aligns the size of SOL data to 32 bits _rawDataSize(rawDataSize & ~3) { - // TODO: This is not valid for stereo SOL files, which - // have interleaved L/R compression so need to store the - // carried values for each channel separately. See - // 60900.aud from Lighthouse for an example stereo file if (S16BIT) { _dpcmCarry16.l = _dpcmCarry16.r = 0; } else { @@ -166,7 +162,7 @@ bool SOLStream<STEREO, S16BIT>::seek(const Audio::Timestamp &where) { _dpcmCarry8.l = _dpcmCarry8.r = 0x80; } - return _stream->seek(_dataOffset, SEEK_SET); + return _stream->seek(0, SEEK_SET); } template <bool STEREO, bool S16BIT> @@ -227,72 +223,35 @@ bool SOLStream<STEREO, S16BIT>::rewind() { } Audio::SeekableAudioStream *makeSOLStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse) { - - // TODO: Might not be necessary? Makes seeking work, but - // not sure if audio is ever actually seeked in SSCI. - const int32 initialPosition = stream->pos(); + int32 initialPosition = stream->pos(); byte header[6]; if (stream->read(header, sizeof(header)) != sizeof(header)) { + stream->seek(initialPosition, SEEK_SET); return nullptr; } - if (header[0] != 0x8d || READ_BE_UINT32(header + 2) != MKTAG('S', 'O', 'L', 0)) { + if ((header[0] & 0x7f) != kResourceTypeAudio || READ_BE_UINT32(header + 2) != MKTAG('S', 'O', 'L', 0)) { + stream->seek(initialPosition, SEEK_SET); return nullptr; } - const uint8 headerSize = header[1]; + const uint8 headerSize = header[1] + /* resource header */ 2; const uint16 sampleRate = stream->readUint16LE(); const byte flags = stream->readByte(); const uint32 dataSize = stream->readUint32LE(); - if (flags & kCompressed) { - if (flags & kStereo && flags & k16Bit) { - return new SOLStream<true, true>(new Common::SeekableSubReadStream(stream, initialPosition, initialPosition + dataSize, disposeAfterUse), disposeAfterUse, headerSize, sampleRate, dataSize); - } else if (flags & kStereo) { - return new SOLStream<true, false>(new Common::SeekableSubReadStream(stream, initialPosition, initialPosition + dataSize, disposeAfterUse), disposeAfterUse, headerSize, sampleRate, dataSize); - } else if (flags & k16Bit) { - return new SOLStream<false, true>(new Common::SeekableSubReadStream(stream, initialPosition, initialPosition + dataSize, disposeAfterUse), disposeAfterUse, headerSize, sampleRate, dataSize); - } else { - return new SOLStream<false, false>(new Common::SeekableSubReadStream(stream, initialPosition, initialPosition + dataSize, disposeAfterUse), disposeAfterUse, headerSize, sampleRate, dataSize); - } - } - - byte rawFlags = Audio::FLAG_LITTLE_ENDIAN; - if (flags & k16Bit) { - rawFlags |= Audio::FLAG_16BITS; - } else { - rawFlags |= Audio::FLAG_UNSIGNED; - } - - if (flags & kStereo) { - rawFlags |= Audio::FLAG_STEREO; - } - - return Audio::makeRawStream(new Common::SeekableSubReadStream(stream, initialPosition + headerSize, initialPosition + headerSize + dataSize, disposeAfterUse), sampleRate, rawFlags, disposeAfterUse); -} - -// TODO: This needs to be removed when resource manager is fixed -// to not split audio into two parts -Audio::SeekableAudioStream *makeSOLStream(Common::SeekableReadStream *headerStream, Common::SeekableReadStream *dataStream, DisposeAfterUse::Flag disposeAfterUse) { - - if (headerStream->readUint32BE() != MKTAG('S', 'O', 'L', 0)) { - return nullptr; - } - - const uint16 sampleRate = headerStream->readUint16LE(); - const byte flags = headerStream->readByte(); - const int32 dataSize = headerStream->readSint32LE(); + initialPosition += headerSize; if (flags & kCompressed) { if (flags & kStereo && flags & k16Bit) { - return new SOLStream<true, true>(dataStream, disposeAfterUse, 0, sampleRate, dataSize); + return new SOLStream<true, true>(new Common::SeekableSubReadStream(stream, initialPosition, initialPosition + dataSize, disposeAfterUse), disposeAfterUse, sampleRate, dataSize); } else if (flags & kStereo) { - return new SOLStream<true, false>(dataStream, disposeAfterUse, 0, sampleRate, dataSize); + return new SOLStream<true, false>(new Common::SeekableSubReadStream(stream, initialPosition, initialPosition + dataSize, disposeAfterUse), disposeAfterUse, sampleRate, dataSize); } else if (flags & k16Bit) { - return new SOLStream<false, true>(dataStream, disposeAfterUse, 0, sampleRate, dataSize); + return new SOLStream<false, true>(new Common::SeekableSubReadStream(stream, initialPosition, initialPosition + dataSize, disposeAfterUse), disposeAfterUse, sampleRate, dataSize); } else { - return new SOLStream<false, false>(dataStream, disposeAfterUse, 0, sampleRate, dataSize); + return new SOLStream<false, false>(new Common::SeekableSubReadStream(stream, initialPosition, initialPosition + dataSize, disposeAfterUse), disposeAfterUse, sampleRate, dataSize); } } @@ -307,6 +266,6 @@ Audio::SeekableAudioStream *makeSOLStream(Common::SeekableReadStream *headerStre rawFlags |= Audio::FLAG_STEREO; } - return Audio::makeRawStream(dataStream, sampleRate, rawFlags, disposeAfterUse); + return Audio::makeRawStream(new Common::SeekableSubReadStream(stream, initialPosition, initialPosition + dataSize, disposeAfterUse), sampleRate, rawFlags, disposeAfterUse); } } diff --git a/engines/sci/sound/decoders/sol.h b/engines/sci/sound/decoders/sol.h index 31914c0926..80a2181889 100644 --- a/engines/sci/sound/decoders/sol.h +++ b/engines/sci/sound/decoders/sol.h @@ -42,11 +42,6 @@ private: Common::DisposablePtr<Common::SeekableReadStream> _stream; /** - * Start offset of the audio data in the read stream. - */ - int32 _dataOffset; - - /** * Sample rate of audio data. */ uint16 _sampleRate; @@ -79,11 +74,9 @@ private: virtual bool rewind() override; public: - SOLStream(Common::SeekableReadStream *stream, const DisposeAfterUse::Flag disposeAfterUse, const int32 dataOffset, const uint16 sampleRate, const int32 rawDataSize); + SOLStream(Common::SeekableReadStream *stream, const DisposeAfterUse::Flag disposeAfterUse, const uint16 sampleRate, const int32 rawDataSize); }; Audio::SeekableAudioStream *makeSOLStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse); - -Audio::SeekableAudioStream *makeSOLStream(Common::SeekableReadStream *headerStream, Common::SeekableReadStream *dataStream, DisposeAfterUse::Flag disposeAfterUse); } #endif |