libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-22 18:37:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed incorrect MSVC fixes; simplified readSample code (bugs #780167 and #780420)

Browse Source 
svn-id: r9302
This commit is contained in:
Max Horn 2003-07-30 19:43:51 +00:00
parent 0f85cc3061
commit 6143058422
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sound/audiostream.cpp
View File

@ -28,17 +28,10 @@
template<bool is16Bit, bool isUnsigned>
static inline int16 readSample(const byte *ptr) {
if (is16Bit) {
if (isUnsigned)
return (int16)(READ_BE_UINT16(ptr) ^ 0x8000);
else
return (int16)READ_BE_UINT16(ptr);
} else {
if (isUnsigned)
return (int8)(*ptr ^ 0x80) << 8;
else
return (int8)*ptr << 8;
}
uint16 sample = is16Bit ? READ_BE_UINT16(ptr) : (*ptr << 8);
if (isUnsigned)
sample ^= 0x8000;
return (int16)sample;
}
#pragma mark -
@ -308,7 +301,7 @@ void VorbisInputStream::refill() {
template<bool stereo>
static AudioInputStream *makeLinearInputStream(const byte *ptr, uint32 len, bool isUnsigned, bool is16Bit) {
static AudioInputStream *makeLinearInputStream(const byte *ptr, uint32 len, bool is16Bit, bool isUnsigned) {
if (isUnsigned) {
if (is16Bit)
return new LinearMemoryStream<stereo, true, true>(ptr, len);
@ -324,7 +317,7 @@ static AudioInputStream *makeLinearInputStream(const byte *ptr, uint32 len, bool
template<bool stereo>
static WrappedAudioInputStream *makeWrappedInputStream(uint32 len, bool isUnsigned, bool is16Bit) {
static WrappedAudioInputStream *makeWrappedInputStream(uint32 len, bool is16Bit, bool isUnsigned) {
if (isUnsigned) {
if (is16Bit)
return new WrappedMemoryStream<stereo, true, true>(len);
@ -340,17 +333,21 @@ static WrappedAudioInputStream *makeWrappedInputStream(uint32 len, bool isUnsign
AudioInputStream *makeLinearInputStream(byte _flags, const byte *ptr, uint32 len) {
const bool is16Bit = (_flags & SoundMixer::FLAG_16BITS) != 0;
const bool isUnsigned = (_flags & SoundMixer::FLAG_UNSIGNED) != 0;
if (_flags & SoundMixer::FLAG_STEREO) {
return makeLinearInputStream<true>(ptr, len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS != 0);
return makeLinearInputStream<true>(ptr, len, is16Bit, isUnsigned);
} else {
return makeLinearInputStream<false>(ptr, len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS != 0);
return makeLinearInputStream<false>(ptr, len, is16Bit, isUnsigned);
}
}
WrappedAudioInputStream *makeWrappedInputStream(byte _flags, uint32 len) {
const bool is16Bit = (_flags & SoundMixer::FLAG_16BITS) != 0;
const bool isUnsigned = (_flags & SoundMixer::FLAG_UNSIGNED) != 0;
if (_flags & SoundMixer::FLAG_STEREO) {
return makeWrappedInputStream<true>(len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS != 0);
return makeWrappedInputStream<true>(len, is16Bit, isUnsigned);
} else {
return makeWrappedInputStream<false>(len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS != 0);
return makeWrappedInputStream<false>(len, is16Bit, isUnsigned);
}
}