eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve SoundDecoder readability

This commit is contained in:
Alexander Batalov 2022-12-25 22:30:31 +03:00
parent b8dea116ee
commit 1b0cd6d757
7 changed files with 163 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio.cc
View File

@ -104,7 +104,7 @@ int audioOpen(const char* fname, int flags, ...)
if (compression == 2) { if (compression == 2) {
audioFile->flags |= AUDIO_FILE_COMPRESSED; audioFile->flags |= AUDIO_FILE_COMPRESSED;
audioFile->soundDecoder = soundDecoderInit(audioSoundDecoderReadHandler, audioFile->fileHandle, &(audioFile->field_14), &(audioFile->field_10), &(audioFile->fileSize)); audioFile->soundDecoder = soundDecoderInit(audioSoundDecoderReadHandler, audioFile->fileHandle, &(audioFile->channels), &(audioFile->sampleRate), &(audioFile->fileSize));
audioFile->fileSize *= 2; audioFile->fileSize *= 2;
} else { } else {
audioFile->fileSize = fileGetSize(stream); audioFile->fileSize = fileGetSize(stream);
@ -174,7 +174,7 @@ long audioSeek(int fileHandle, long offset, int origin)
if (pos < audioFile->position) { if (pos < audioFile->position) {
soundDecoderFree(audioFile->soundDecoder); soundDecoderFree(audioFile->soundDecoder);
fileSeek((File*)intToPtr(audioFile->fileHandle), 0, SEEK_SET); fileSeek((File*)intToPtr(audioFile->fileHandle), 0, SEEK_SET);
audioFile->soundDecoder = soundDecoderInit(audioSoundDecoderReadHandler, audioFile->fileHandle, &(audioFile->field_14), &(audioFile->field_10), &(audioFile->fileSize)); audioFile->soundDecoder = soundDecoderInit(audioSoundDecoderReadHandler, audioFile->fileHandle, &(audioFile->channels), &(audioFile->sampleRate), &(audioFile->fileSize));
audioFile->position = 0; audioFile->position = 0;
audioFile->fileSize *= 2; audioFile->fileSize *= 2;

4
src/audio_file.cc
View File

@ -102,7 +102,7 @@ int audioFileOpen(const char* fname, int flags, ...)
if (compression == 2) { if (compression == 2) {
audioFile->flags |= AUDIO_FILE_COMPRESSED; audioFile->flags |= AUDIO_FILE_COMPRESSED;
audioFile->soundDecoder = soundDecoderInit(audioFileSoundDecoderReadHandler, audioFile->fileHandle, &(audioFile->field_14), &(audioFile->field_10), &(audioFile->fileSize)); audioFile->soundDecoder = soundDecoderInit(audioFileSoundDecoderReadHandler, audioFile->fileHandle, &(audioFile->channels), &(audioFile->sampleRate), &(audioFile->fileSize));
audioFile->fileSize *= 2; audioFile->fileSize *= 2;
} else { } else {
audioFile->fileSize = getFileSize(stream); audioFile->fileSize = getFileSize(stream);
@ -176,7 +176,7 @@ long audioFileSeek(int fileHandle, long offset, int origin)
fseek((FILE*)intToPtr(audioFile->fileHandle), 0, 0); fseek((FILE*)intToPtr(audioFile->fileHandle), 0, 0);
audioFile->soundDecoder = soundDecoderInit(audioFileSoundDecoderReadHandler, audioFile->fileHandle, &(audioFile->field_14), &(audioFile->field_10), &(audioFile->fileSize)); audioFile->soundDecoder = soundDecoderInit(audioFileSoundDecoderReadHandler, audioFile->fileHandle, &(audioFile->channels), &(audioFile->sampleRate), &(audioFile->fileSize));
audioFile->fileSize *= 2; audioFile->fileSize *= 2;
audioFile->position = 0; audioFile->position = 0;

4
src/audio_file.h
View File

@ -15,8 +15,8 @@ typedef struct AudioFile {
int fileHandle; int fileHandle;
SoundDecoder* soundDecoder; SoundDecoder* soundDecoder;
int fileSize; int fileSize;
int field_10; int sampleRate;
int field_14; int channels;
int position; int position;
} AudioFile; } AudioFile;

268
src/sound_decoder.cc
View File

@ -15,7 +15,7 @@ namespace fallout {
#define SOUND_DECODER_IN_BUFFER_SIZE (512) #define SOUND_DECODER_IN_BUFFER_SIZE (512)
typedef int (*DECODINGPROC)(SoundDecoder* soundDecoder, int offset, int bits); typedef int (*ReadBandFunc)(SoundDecoder* soundDecoder, int offset, int bits);
static bool soundDecoderPrepare(SoundDecoder* a1, SoundDecoderReadProc* readProc, int fileHandle); static bool soundDecoderPrepare(SoundDecoder* a1, SoundDecoderReadProc* readProc, int fileHandle);
static unsigned char soundDecoderReadNextChunk(SoundDecoder* a1); static unsigned char soundDecoderReadNextChunk(SoundDecoder* a1);
@ -45,11 +45,8 @@ static inline void soundDecoderDropBits(SoundDecoder* soundDecoder, int bits);
// 0x51E328 // 0x51E328
static int gSoundDecodersCount = 0; static int gSoundDecodersCount = 0;
// 0x51E32C
static bool _inited_ = false;
// 0x51E330 // 0x51E330
static DECODINGPROC _ReadBand_tbl[32] = { static ReadBandFunc _ReadBand_tbl[32] = {
_ReadBand_Fmt0_, _ReadBand_Fmt0_,
_ReadBand_Fail_, _ReadBand_Fail_,
_ReadBand_Fail_, _ReadBand_Fail_,
@ -85,13 +82,13 @@ static DECODINGPROC _ReadBand_tbl[32] = {
}; };
// 0x6AD960 // 0x6AD960
static unsigned char _pack11_2[128]; static unsigned char pack11_2[128];
// 0x6AD9E0 // 0x6AD9E0
static unsigned char _pack3_3[32]; static unsigned char pack3_3[32];
// 0x6ADA00 // 0x6ADA00
static unsigned short word_6ADA00[128]; static unsigned short pack5_3[128];
// 0x6ADB00 // 0x6ADB00
static unsigned char* _AudioDecoder_scale0; static unsigned char* _AudioDecoder_scale0;
@ -133,18 +130,21 @@ static unsigned char soundDecoderReadNextChunk(SoundDecoder* soundDecoder)
// 0x4D3C78 // 0x4D3C78
static void _init_pack_tables() static void _init_pack_tables()
{ {
// 0x51E32C
static bool inited = false;
int i; int i;
int j; int j;
int m; int m;
if (_inited_) { if (inited) {
return; return;
} }
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
for (m = 0; m < 3; m++) { for (m = 0; m < 3; m++) {
_pack3_3[i + j * 3 + m * 9] = i + j * 4 + m * 16; pack3_3[i + j * 3 + m * 9] = i + j * 4 + m * 16;
} }
} }
} }
@ -152,18 +152,18 @@ static void _init_pack_tables()
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
for (j = 0; j < 5; j++) { for (j = 0; j < 5; j++) {
for (m = 0; m < 5; m++) { for (m = 0; m < 5; m++) {
word_6ADA00[i + j * 5 + m * 25] = i + j * 8 + m * 64; pack5_3[i + j * 5 + m * 25] = i + j * 8 + m * 64;
} }
} }
} }
for (i = 0; i < 11; i++) { for (i = 0; i < 11; i++) {
for (j = 0; j < 11; j++) { for (j = 0; j < 11; j++) {
_pack11_2[i + j * 11] = i + j * 16; pack11_2[i + j * 11] = i + j * 16;
} }
} }
_inited_ = true; inited = true;
} }
// 0x4D3D9C // 0x4D3D9C
@ -175,13 +175,13 @@ static int _ReadBand_Fail_(SoundDecoder* soundDecoder, int offset, int bits)
// 0x4D3DA0 // 0x4D3DA0
static int _ReadBand_Fmt0_(SoundDecoder* soundDecoder, int offset, int bits) static int _ReadBand_Fmt0_(SoundDecoder* soundDecoder, int offset, int bits)
{ {
int* p = (int*)soundDecoder->field_34; int* p = (int*)soundDecoder->samples;
p += offset; p += offset;
int i = soundDecoder->field_28; int i = soundDecoder->samples_per_subband;
while (i != 0) { while (i != 0) {
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
i--; i--;
} }
@ -197,19 +197,19 @@ static int _ReadBand_Fmt3_16_(SoundDecoder* soundDecoder, int offset, int bits)
short* base = (short*)_AudioDecoder_scale0; short* base = (short*)_AudioDecoder_scale0;
base += (int)(UINT_MAX << (bits - 1)); base += (int)(UINT_MAX << (bits - 1));
int* p = (int*)soundDecoder->field_34; int* p = (int*)soundDecoder->samples;
p += offset; p += offset;
v14 = (1 << bits) - 1; v14 = (1 << bits) - 1;
int i = soundDecoder->field_28; int i = soundDecoder->samples_per_subband;
while (i != 0) { while (i != 0) {
soundDecoderRequireBits(soundDecoder, bits); soundDecoderRequireBits(soundDecoder, bits);
value = soundDecoder->hold; value = soundDecoder->hold;
soundDecoderDropBits(soundDecoder, bits); soundDecoderDropBits(soundDecoder, bits);
*p = base[v14 & value]; *p = base[v14 & value];
p += soundDecoder->field_24; p += soundDecoder->subbands;
i--; i--;
} }
@ -222,10 +222,10 @@ static int _ReadBand_Fmt17_(SoundDecoder* soundDecoder, int offset, int bits)
{ {
short* base = (short*)_AudioDecoder_scale0; short* base = (short*)_AudioDecoder_scale0;
int* p = (int*)soundDecoder->field_34; int* p = (int*)soundDecoder->samples;
p += offset; p += offset;
int i = soundDecoder->field_28; int i = soundDecoder->samples_per_subband;
while (i != 0) { while (i != 0) {
soundDecoderRequireBits(soundDecoder, 3); soundDecoderRequireBits(soundDecoder, 3);
@ -234,14 +234,14 @@ static int _ReadBand_Fmt17_(SoundDecoder* soundDecoder, int offset, int bits)
soundDecoderDropBits(soundDecoder, 1); soundDecoderDropBits(soundDecoder, 1);
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
} }
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
@ -250,7 +250,7 @@ static int _ReadBand_Fmt17_(SoundDecoder* soundDecoder, int offset, int bits)
soundDecoderDropBits(soundDecoder, 2); soundDecoderDropBits(soundDecoder, 2);
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
@ -264,7 +264,7 @@ static int _ReadBand_Fmt17_(SoundDecoder* soundDecoder, int offset, int bits)
*p = base[-1]; *p = base[-1];
} }
p += soundDecoder->field_24; p += soundDecoder->subbands;
i--; i--;
} }
} }
@ -276,10 +276,10 @@ static int _ReadBand_Fmt18_(SoundDecoder* soundDecoder, int offset, int bits)
{ {
short* base = (short*)_AudioDecoder_scale0; short* base = (short*)_AudioDecoder_scale0;
int* p = (int*)soundDecoder->field_34; int* p = (int*)soundDecoder->samples;
p += offset; p += offset;
int i = soundDecoder->field_28; int i = soundDecoder->samples_per_subband;
while (i != 0) { while (i != 0) {
soundDecoderRequireBits(soundDecoder, 2); soundDecoderRequireBits(soundDecoder, 2);
@ -288,7 +288,7 @@ static int _ReadBand_Fmt18_(SoundDecoder* soundDecoder, int offset, int bits)
soundDecoderDropBits(soundDecoder, 1); soundDecoderDropBits(soundDecoder, 1);
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
return 1; return 1;
@ -302,7 +302,7 @@ static int _ReadBand_Fmt18_(SoundDecoder* soundDecoder, int offset, int bits)
*p = base[-1]; *p = base[-1];
} }
p += soundDecoder->field_24; p += soundDecoder->subbands;
i--; i--;
} }
} }
@ -315,31 +315,31 @@ static int _ReadBand_Fmt19_(SoundDecoder* soundDecoder, int offset, int bits)
short* base = (short*)_AudioDecoder_scale0; short* base = (short*)_AudioDecoder_scale0;
base -= 1; base -= 1;
int* p = (int*)soundDecoder->field_34; int* p = (int*)soundDecoder->samples;
p += offset; p += offset;
int i = soundDecoder->field_28; int i = soundDecoder->samples_per_subband;
while (i != 0) { while (i != 0) {
soundDecoderRequireBits(soundDecoder, 5); soundDecoderRequireBits(soundDecoder, 5);
int value = soundDecoder->hold & 0x1F; int value = soundDecoder->hold & 0x1F;
soundDecoderDropBits(soundDecoder, 5); soundDecoderDropBits(soundDecoder, 5);
value = _pack3_3[value]; value = pack3_3[value];
*p = base[value & 0x03]; *p = base[value & 0x03];
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
} }
*p = base[(value >> 2) & 0x03]; *p = base[(value >> 2) & 0x03];
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
} }
*p = base[value >> 4]; *p = base[value >> 4];
p += soundDecoder->field_24; p += soundDecoder->subbands;
i--; i--;
} }
@ -352,10 +352,10 @@ static int _ReadBand_Fmt20_(SoundDecoder* soundDecoder, int offset, int bits)
{ {
short* base = (short*)_AudioDecoder_scale0; short* base = (short*)_AudioDecoder_scale0;
int* p = (int*)soundDecoder->field_34; int* p = (int*)soundDecoder->samples;
p += offset; p += offset;
int i = soundDecoder->field_28; int i = soundDecoder->samples_per_subband;
while (i != 0) { while (i != 0) {
soundDecoderRequireBits(soundDecoder, 4); soundDecoderRequireBits(soundDecoder, 4);
@ -364,14 +364,14 @@ static int _ReadBand_Fmt20_(SoundDecoder* soundDecoder, int offset, int bits)
soundDecoderDropBits(soundDecoder, 1); soundDecoderDropBits(soundDecoder, 1);
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
} }
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
@ -380,7 +380,7 @@ static int _ReadBand_Fmt20_(SoundDecoder* soundDecoder, int offset, int bits)
soundDecoderDropBits(soundDecoder, 2); soundDecoderDropBits(soundDecoder, 2);
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
@ -402,7 +402,7 @@ static int _ReadBand_Fmt20_(SoundDecoder* soundDecoder, int offset, int bits)
} }
} }
p += soundDecoder->field_24; p += soundDecoder->subbands;
i--; i--;
} }
} }
@ -415,10 +415,10 @@ static int _ReadBand_Fmt21_(SoundDecoder* soundDecoder, int offset, int bits)
{ {
short* base = (short*)_AudioDecoder_scale0; short* base = (short*)_AudioDecoder_scale0;
int* p = (int*)soundDecoder->field_34; int* p = (int*)soundDecoder->samples;
p += offset; p += offset;
int i = soundDecoder->field_28; int i = soundDecoder->samples_per_subband;
while (i != 0) { while (i != 0) {
soundDecoderRequireBits(soundDecoder, 3); soundDecoderRequireBits(soundDecoder, 3);
@ -427,7 +427,7 @@ static int _ReadBand_Fmt21_(SoundDecoder* soundDecoder, int offset, int bits)
soundDecoderDropBits(soundDecoder, 1); soundDecoderDropBits(soundDecoder, 1);
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
@ -449,7 +449,7 @@ static int _ReadBand_Fmt21_(SoundDecoder* soundDecoder, int offset, int bits)
} }
} }
p += soundDecoder->field_24; p += soundDecoder->subbands;
i--; i--;
} }
} }
@ -463,33 +463,33 @@ static int _ReadBand_Fmt22_(SoundDecoder* soundDecoder, int offset, int bits)
short* base = (short*)_AudioDecoder_scale0; short* base = (short*)_AudioDecoder_scale0;
base -= 2; base -= 2;
int* p = (int*)soundDecoder->field_34; int* p = (int*)soundDecoder->samples;
p += offset; p += offset;
int i = soundDecoder->field_28; int i = soundDecoder->samples_per_subband;
while (i != 0) { while (i != 0) {
soundDecoderRequireBits(soundDecoder, 7); soundDecoderRequireBits(soundDecoder, 7);
int value = soundDecoder->hold & 0x7F; int value = soundDecoder->hold & 0x7F;
soundDecoderDropBits(soundDecoder, 7); soundDecoderDropBits(soundDecoder, 7);
value = word_6ADA00[value]; value = pack5_3[value];
*p = base[value & 7]; *p = base[value & 7];
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
} }
*p = base[((value >> 3) & 7)]; *p = base[((value >> 3) & 7)];
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
} }
*p = base[value >> 6]; *p = base[value >> 6];
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
@ -504,10 +504,10 @@ static int _ReadBand_Fmt23_(SoundDecoder* soundDecoder, int offset, int bits)
{ {
short* base = (short*)_AudioDecoder_scale0; short* base = (short*)_AudioDecoder_scale0;
int* p = (int*)soundDecoder->field_34; int* p = (int*)soundDecoder->samples;
p += offset; p += offset;
int i = soundDecoder->field_28; int i = soundDecoder->samples_per_subband;
while (i != 0) { while (i != 0) {
soundDecoderRequireBits(soundDecoder, 5); soundDecoderRequireBits(soundDecoder, 5);
@ -516,14 +516,14 @@ static int _ReadBand_Fmt23_(SoundDecoder* soundDecoder, int offset, int bits)
soundDecoderDropBits(soundDecoder, 1); soundDecoderDropBits(soundDecoder, 1);
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
} }
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
@ -532,7 +532,7 @@ static int _ReadBand_Fmt23_(SoundDecoder* soundDecoder, int offset, int bits)
soundDecoderDropBits(soundDecoder, 2); soundDecoderDropBits(soundDecoder, 2);
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
@ -546,7 +546,7 @@ static int _ReadBand_Fmt23_(SoundDecoder* soundDecoder, int offset, int bits)
*p = base[-1]; *p = base[-1];
} }
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
} }
@ -560,7 +560,7 @@ static int _ReadBand_Fmt23_(SoundDecoder* soundDecoder, int offset, int bits)
} }
*p = base[value - 3]; *p = base[value - 3];
p += soundDecoder->field_24; p += soundDecoder->subbands;
i--; i--;
} }
} }
@ -573,10 +573,10 @@ static int _ReadBand_Fmt24_(SoundDecoder* soundDecoder, int offset, int bits)
{ {
short* base = (short*)_AudioDecoder_scale0; short* base = (short*)_AudioDecoder_scale0;
int* p = (int*)soundDecoder->field_34; int* p = (int*)soundDecoder->samples;
p += offset; p += offset;
int i = soundDecoder->field_28; int i = soundDecoder->samples_per_subband;
while (i != 0) { while (i != 0) {
soundDecoderRequireBits(soundDecoder, 4); soundDecoderRequireBits(soundDecoder, 4);
@ -585,7 +585,7 @@ static int _ReadBand_Fmt24_(SoundDecoder* soundDecoder, int offset, int bits)
soundDecoderDropBits(soundDecoder, 1); soundDecoderDropBits(soundDecoder, 1);
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
@ -599,7 +599,7 @@ static int _ReadBand_Fmt24_(SoundDecoder* soundDecoder, int offset, int bits)
*p = base[-1]; *p = base[-1];
} }
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
@ -614,7 +614,7 @@ static int _ReadBand_Fmt24_(SoundDecoder* soundDecoder, int offset, int bits)
} }
*p = base[value - 3]; *p = base[value - 3];
p += soundDecoder->field_24; p += soundDecoder->subbands;
i--; i--;
} }
} }
@ -627,10 +627,10 @@ static int _ReadBand_Fmt26_(SoundDecoder* soundDecoder, int offset, int bits)
{ {
short* base = (short*)_AudioDecoder_scale0; short* base = (short*)_AudioDecoder_scale0;
int* p = (int*)soundDecoder->field_34; int* p = (int*)soundDecoder->samples;
p += offset; p += offset;
int i = soundDecoder->field_28; int i = soundDecoder->samples_per_subband;
while (i != 0) { while (i != 0) {
soundDecoderRequireBits(soundDecoder, 5); soundDecoderRequireBits(soundDecoder, 5);
@ -639,14 +639,14 @@ static int _ReadBand_Fmt26_(SoundDecoder* soundDecoder, int offset, int bits)
soundDecoderDropBits(soundDecoder, 1); soundDecoderDropBits(soundDecoder, 1);
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
} }
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
@ -655,7 +655,7 @@ static int _ReadBand_Fmt26_(SoundDecoder* soundDecoder, int offset, int bits)
soundDecoderDropBits(soundDecoder, 2); soundDecoderDropBits(soundDecoder, 2);
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
@ -670,7 +670,7 @@ static int _ReadBand_Fmt26_(SoundDecoder* soundDecoder, int offset, int bits)
} }
*p = base[value - 4]; *p = base[value - 4];
p += soundDecoder->field_24; p += soundDecoder->subbands;
i--; i--;
} }
} }
@ -683,10 +683,10 @@ static int _ReadBand_Fmt27_(SoundDecoder* soundDecoder, int offset, int bits)
{ {
short* base = (short*)_AudioDecoder_scale0; short* base = (short*)_AudioDecoder_scale0;
int* p = (int*)soundDecoder->field_34; int* p = (int*)soundDecoder->samples;
p += offset; p += offset;
int i = soundDecoder->field_28; int i = soundDecoder->samples_per_subband;
while (i != 0) { while (i != 0) {
soundDecoderRequireBits(soundDecoder, 4); soundDecoderRequireBits(soundDecoder, 4);
@ -695,7 +695,7 @@ static int _ReadBand_Fmt27_(SoundDecoder* soundDecoder, int offset, int bits)
soundDecoderDropBits(soundDecoder, 1); soundDecoderDropBits(soundDecoder, 1);
*p = 0; *p = 0;
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
@ -710,7 +710,7 @@ static int _ReadBand_Fmt27_(SoundDecoder* soundDecoder, int offset, int bits)
} }
*p = base[value - 4]; *p = base[value - 4];
p += soundDecoder->field_24; p += soundDecoder->subbands;
i--; i--;
} }
} }
@ -723,25 +723,25 @@ static int _ReadBand_Fmt29_(SoundDecoder* soundDecoder, int offset, int bits)
{ {
short* base = (short*)_AudioDecoder_scale0; short* base = (short*)_AudioDecoder_scale0;
int* p = (int*)soundDecoder->field_34; int* p = (int*)soundDecoder->samples;
p += offset; p += offset;
int i = soundDecoder->field_28; int i = soundDecoder->samples_per_subband;
while (i != 0) { while (i != 0) {
soundDecoderRequireBits(soundDecoder, 7); soundDecoderRequireBits(soundDecoder, 7);
int value = soundDecoder->hold & 0x7F; int value = soundDecoder->hold & 0x7F;
soundDecoderDropBits(soundDecoder, 7); soundDecoderDropBits(soundDecoder, 7);
value = _pack11_2[value]; value = pack11_2[value];
*p = base[(value & 0x0F) - 5]; *p = base[(value & 0x0F) - 5];
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
} }
*p = base[(value >> 4) - 5]; *p = base[(value >> 4) - 5];
p += soundDecoder->field_24; p += soundDecoder->subbands;
if (--i == 0) { if (--i == 0) {
break; break;
} }
@ -759,7 +759,7 @@ static int _ReadBands_(SoundDecoder* soundDecoder)
int v19; int v19;
unsigned short* v18; unsigned short* v18;
int v21; int v21;
DECODINGPROC fn; ReadBandFunc fn;
soundDecoderRequireBits(soundDecoder, 4); soundDecoderRequireBits(soundDecoder, 4);
v9 = soundDecoder->hold & 0xF; v9 = soundDecoder->hold & 0xF;
@ -790,7 +790,7 @@ static int _ReadBands_(SoundDecoder* soundDecoder)
_init_pack_tables(); _init_pack_tables();
for (int index = 0; index < soundDecoder->field_24; index++) { for (int index = 0; index < soundDecoder->subbands; index++) {
soundDecoderRequireBits(soundDecoder, 5); soundDecoderRequireBits(soundDecoder, 5);
int bits = soundDecoder->hold & 0x1F; int bits = soundDecoder->hold & 0x1F;
soundDecoderDropBits(soundDecoder, 5); soundDecoderDropBits(soundDecoder, 5);
@ -1003,23 +1003,23 @@ static void _untransform_all(SoundDecoder* soundDecoder)
int v6; int v6;
int* v5; int* v5;
if (!soundDecoder->field_20) { if (!soundDecoder->levels) {
return; return;
} }
ptr = soundDecoder->field_34; ptr = soundDecoder->samples;
v8 = soundDecoder->field_28; v8 = soundDecoder->samples_per_subband;
while (v8 > 0) { while (v8 > 0) {
v3 = soundDecoder->field_24 >> 1; v3 = soundDecoder->subbands >> 1;
v4 = soundDecoder->field_38; v4 = soundDecoder->block_samples_per_subband;
if (v4 > v8) { if (v4 > v8) {
v4 = v8; v4 = v8;
} }
v4 *= 2; v4 *= 2;
_untransform_subband0(soundDecoder->field_30, ptr, v3, v4); _untransform_subband0(soundDecoder->prev_samples, ptr, v3, v4);
v5 = (int*)ptr; v5 = (int*)ptr;
for (v6 = 0; v6 < v4; v6++) { for (v6 = 0; v6 < v4; v6++) {
@ -1027,7 +1027,7 @@ static void _untransform_all(SoundDecoder* soundDecoder)
v5 += v3; v5 += v3;
} }
j = 4 * v3 + soundDecoder->field_30; j = 4 * v3 + soundDecoder->prev_samples;
while (1) { while (1) {
v3 >>= 1; v3 >>= 1;
v4 *= 2; v4 *= 2;
@ -1038,8 +1038,8 @@ static void _untransform_all(SoundDecoder* soundDecoder)
j += 8 * v3; j += 8 * v3;
} }
ptr += soundDecoder->field_3C * 4; ptr += soundDecoder->block_total_samples * 4;
v8 -= soundDecoder->field_38; v8 -= soundDecoder->block_samples_per_subband;
} }
} }
@ -1053,13 +1053,13 @@ size_t soundDecoderDecode(SoundDecoder* soundDecoder, void* buffer, size_t size)
dest = (unsigned char*)buffer; dest = (unsigned char*)buffer;
v4 = 0; v4 = 0;
v5 = soundDecoder->field_4C; v5 = soundDecoder->samp_ptr;
v6 = soundDecoder->field_50; v6 = soundDecoder->samp_cnt;
size_t bytesRead; size_t bytesRead;
for (bytesRead = 0; bytesRead < size; bytesRead += 2) { for (bytesRead = 0; bytesRead < size; bytesRead += 2) {
if (!v6) { if (!v6) {
if (!soundDecoder->field_48) { if (!soundDecoder->file_cnt) {
break; break;
} }
@ -1069,27 +1069,27 @@ size_t soundDecoderDecode(SoundDecoder* soundDecoder, void* buffer, size_t size)
_untransform_all(soundDecoder); _untransform_all(soundDecoder);
soundDecoder->field_48 -= soundDecoder->field_2C; soundDecoder->file_cnt -= soundDecoder->total_samples;
soundDecoder->field_4C = soundDecoder->field_34; soundDecoder->samp_ptr = soundDecoder->samples;
soundDecoder->field_50 = soundDecoder->field_2C; soundDecoder->samp_cnt = soundDecoder->total_samples;
if (soundDecoder->field_48 < 0) { if (soundDecoder->file_cnt < 0) {
soundDecoder->field_50 += soundDecoder->field_48; soundDecoder->samp_cnt += soundDecoder->file_cnt;
soundDecoder->field_48 = 0; soundDecoder->file_cnt = 0;
} }
v5 = soundDecoder->field_4C; v5 = soundDecoder->samp_ptr;
v6 = soundDecoder->field_50; v6 = soundDecoder->samp_cnt;
} }
int v13 = *(int*)v5; int v13 = *(int*)v5;
v5 += 4; v5 += 4;
*(unsigned short*)(dest + bytesRead) = (v13 >> soundDecoder->field_20) & 0xFFFF; *(unsigned short*)(dest + bytesRead) = (v13 >> soundDecoder->levels) & 0xFFFF;
v6--; v6--;
} }
soundDecoder->field_4C = v5; soundDecoder->samp_ptr = v5;
soundDecoder->field_50 = v6; soundDecoder->samp_cnt = v6;
return bytesRead; return bytesRead;
} }
@ -1101,12 +1101,12 @@ void soundDecoderFree(SoundDecoder* soundDecoder)
free(soundDecoder->bufferIn); free(soundDecoder->bufferIn);
} }
if (soundDecoder->field_30 != NULL) { if (soundDecoder->prev_samples != NULL) {
free(soundDecoder->field_30); free(soundDecoder->prev_samples);
} }
if (soundDecoder->field_34 != NULL) { if (soundDecoder->samples != NULL) {
free(soundDecoder->field_34); free(soundDecoder->samples);
} }
free(soundDecoder); free(soundDecoder);
@ -1122,7 +1122,7 @@ void soundDecoderFree(SoundDecoder* soundDecoder)
} }
// 0x4D50A8 // 0x4D50A8
SoundDecoder* soundDecoderInit(SoundDecoderReadProc* readProc, int fileHandle, int* out_a3, int* out_a4, int* out_a5) SoundDecoder* soundDecoderInit(SoundDecoderReadProc* readProc, int fileHandle, int* channelsPtr, int* sampleRatePtr, int* sampleCountPtr)
{ {
int v14; int v14;
int v20; int v20;
@ -1161,68 +1161,68 @@ SoundDecoder* soundDecoderInit(SoundDecoderReadProc* readProc, int fileHandle, i
} }
soundDecoderRequireBits(soundDecoder, 16); soundDecoderRequireBits(soundDecoder, 16);
soundDecoder->field_48 = soundDecoder->hold & 0xFFFF; soundDecoder->file_cnt = soundDecoder->hold & 0xFFFF;
soundDecoderDropBits(soundDecoder, 16); soundDecoderDropBits(soundDecoder, 16);
soundDecoderRequireBits(soundDecoder, 16); soundDecoderRequireBits(soundDecoder, 16);
soundDecoder->field_48 |= (soundDecoder->hold & 0xFFFF) << 16; soundDecoder->file_cnt |= (soundDecoder->hold & 0xFFFF) << 16;
soundDecoderDropBits(soundDecoder, 16); soundDecoderDropBits(soundDecoder, 16);
soundDecoderRequireBits(soundDecoder, 16); soundDecoderRequireBits(soundDecoder, 16);
soundDecoder->field_40 = soundDecoder->hold & 0xFFFF; soundDecoder->channels = soundDecoder->hold & 0xFFFF;
soundDecoderDropBits(soundDecoder, 16); soundDecoderDropBits(soundDecoder, 16);
soundDecoderRequireBits(soundDecoder, 16); soundDecoderRequireBits(soundDecoder, 16);
soundDecoder->field_44 = soundDecoder->hold & 0xFFFF; soundDecoder->rate = soundDecoder->hold & 0xFFFF;
soundDecoderDropBits(soundDecoder, 16); soundDecoderDropBits(soundDecoder, 16);
soundDecoderRequireBits(soundDecoder, 4); soundDecoderRequireBits(soundDecoder, 4);
soundDecoder->field_20 = soundDecoder->hold & 0x0F; soundDecoder->levels = soundDecoder->hold & 0x0F;
soundDecoderDropBits(soundDecoder, 4); soundDecoderDropBits(soundDecoder, 4);
soundDecoderRequireBits(soundDecoder, 12); soundDecoderRequireBits(soundDecoder, 12);
soundDecoder->field_24 = 1 << soundDecoder->field_20; soundDecoder->subbands = 1 << soundDecoder->levels;
soundDecoder->field_28 = soundDecoder->hold & 0x0FFF; soundDecoder->samples_per_subband = soundDecoder->hold & 0x0FFF;
soundDecoder->field_2C = soundDecoder->field_28 * soundDecoder->field_24; soundDecoder->total_samples = soundDecoder->samples_per_subband * soundDecoder->subbands;
soundDecoderDropBits(soundDecoder, 12); soundDecoderDropBits(soundDecoder, 12);
if (soundDecoder->field_20 != 0) { if (soundDecoder->levels != 0) {
v73 = 3 * soundDecoder->field_24 / 2 - 2; v73 = 3 * soundDecoder->subbands / 2 - 2;
} else { } else {
v73 = 0; v73 = 0;
} }
soundDecoder->field_38 = 2048 / soundDecoder->field_24 - 2; soundDecoder->block_samples_per_subband = 2048 / soundDecoder->subbands - 2;
if (soundDecoder->field_38 < 1) { if (soundDecoder->block_samples_per_subband < 1) {
soundDecoder->field_38 = 1; soundDecoder->block_samples_per_subband = 1;
} }
soundDecoder->field_3C = soundDecoder->field_38 * soundDecoder->field_24; soundDecoder->block_total_samples = soundDecoder->block_samples_per_subband * soundDecoder->subbands;
if (v73 != 0) { if (v73 != 0) {
soundDecoder->field_30 = (unsigned char*)malloc(sizeof(unsigned char*) * v73); soundDecoder->prev_samples = (unsigned char*)malloc(sizeof(unsigned char*) * v73);
if (soundDecoder->field_30 == NULL) { if (soundDecoder->prev_samples == NULL) {
goto L66; goto L66;
} }
memset(soundDecoder->field_30, 0, sizeof(unsigned char*) * v73); memset(soundDecoder->prev_samples, 0, sizeof(unsigned char*) * v73);
} }
soundDecoder->field_34 = (unsigned char*)malloc(sizeof(unsigned char*) * soundDecoder->field_2C); soundDecoder->samples = (unsigned char*)malloc(sizeof(unsigned char*) * soundDecoder->total_samples);
if (soundDecoder->field_34 == NULL) { if (soundDecoder->samples == NULL) {
goto L66; goto L66;
} }
soundDecoder->field_50 = 0; soundDecoder->samp_cnt = 0;
if (gSoundDecodersCount == 1) { if (gSoundDecodersCount == 1) {
_AudioDecoder_scale_tbl = (unsigned char*)malloc(0x20000); _AudioDecoder_scale_tbl = (unsigned char*)malloc(0x20000);
_AudioDecoder_scale0 = _AudioDecoder_scale_tbl + 0x10000; _AudioDecoder_scale0 = _AudioDecoder_scale_tbl + 0x10000;
} }
*out_a3 = soundDecoder->field_40; *channelsPtr = soundDecoder->channels;
*out_a4 = soundDecoder->field_44; *sampleRatePtr = soundDecoder->rate;
*out_a5 = soundDecoder->field_48; *sampleCountPtr = soundDecoder->file_cnt;
return soundDecoder; return soundDecoder;
@ -1230,9 +1230,9 @@ L66:
soundDecoderFree(soundDecoder); soundDecoderFree(soundDecoder);
*out_a3 = 0; *channelsPtr = 0;
*out_a4 = 0; *sampleRatePtr = 0;
*out_a5 = 0; *sampleCountPtr = 0;
return 0; return 0;
} }

