libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-11 11:45:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VIDEO: Don't depend on IEEE floats for Bink audio

Browse Source
This commit is contained in:
Sven Hesse 2011-07-24 23:56:56 +02:00
parent cf2060a416
commit 62862ecb23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
video/bink_decoder.cpp
View File

@ -1418,10 +1418,6 @@ void BinkDecoder::audioBlock(AudioTrack &audio, int16 *out) {
else if (audio.codec == kAudioCodecRDFT) else if (audio.codec == kAudioCodecRDFT)
audioBlockRDFT(audio); audioBlockRDFT(audio);
for (uint32 i = 0; i < audio.channels; i++)
for (uint32 j = 0; j < audio.frameLen; j++)
audio.coeffsPtr[i][j] = 385.0 + audio.coeffsPtr[i][j] * (1.0 / 32767.0);
floatToInt16Interleave(out, const_cast<const float **>(audio.coeffsPtr), audio.frameLen, audio.channels); floatToInt16Interleave(out, const_cast<const float **>(audio.coeffsPtr), audio.frameLen, audio.channels);
if (!audio.first) { if (!audio.first) {
@ -1535,25 +1531,20 @@ void BinkDecoder::readAudioCoeffs(AudioTrack &audio, float *coeffs) {
} }
static inline int floatToInt16One(const float *src) { static inline int floatToInt16One(float src) {
int32 tmp = *(const int32 *) src; return (int16) CLIP<int>((int) floor(src + 0.5), -32768, 32767);
if (tmp & 0xF0000)
tmp = (0x43C0FFFF - tmp) >> 31;
return tmp - 0x8000;
} }
void BinkDecoder::floatToInt16Interleave(int16 *dst, const float **src, uint32 length, uint8 channels) { void BinkDecoder::floatToInt16Interleave(int16 *dst, const float **src, uint32 length, uint8 channels) {
if (channels == 2) { if (channels == 2) {
for (uint32 i = 0; i < length; i++) { for (uint32 i = 0; i < length; i++) {
dst[2 * i ] = TO_LE_16(floatToInt16One(src[0] + i)); dst[2 * i ] = TO_LE_16(floatToInt16One(src[0][i]));
dst[2 * i + 1] = TO_LE_16(floatToInt16One(src[1] + i)); dst[2 * i + 1] = TO_LE_16(floatToInt16One(src[1][i]));
} }
} else { } else {
for(uint8 c = 0; c < channels; c++) for(uint8 c = 0; c < channels; c++)
for(uint32 i = 0, j = c; i < length; i++, j += channels) for(uint32 i = 0, j = c; i < length; i++, j += channels)
dst[j] = TO_LE_16(floatToInt16One(src[c] + i)); dst[j] = TO_LE_16(floatToInt16One(src[c][i]));
} }
} }