Tidy up mp3 decoder

This commit is contained in:
Ryan Dwyer 2021-11-19 22:13:45 +10:00
parent 6711e41835
commit 5833480491
3 changed files with 1564 additions and 2995 deletions

View File

@ -4,40 +4,6 @@
#include "data.h"
#include "types.h"
extern const u32 var70054b40[];
extern const u32 var70054b68[];
extern const u32 var70054bb8[];
extern const u32 var70054c08[];
extern const u32 var70054c08[];
extern const u32 var70054c90[];
extern const u32 var70054d18[];
extern const u32 var70054e40[];
extern const u32 var70054f68[];
extern const u32 var70055090[];
extern const u32 var70055298[];
extern const u32 var700554a0[];
extern const u32 var700556a8[];
extern const u32 var70055eb0[];
extern const u32 var70055eb0[];
extern const u32 var700566b8[];
extern const u32 var700566b8[];
extern const u32 var700566b8[];
extern const u32 var700566b8[];
extern const u32 var700566b8[];
extern const u32 var700566b8[];
extern const u32 var700566b8[];
extern const u32 var700566b8[];
extern const u32 var70056ec0[];
extern const u32 var70056ec0[];
extern const u32 var70056ec0[];
extern const u32 var70056ec0[];
extern const u32 var70056ec0[];
extern const u32 var70056ec0[];
extern const u32 var70056ec0[];
extern const u32 var70056ec0[];
extern const u32 var700576c8[];
extern const u32 var70057750[];
bool func0003f8a0(void);
bool func00040164(struct asistream *stream, u32 gr, u32 ch);
bool mp3decUnpackScaleFac(struct asistream *stream, u32 gr, u32 ch);

View File

@ -7344,13 +7344,16 @@ struct var8007f8dc {
/*0x100*/ u32 unk100;
};
struct asistream_scalefac {
/*0x3d08*/ u32 l[22];
/*0x3d60*/ u32 unk3d60;
/*0x3d64*/ u32 s[3][13];
};
struct asistream_4f64 {
f32 unk00[18];
};
#define MAX_GR 1
#define MAX_CH 2
struct asistream {
/*0x0000*/ s32 unk00;
/*0x0004*/ s32 (*unk04)(s32 arg0, void *arg1, s32 arg2, s32 arg3);
@ -7404,26 +7407,18 @@ struct asistream {
/*0x3cf0*/ u32 preflag[2][1];
/*0x3cf8*/ u32 scalefac_scale[2][1];
/*0x3d00*/ u32 count1table_select[2][1];
/*0x3d08*/ u8 scalefac_l[0x58];
/*0x3d60*/ u8 unk3d60[4];
/*0x3d64*/ u8 scalefac_s[4];
/*0x3d68*/ u8 unk3d68[0x2c];
/*0x3d94*/ u8 unk3d94[4];
/*0x3d98*/ u8 unk3d98[0x34];
/*0x3dcc*/ u8 unk3dcc[0x34];
/*0x3e00*/ u8 unk3e00[0xf8];
struct asistream_scalefac scalefac[2][1];
/*0x3ef8*/ u32 unk3ef8;
/*0x3efc*/ u32 unk3efc[6];
/*0x3f14*/ u32 unk3f14[1];
/*0x3f18*/ u8 unk3f18[0x64];
/*0x3f14*/ u32 unk3f14[26];
/*0x3f7c*/ s32 unk3f7c;
/*0x3f80*/ s32 unk3f80;
/*0x3f84*/ s32 unk3f84;
/*0x3f88*/ s32 unk3f88;
/*0x3f8c*/ s32 numchannels;
/*0x3f90*/ s32 numgranules;
/*0x3f94*/ s16 unk3f94[1][0x242];
/*0x4418*/ u8 unk4418[1][0x242];
/*0x3f94*/ s16 unk3f94[1][578];
/*0x4418*/ u8 unk4418[1][578];
/*0x465c*/ s32 unk465c[1];
/*0x4660*/ s32 unk4660[1];
/*0x4664*/ struct asistream_4f64 unk4664[1][32];

File diff suppressed because it is too large Load Diff