28
src/sound_decoder.h
View File

@ -24,24 +24,24 @@ typedef struct SoundDecoder {
// Number of bits in bit accumulator. // Number of bits in bit accumulator.
int bits; int bits;
int field_20; int levels;
int field_24; int subbands;
int field_28; int samples_per_subband;
int field_2C; int total_samples;
unsigned char* field_30; unsigned char* prev_samples;
unsigned char* field_34; unsigned char* samples;
int field_38; int block_samples_per_subband;
int field_3C; int block_total_samples;
int field_40; int channels;
int field_44; int rate;
int field_48; int file_cnt;
unsigned char* field_4C; unsigned char* samp_ptr;
int field_50; int samp_cnt;
} SoundDecoder; } SoundDecoder;
size_t soundDecoderDecode(SoundDecoder* soundDecoder, void* buffer, size_t size); size_t soundDecoderDecode(SoundDecoder* soundDecoder, void* buffer, size_t size);
void soundDecoderFree(SoundDecoder* soundDecoder); void soundDecoderFree(SoundDecoder* soundDecoder);
SoundDecoder* soundDecoderInit(SoundDecoderReadProc* readProc, int fileHandle, int* out_a3, int* out_a4, int* out_a5); SoundDecoder* soundDecoderInit(SoundDecoderReadProc* readProc, int fileHandle, int* channelsPtr, int* sampleRatePtr, int* sampleCountPtr);
} // namespace fallout } // namespace fallout

