Audio lib decomp

conker/Makefile

@@ -114,6 +114,10 @@ LDFLAGS = -T $(BUILD_DIR)/$(LD_SCRIPT) -Map $(TARGET).map -T undefined_syms.$(VE
 
 $(BUILD_DIR)/$(SRC_DIR)/libultra/audio/%.o: OPT_FLAGS := -g
 
+# n_alStreamCrc5Word was compiled at -O1 in the original (scheduled, register
+# locals), unlike the surrounding -g audio code, so it lives in its own TU.
+$(BUILD_DIR)/$(SRC_DIR)/libultra/audio/n_streamcrc.c.o: OPT_FLAGS := -O1
+
 # TODO: blindly move all of this into libultra/audio
 $(BUILD_DIR)/$(SRC_DIR)/init_17F10.c.o: OPT_FLAGS := -g
 $(BUILD_DIR)/$(SRC_DIR)/init_17F80.c.o: OPT_FLAGS := -g

conker/conker.us.yaml

@@ -774,7 +774,8 @@ segments:
       - [0x21F1C0, c,   libultra/io/pfsisplug2]      # dupe of libultra/io/pfsisplug
       - [0x21F530, asm, libultra/io/contramread2]    # dupe of libultra/io/contramread
       - [0x21f8e0, asm, libultra/io/contramwrite2]   # dupe of libultra/io/contramwrite
-      - [0x21fc90, c,   libultra/audio/game_21FC90]  # -g
+      - [0x21fc90, c,   libultra/audio/n_streamcrc]  # -O1 (CRC-5/CRC-8 helpers, split out of game_21FC90)
+      - [0x21fe10, c,   libultra/audio/game_21FC90]  # -g
       - [0x221290, c, game_221290]
       - [0x225d20, asm]
       - [0x2270a0, asm]

conker/include/2.0L/PR/n_libaudio.h

@@ -87,6 +87,8 @@ void    n_alSynRemovePlayer( ALPlayer *client);
 void    n_alSynSetFXMix(N_ALVoice *v, u8 fxmix);
 void    n_alSynSetFXParam(ALFxRef fx, s16 paramID, void *param);
 void    n_alSynFreeFX(ALFxRef *fx);
+void    n_alSynFilter11(N_ALVoice *v, u8 arg1);
+void    n_alSynFilter13(N_ALVoice *v, f32 arg1);
 void    n_alSynSetPan(N_ALVoice *v, u8 pan);
 void    n_alSynSetPitch( N_ALVoice *v, f32 pitch);
 void    n_alSynSetPriority( N_ALVoice *voice, s16 priority);
@@ -168,6 +170,33 @@ typedef struct {
     u8  pad4[0x8];
 } N_ALUnknownEvent2;
 
+typedef struct N_ALStreamState {
+    s32 dataStart;
+    s32 pad4;
+    s32 pad8;
+    s16 pan;
+    s16 volume;
+    s16 currentLeft;
+    s16 currentRight;
+    s16 pad14;
+    s16 pad16;
+    u16 leftRateFrac;
+    s16 leftRate;
+    s16 targetLeft;
+    u16 rightRateFrac;
+    s16 rightRate;
+    s16 targetRight;
+    s16 needsEnvelopeUpdate;
+    s16 pad26;
+    s32 rampSamplesDone;
+    s32 rampSamplesTotal;
+    u8 pad30[0x58];
+    s32 targetVolume;
+    u8 pad8C[0x4];
+    u32 requestedRampSamples;
+    s16 targetPan;
+} N_ALStreamState;
+
 typedef struct {
     u8  unk0;
     u8  unk1;
@@ -292,6 +321,12 @@ typedef struct {
     /* 0x8D */  u8  unk8D;
 } N_ALCSPlayer;
 
+typedef struct N_ALCSPExtraChanState {
+    u8 pad0[0x24];
+    s32 releaseTime;
+    u8 useCustomReleaseTime;
+} N_ALCSPExtraChanState;
+
 
 /*
  * Sequence data representation routines
@@ -300,7 +335,7 @@ void    n_alSeqNextEvent(ALSeq *seq, N_ALEvent *event);
 void    n_alSeqNewMarker(ALSeq *seq, ALSeqMarker *m, u32 ticks);
 
 void    n_alCSeqNew(ALCSeq *seq, u8 *ptr);
-void    n_alCSeqNextEvent(ALCSeq *seq, N_ALEvent *evt);
+void    n_alCSeqNextEvent(ALCSeq *seq, N_ALEvent *evt, s32 arg2);
 void    n_alCSeqNewMarker(ALCSeq *seq, ALCSeqMarker *m, u32 ticks);
 
 
@@ -377,7 +412,59 @@ typedef struct {
     /* 0x50 */  ALMicroTime         curTime;
 } N_ALSndPlayer;
 
-void     n_alSndpNew(N_ALSndPlayer *sndp, ALSndpConfig *c);
+typedef struct N_ALSndpSoundState {
+    /* 0x00 */ ALLink node;
+    /* 0x08 */ u8 pad8[0x4];
+    /* 0x0C */ ALSound *sound;
+    /* 0x10 */ u8 voice[0x20]; /* Embedded N_ALVoice storage; Conker's local header is truncated to 0x20 bytes. */
+    /* 0x30 */ f32 basePitch;
+    /* 0x34 */ f32 pitch;
+    /* 0x38 */ struct N_ALSndpSoundState **handle;
+    /* 0x3C */ ALBank *bank;
+    /* 0x40 */ s32 retryCount;
+    /* 0x44 */ u16 vol;
+    /* 0x46 */ u8 pad46[0x6];
+    /* 0x4C */ s16 soundNum;
+    /* 0x4E */ s8 priority;
+    /* 0x4F */ u8 pan;
+    /* 0x50 */ u8 fxmix;
+    /* 0x51 */ u8 fxbus;
+    /* 0x52 */ u8 pad52;
+    /* 0x53 */ u8 flags;
+    /* 0x54 */ u8 state;
+} N_ALSndpSoundState;
+
+typedef struct {
+    /* 0x00 */ ALPlayer node;
+    /* 0x14 */ ALEventQueue evtq;
+    /* 0x28 */ N_ALEvent nextEvent;
+    /* 0x38 */ N_ALSynth *drvr;
+    /* 0x3C */ s32 target;
+    /* 0x40 */ N_ALSndpSoundState *sndState;
+    /* 0x44 */ s32 maxSounds;
+    /* 0x48 */ ALMicroTime frameTime;
+    /* 0x4C */ ALMicroTime nextDelta;
+    /* 0x50 */ ALMicroTime curTime;
+    /* 0x54 */ s32 soundTableCount;
+} N_ALSndPlayerExtended;
+
+typedef struct {
+    s16 type;
+    u8 pad2[2];
+    N_ALSndpSoundState *state;
+    u8 pad8[8];
+} N_ALSndpEventPayload;
+
+typedef struct {
+    /* 0x00 */  s32                 maxStates;
+    /* 0x04 */  s32                 maxEvents;
+    /* 0x08 */  s32                 maxSounds;
+    /* 0x0C */  ALHeap             *heap;
+    /* 0x10 */  s32                 soundTableCount;
+    /* 0x14 */  u16                 maxVolumes;
+} N_ALSndpConfig;
+
+void     n_alSndpNew(N_ALSndpConfig *c);
 void     n_alSndpDelete(void);
 ALSndId  n_alSndpAllocate(ALSound *sound);
 void     n_alSndpDeallocate(ALSndId id);

conker/include/2.0L/PR/n_libaudio_s_to_n.h

@@ -91,7 +91,7 @@
 #define ALSndpEvent             N_ALSndpEvent
 #define ALSndPlayer             N_ALSndPlayer
 
-#define alSndpNew( a, b)	        n_alSndpNew( a, b)
+#define alSndpNew( a, b)	        n_alSndpNew( b)
 #define alSndpDelete( a)	        n_alSndpDelete()
 #define alSndpAllocate( a, b)	        n_alSndpAllocate( b)
 #define alSndpDeallocate( a, b)	        n_alSndpDeallocate( b)

conker/include/functions.h

@@ -108,29 +108,36 @@ void func_1001263C(s32 arg0, s32 arg1, s32 arg2);
 void func_100126E8(s32 arg0, s32 arg1);
 s32  func_10012718(u16 arg0, struct127 *arg1, s32 arg2, s16 arg3, u16 arg4);
 s32  func_100127D0(void);
-void func_10012A28(struct121 *arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_10012B84(struct11 *arg0, s32 arg1);
-void func_10012BD0(struct11 *arg0, s32 arg1);
+s32  n_alStreamGetState(void);
+void n_alStreamStart(s32 dataStart, s32 dataLength);
+void n_alStreamSetPan(s32 pan, s32 immediate);
+void n_alStreamSetLoadInfo(s32 commandCount, s32 sampleRate);
+void n_alStreamSetDoneCallback(void (*callback)(s32));
+void n_alStreamSetVolumeRamp(s32 volume, s32 rampSamples);
+void n_alStreamForceStop(void);
+void n_alStreamResume(void);
+void n_alStreamStop(void);
+void n_alBnkfPatchBank(struct121 *bank, s32 bankFileOffset, s32 sampleTableOffset, s32 sampleBankBase);
+void n_alBnkfPatchSingleWaveBaseList(struct11 *waveList, s32 sampleBankBase);
+void n_alBnkfPatchWaveBaseList(struct11 *waveList, s32 sampleBankBase);
 void func_10012C5C(struct9 *arg0, s32 arg1, s32 arg2);
 void func_10012CFC(struct12 *arg0, s32 arg1, s32 arg2);
-f32  func_10012D80(u8 arg0);
-s32  func_10012E04(s32 *arg0, f32 *arg1, u8 arg2, u8 arg3, u8 arg4, u8 arg5);
-s32  func_10012F94(struct124 *arg0, f32 *arg1);
-void func_100131D8(s32 *arg0);
-void func_100131FC(struct13 *arg0, s32 arg1);
-void func_10015550(struct26 *arg0, s32 arg1);
-s32  func_10015878(struct04 *arg0);
-void func_10016E90(struct31 *arg0);
-void func_10016F00(struct154 *arg0);
-struct31 *func_10017100(s32 arg0, s16 arg1);
-void func_10017298(struct31 *arg0);
-s32  func_100173C4(struct31 **arg0);
-void func_10017594(struct31 *arg0);
-void func_100176C4(void);
-void func_100176EC(void);
-void func_10017714(s32 arg0, s16 arg1, s32 arg2);
-void func_10017870(u8 arg0);
-void func_10017944(s32 arg0, u32 arg1);
+f32  n_alOscDepthToCents(u8 depth);
+s32  n_alOscInit(s32 *oscState, f32 *initValue, u8 oscType, u8 oscRate, u8 oscDepth, u8 oscDelay);
+s32  n_alOscUpdate(struct124 *oscState, f32 *updateValue);
+void n_alOscStop(s32 *oscState);
+void n_alOscSetCallbacks(struct13 *arg0, s32 arg1);
+s32  _n_sndpVoiceHandler(struct04 *arg0);
+struct31 *sndp_alloc_state(s32 arg0, s16 arg1);
+void sndp_free_state2(struct31 *arg0);
+s32  sndp_get_state(struct31 **arg0);
+void sndp_post_stopall_event(struct31 *arg0);
+void sndp_stop_all(void);
+void sndp_stop_nodecays(void);
+void sndp_post_event(struct31 *arg0, s16 arg1, s32 arg2);
+void n_alSndpSetChannelValue(u8 channel, u16 value);
+void n_alSndpSetOutputMode(u8 outputMode);
+void n_alSndpSetOutputRoute(s32 slot, u32 route);
 s32  func_10017A80(struct26 *arg0);
 void func_10017AA0(struct26 *arg0);
 void func_10017AF0(struct26 *arg0, s32 arg1);
@@ -148,28 +155,32 @@ void n_alClose(s32 arg0);
 s32  _n_timeToSamplesNoRound(s32 micros);
 s32  _n_timeToSamples(s32 micros);
 f32  alCents2Ratio(s32 arg0);
-void func_10019B50(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_10019C28(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_10019CD0(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_10019D6C(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_10019ED8(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_10019F38(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_10019F98(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_1001A224(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_1001A2F8(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_1001A39C(struct26 *arg0, s32 arg1, s32 arg2, u32 arg3);
-void func_1001A3E0(struct24 *arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_1001A3FC(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_1001A9DC(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
-void func_1001AA08(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPHandleChlVolCtrl(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPHandleChlPanCtrl(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPHandleChlPriorityCtrl(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPPostOsMesg(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPSetChlFxId(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPSetChlFilter12(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPSetChlFilter13Pitch(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPSetChlFilter11(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPSetChlSustain(struct26 *arg0, s32 arg1, s32 arg2, u32 arg3);
+void n_alCSPSetChlFXMix80(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPSetChlFXMix7F(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPSetChlFXBus(struct26 *arg0, s32 arg1, s32 arg2, u32 arg3);
+void n_alCSPSetStreamFileGroup(struct24 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPPlayStreamFile(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPStartChlFade(struct26 *arg0, struct25 *arg1, s32 arg2, s32 arg3);
+void n_alCSPStepChlFade(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPSetChlFadeSpeed(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
+void n_alCSPSetChlFadeEnd(struct26 *arg0, s32 arg1, s32 arg2, s32 arg3);
 s32  __n_vsDelta(struct07 *arg0, s32 arg1);
 void func_1001B620(struct26 *arg0, s32 arg1);
 void func_1001CBF0(f32 arg0, f32 arg1, f32 arg2, struct17 *arg3, struct17 *arg4);
 void func_1001CD54(struct125 *arg0);
 f32  func_1001CEA4(s32 arg0);
 void func_1001D6E8(struct42 *arg0, s32 (*arg1)(s32 arg), struct15 *arg2);
 s32  func_1001D9B0(s16 arg0);
-s32  func_1001DA28(s16 arg0);
+ALFxRef n_alSynGetOutputLPRef(s16 bus);
 void func_1001DAA0(s32 arg0, s16 arg1, s32 arg2);
 void func_1001DAE4(struct139 *arg0, s16 arg1, s32 *arg2);
 // void func_1001E170(struct22 *arg0, s32 *w, f32 pitch, s16 vol, u8 pan, u8 fxmix, u8 arg6, f32 arg7, u8 arg8, s32 arg9);
@@ -989,12 +1000,9 @@ void func_100114D0(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s
 //func_10012020
 //func_1001263C
 //func_100126E8
-// void func_10017870(u8 arg0);
-void func_100186DC(void *arg0, void *arg1);
-void func_10018790(void *arg0, s32 arg1, u32 arg2, u32 arg3);
-// void func_10019D98(struct26 *arg0, u8 arg1);
-// void func_1001A030(struct26 *arg0, s32 arg1, s32 arg2, u32 arg3);
-// void func_1001A508(struct26 *arg0, struct25 *arg1, s32 arg2, s32 arg3);
+// void n_alSndpSetOutputMode(u8 outputMode);
+void n_alCSeqNewLoopStartMarkers(ALCSeq *seq, ALCSeqMarker *m, u32 markerCount, u32 firstLoopIndex);
+// void n_alCSPApplyChlFilterPitch(struct26 *arg0, u8 arg1);
 //func_1001AAE0
 //func_1001ADA4
 //func_1001AFEC
@@ -1124,7 +1132,8 @@ void func_151D9B8C(u8 arg0, f32 arg1, u8 arg2, s32 arg3, struct17 *arg4, s16 arg
 void func_151DA08C(u8 arg0, f32 arg1, f32 arg2, u8 arg3, s16 arg4, s32 arg5, void *arg6, s32 arg7, s32 arg8);
 void func_151DBCBC(u8 arg0, f32 arg1, s16 arg2, s32 arg3, void *arg4, u8 arg5, s32 arg6);
 void func_151EF954(f32 arg0[4][4], f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7);
-void func_151F3C4C(void);
+void n_alStreamSetReadCallback(s32 (*readCallback)(void *state, void *dst, s32 len, s32 offset));
+s32 n_alStreamRead(void *state, void *dst, s32 len, s32 offset);
 void func_151FA130(void);
 void func_1019EA88(void);
 #endif

conker/include/macro.inc

@@ -15,7 +15,13 @@
     \label:
 .endm
 
+.macro enddlabel label
+.endm
+
 .macro jlabel label
     .global \label
     \label:
 .endm
+
+.macro nonmatching label, size
+.endm

conker/include/structs.h

@@ -270,7 +270,7 @@ typedef struct {
     s32 unk2C;
     s32 unk30;
     s16 unk34;
-    s8  unk36;
+    u8  streamFileGroup;
 } struct24;
 
 struct struct27 {

conker/include/variables.h

@@ -4,6 +4,8 @@
 #include "structs.h"
 #include "sched.h"
 
+struct N_ALStreamState;
+
 /* defined */
 
 // 0x0002C200
@@ -1367,7 +1369,7 @@ extern s32  D_800E0964;
 extern s16  D_800E0968[];
 extern s32  D_800E0990[];
 extern u8   D_800E0A10;
-extern struct186 D_800E0D80; // libaudio struct?
+extern struct N_ALStreamState D_800E0D80;
 
 // end of zero'd out section