8
src/sound_effects_cache.cc
View File

@ -473,10 +473,10 @@ static int soundEffectsCacheFileReadCompressed(int handle, void* buf, unsigned i
SoundEffect* soundEffect = &(gSoundEffects[handle]); SoundEffect* soundEffect = &(gSoundEffects[handle]);
soundEffect->dataPosition = 0; soundEffect->dataPosition = 0;
int v1; int channels;
int v2; int sampleRate;
int v3; int sampleCount;
SoundDecoder* soundDecoder = soundDecoderInit(_sfxc_ad_reader, handle, &v1, &v2, &v3); SoundDecoder* soundDecoder = soundDecoderInit(_sfxc_ad_reader, handle, &channels, &sampleRate, &sampleCount);
if (soundEffect->position != 0) { if (soundEffect->position != 0) {
void* temp = internal_malloc(soundEffect->position); void* temp = internal_malloc(soundEffect->position);

10
src/sound_effects_list.cc
View File

@ -426,11 +426,11 @@ static int soundEffectsListPopulateFileSizes()
int fileHandle = ptrToInt((void*)stream); int fileHandle = ptrToInt((void*)stream);
int v1; int channels;
int v2; int sampleRate;
int v3; int sampleCount;
SoundDecoder* soundDecoder = soundDecoderInit(_sfxl_ad_reader, fileHandle, &v1, &v2, &v3); SoundDecoder* soundDecoder = soundDecoderInit(_sfxl_ad_reader, fileHandle, &channels, &sampleRate, &sampleCount);
entry->dataSize = 2 * v3; entry->dataSize = 2 * sampleCount;
soundDecoderFree(soundDecoder); soundDecoderFree(soundDecoder);
fileClose(stream); fileClose(stream);
intToPtr(fileHandle, true); intToPtr(fileHandle, true);