PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-02-09 03:37:49 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Its loading without issues finally! But its still broken

Browse Source
This commit is contained in:
KiritoDv 2024-11-03 01:07:44 -06:00
parent 94bc6486eb
commit 2a8ac4891e
13 changed files with 105 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sf64audio_provisional.h
View File

@ -1196,7 +1196,7 @@ extern SequenceLayer gSeqLayers[64];
extern SequenceChannel gSeqChannelNone; extern SequenceChannel gSeqChannelNone;
extern AudioListItem gLayerFreeList; extern AudioListItem gLayerFreeList;
extern NotePool gNoteFreeLists; extern NotePool gNoteFreeLists;
extern Sample* gUsedSamples[128]; extern Sample* gUsedSamples[2048];
extern AudioPreloadReq gPreloadSampleStack[128]; extern AudioPreloadReq gPreloadSampleStack[128];
extern s32 gNumUsedSamples; extern s32 gNumUsedSamples;
extern s32 gPreloadSampleStackTop; extern s32 gPreloadSampleStackTop;

60
src/audio/audio_context.c
View File

@ -46,7 +46,7 @@ SequenceLayer gSeqLayers[64];
SequenceChannel gSeqChannelNone; SequenceChannel gSeqChannelNone;
AudioListItem gLayerFreeList; AudioListItem gLayerFreeList;
NotePool gNoteFreeLists; NotePool gNoteFreeLists;
Sample* gUsedSamples[128]; Sample* gUsedSamples[2048];
AudioPreloadReq gPreloadSampleStack[128]; AudioPreloadReq gPreloadSampleStack[128];
s32 gNumUsedSamples; s32 gNumUsedSamples;
s32 gPreloadSampleStackTop; s32 gPreloadSampleStackTop;
@ -144,91 +144,91 @@ ReverbSettings D_800C76A8[] = {
{ 1, 0x30, 0x4FFF, 0, 0 }, { 1, 0x30, 0x4FFF, 0, 0 },
}; };
AudioSpec gAudioSpecs[] = { AudioSpec gAudioSpecs[] = {
/* 0 */ { 44100, 2, 22, ARRAY_COUNT(D_800C74D0), D_800C74D0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, /* 0 */ { 32000, 2, 22, ARRAY_COUNT(D_800C74D0), D_800C74D0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 1 */ /* 1 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C74E0), D_800C74E0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C74E0), D_800C74E0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 2 */ /* 2 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C74F0), D_800C74F0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C74F0), D_800C74F0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 3 */ /* 3 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C7500), D_800C7500, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C7500), D_800C7500, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 4 */ /* 4 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C7510), D_800C7510, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C7510), D_800C7510, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 5 */ /* 5 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C7520), D_800C7520, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C7520), D_800C7520, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 6 */ /* 6 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C7530), D_800C7530, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C7530), D_800C7530, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 7 */ /* 7 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C7540), D_800C7540, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C7540), D_800C7540, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 8 */ /* 8 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C7550), D_800C7550, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C7550), D_800C7550, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 9 */ /* 9 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C7560), D_800C7560, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C7560), D_800C7560, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 10 */ /* 10 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C7570), D_800C7570, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C7570), D_800C7570, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 11 */ /* 11 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C7580), D_800C7580, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C7580), D_800C7580, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 12 */ /* 12 */
{ 44100, 1, 22, ARRAY_COUNT(D_800C7590), D_800C7590, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x2B000, { 32000, 1, 22, ARRAY_COUNT(D_800C7590), D_800C7590, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x2B000,
0x35000 }, 0x35000 },
/* 13 */ /* 13 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C75A0), D_800C75A0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C75A0), D_800C75A0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 14 */ /* 14 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C75B0), D_800C75B0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C75B0), D_800C75B0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 15 */ /* 15 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C75C0), D_800C75C0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C75C0), D_800C75C0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x34000 }, 0x34000 },
/* 16 */ /* 16 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C75D8), D_800C75D8, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C75D8), D_800C75D8, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 17 */ /* 17 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C75E8), D_800C75E8, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C75E8), D_800C75E8, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 18 */ /* 18 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C75F8), D_800C75F8, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C75F8), D_800C75F8, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 19 */ /* 19 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C7608), D_800C7608, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C7608), D_800C7608, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 20 */ /* 20 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C7618), D_800C7618, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C7618), D_800C7618, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
/* 21 */ /* 21 */
{ 44100, 2, 32, ARRAY_COUNT(D_800C7628), D_800C7628, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 32, ARRAY_COUNT(D_800C7628), D_800C7628, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x00000 }, 0x00000 },
/* 22 */ /* 22 */
{ 44100, 1, 32, ARRAY_COUNT(D_800C7638), D_800C7638, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 1, 32, ARRAY_COUNT(D_800C7638), D_800C7638, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x00000 }, 0x00000 },
/* 23 */ /* 23 */
{ 44100, 1, 32, ARRAY_COUNT(D_800C7648), D_800C7648, 0x7FFF, 0x1200, 0xA000, 0, 0x5B00, 0x1D00, 0, 0x00000, { 32000, 1, 32, ARRAY_COUNT(D_800C7648), D_800C7648, 0x7FFF, 0x1200, 0xA000, 0, 0x5B00, 0x1D00, 0, 0x00000,
0x00000 }, 0x00000 },
/* 24 */ /* 24 */
{ 44100, 1, 22, ARRAY_COUNT(D_800C7658), D_800C7658, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x00000, { 32000, 1, 22, ARRAY_COUNT(D_800C7658), D_800C7658, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x00000,
0x60000 }, 0x60000 },
/* 25 */ /* 25 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C7668), D_800C7668, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C7668), D_800C7668, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x00000 }, 0x00000 },
/* 26 */ /* 26 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C7678), D_800C7678, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C7678), D_800C7678, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x00000 }, 0x00000 },
/* 27 */ /* 27 */
{ 44100, 2, 32, ARRAY_COUNT(D_800C7688), D_800C7688, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 32, ARRAY_COUNT(D_800C7688), D_800C7688, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x00000 }, 0x00000 },
/* 28 */ /* 28 */
{ 44100, 2, 22, ARRAY_COUNT(D_800C74D0), D_800C74D0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000, { 32000, 2, 22, ARRAY_COUNT(D_800C74D0), D_800C74D0, 0x7FFF, 0x1200, 0x1100, 0, 0x5000, 0x2400, 0, 0x1B000,
0x35000 }, 0x35000 },
}; };
s32 D_800C7C28 = 0x20000000; // unused? s32 D_800C7C28 = 0x20000000; // unused?

2
src/audio/audio_effects.c
View File

@ -222,7 +222,7 @@ f32 func_80013B90(AdsrState* adsr) {
adsr->delay = 1; adsr->delay = 1;
} }
adsr->target = (s16)BE16SWAP(adsr->envelope[adsr->envIndex].arg) / 32767.0f; adsr->target = (s16)BSWAP16(adsr->envelope[adsr->envIndex].arg) / 32767.0f;
adsr->target = SQ(adsr->target); adsr->target = SQ(adsr->target);
adsr->velocity = (adsr->target - adsr->current) / adsr->delay; adsr->velocity = (adsr->target - adsr->current) / adsr->delay;
adsr->state = ADSR_STATE_FADE; adsr->state = ADSR_STATE_FADE;

5
src/audio/audio_heap.c
View File

@ -648,9 +648,12 @@ void AudioHeap_Init(void) {
gSampleDmaCount = 0; gSampleDmaCount = 0;
gAudioBufferParams.samplingFrequency = spec->samplingFrequency; gAudioBufferParams.samplingFrequency = spec->samplingFrequency;
gAudioBufferParams.aiSamplingFrequency = osAiSetFrequency(gAudioBufferParams.samplingFrequency); gAudioBufferParams.aiSamplingFrequency = 32000;
gAudioBufferParams.samplesPerFrameTarget = ALIGN16(gAudioBufferParams.samplingFrequency / gRefreshRate); gAudioBufferParams.samplesPerFrameTarget = ALIGN16(gAudioBufferParams.samplingFrequency / gRefreshRate);
printf("aiSamplingFrequency %d\n", gAudioBufferParams.aiSamplingFrequency);
printf("samplesPerFrameTarget %d\n", gAudioBufferParams.samplesPerFrameTarget);
gAudioBufferParams.minAiBufferLength = gAudioBufferParams.samplesPerFrameTarget - 0x10; gAudioBufferParams.minAiBufferLength = gAudioBufferParams.samplesPerFrameTarget - 0x10;
gAudioBufferParams.maxAiBufferLength = gAudioBufferParams.samplesPerFrameTarget + 0x10; gAudioBufferParams.maxAiBufferLength = gAudioBufferParams.samplesPerFrameTarget + 0x10;

5
src/audio/audio_load.c
View File

@ -520,6 +520,7 @@ void* AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) {
return Audio_LoadBlob(gAudioSeq, table->entries[id].romAddr); return Audio_LoadBlob(gAudioSeq, table->entries[id].romAddr);
case FONT_TABLE: case FONT_TABLE:
gFontLoadStatus[id] = LOAD_STATUS_COMPLETE; gFontLoadStatus[id] = LOAD_STATUS_COMPLETE;
printf("fontId: %d\n", id);
return Audio_LoadFont(table->entries[id]); return Audio_LoadFont(table->entries[id]);
case SAMPLE_TABLE: case SAMPLE_TABLE:
loadStatus = 0; loadStatus = 0;
@ -604,6 +605,7 @@ void AudioLoad_RelocateFont(s32 fontId, uintptr_t fontBaseAddr, SampleBankRelocI
// } // }
// } // }
AudioTable* table = AudioLoad_GetLoadTable(FONT_TABLE); AudioTable* table = AudioLoad_GetLoadTable(FONT_TABLE);
printf("fontId: %d\n", fontId);
SoundFont* font = Audio_LoadFont(table->entries[fontId]); SoundFont* font = Audio_LoadFont(table->entries[fontId]);
gSoundFontList[fontId].drums = font->drums; gSoundFontList[fontId].drums = font->drums;
@ -707,6 +709,7 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData,
return Audio_LoadBlob(gAudioSeq, table->entries[id].romAddr); return Audio_LoadBlob(gAudioSeq, table->entries[id].romAddr);
case FONT_TABLE: case FONT_TABLE:
gFontLoadStatus[id] = LOAD_STATUS_COMPLETE; gFontLoadStatus[id] = LOAD_STATUS_COMPLETE;
printf("fontId: %d\n", id);
return Audio_LoadFont(table->entries[id]); return Audio_LoadFont(table->entries[id]);
case SAMPLE_TABLE: case SAMPLE_TABLE:
gSampleFontLoadStatus[id] = LOAD_STATUS_COMPLETE; gSampleFontLoadStatus[id] = LOAD_STATUS_COMPLETE;
@ -1259,7 +1262,7 @@ s32 AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, uintptr_t fontDataAddr,
s32 inProgress; s32 inProgress;
isAsync = 0; isAsync = 0;
printf("Relocating font %d\n", fontId); // printf("Relocating font %d\n", fontId);
inProgress = false; inProgress = false;
if (gPreloadSampleStackTop != 0) { if (gPreloadSampleStackTop != 0) {
inProgress = true; inProgress = true;

17
src/audio/audio_playback.c
View File

@ -1,5 +1,6 @@
#include "sys.h" #include "sys.h"
#include "sf64audio_provisional.h" #include "sf64audio_provisional.h"
#include "port/resource/loaders/AudioLoader.h"
static const char devstr00[] = "Audio: setvol: volume minus %f\n"; static const char devstr00[] = "Audio: setvol: volume minus %f\n";
static const char devstr01[] = "Audio: setvol: volume overflow %f\n"; static const char devstr01[] = "Audio: setvol: volume overflow %f\n";
@ -168,6 +169,11 @@ TunedSample* func_80011D10(Instrument* instrument, s32 arg1) {
Instrument* Audio_GetInstrument(s32 fontId, s32 instId) { Instrument* Audio_GetInstrument(s32 fontId, s32 instId) {
Instrument* instrument; Instrument* instrument;
// LTODO: Remove this
if(gSoundFontList[fontId].instruments == NULL){
gSoundFontList[fontId] = *Audio_LoadFont(gSoundFontTable->entries[fontId]);
}
if ((gFontLoadStatus[fontId] < 2) != 0) { if ((gFontLoadStatus[fontId] < 2) != 0) {
D_80155D88 = fontId + 0x10000000; D_80155D88 = fontId + 0x10000000;
return NULL; return NULL;
@ -187,6 +193,11 @@ Instrument* Audio_GetInstrument(s32 fontId, s32 instId) {
Drum* Audio_GetDrum(s32 fontId, s32 drumId) { Drum* Audio_GetDrum(s32 fontId, s32 drumId) {
Drum* drum; Drum* drum;
// LTODO: Remove this
if(gSoundFontList[fontId].drums == NULL){
gSoundFontList[fontId] = *Audio_LoadFont(gSoundFontTable->entries[fontId]);
}
if ((gFontLoadStatus[fontId] < 2) != 0) { if ((gFontLoadStatus[fontId] < 2) != 0) {
D_80155D88 = fontId + 0x10000000; D_80155D88 = fontId + 0x10000000;
return NULL; return NULL;
@ -195,9 +206,9 @@ Drum* Audio_GetDrum(s32 fontId, s32 drumId) {
D_80155D88 = (fontId << 8) + drumId + 0x04000000; D_80155D88 = (fontId << 8) + drumId + 0x04000000;
return NULL; return NULL;
} }
if ((u32) gSoundFontList[fontId].drums < AUDIO_RELOCATED_ADDRESS_START) { // if ((u32) gSoundFontList[fontId].drums < AUDIO_RELOCATED_ADDRESS_START) {
return NULL; // return NULL;
} // }
drum = gSoundFontList[fontId].drums[drumId]; drum = gSoundFontList[fontId].drums[drumId];
if (gSoundFontList[fontId].drums[drumId] == NULL) { if (gSoundFontList[fontId].drums[drumId] == NULL) {
D_80155D88 = (fontId << 8) + drumId + 0x05000000; D_80155D88 = (fontId << 8) + drumId + 0x05000000;

11
src/audio/audio_synthesis.c
View File

@ -644,12 +644,12 @@ Acmd* func_80009B64(Acmd* aList, s32* cmdCount, s16* aiBufStart, s32 aiBufLen) {
} }
aiBufPtr = (s32*) aiBufStart; aiBufPtr = (s32*) aiBufStart;
for (i = gAudioBufferParams.ticksPerUpdate; i > 0; i--) { for (i = gAudioBufferParams.ticksPerUpdate - 1; i > 0; i--) {
if (i == 1) { if (i == 1) {
chunkLen = aiBufLen; chunkLen = aiBufLen;
} else if ((aiBufLen / i) >= gAudioBufferParams.samplesPerTickMax) { } else if ((aiBufLen / i) >= gAudioBufferParams.samplesPerTickMax) {
chunkLen = gAudioBufferParams.samplesPerTickMax; chunkLen = gAudioBufferParams.samplesPerTickMax;
} else if ((aiBufLen / i) <= gAudioBufferParams.samplesPerTickMin) { } else if (gAudioBufferParams.samplesPerTickMin >= (aiBufLen / i)) {
chunkLen = gAudioBufferParams.samplesPerTickMin; chunkLen = gAudioBufferParams.samplesPerTickMin;
} else { } else {
chunkLen = gAudioBufferParams.samplesPerTick; chunkLen = gAudioBufferParams.samplesPerTick;
@ -1003,12 +1003,13 @@ Acmd* func_8000A700(s32 noteIndex, NoteSubEu* noteSub, NoteSynthesisState* synth
aligned = ALIGN16(nFramesToDecode * frameSize + 0x10); aligned = ALIGN16(nFramesToDecode * frameSize + 0x10);
addr = 0x990 - aligned; addr = 0x990 - aligned;
if (nFramesToDecode != 0) { if (nFramesToDecode != 0) {
// LTODO: Validate this
// bookSample->medium = 0;
frameIndex = (synthState->samplePosInt + skipInitialSamples - nFirstFrameSamplesToIgnore) / 16; frameIndex = (synthState->samplePosInt + skipInitialSamples - nFirstFrameSamplesToIgnore) / 16;
sampleDataOffset = frameIndex * frameSize; sampleDataOffset = frameIndex * frameSize;
// LTODO: Validate this
bookSample->medium = 0;
if (bookSample->medium == 0) { if (bookSample->medium == 0) {
sampleData = sampleAddr + sampleDataOffset; //sampleDmaStart + sampleAddr; sampleData = sampleDmaStart + sampleDataOffset + sampleAddr;
} else { } else {
sampleData = AudioLoad_DmaSampleData(sampleDmaStart + sampleDataOffset + sampleAddr, aligned, sampleData = AudioLoad_DmaSampleData(sampleDmaStart + sampleDataOffset + sampleAddr, aligned,
flags, &synthState->sampleDmaIndex, bookSample->medium); flags, &synthState->sampleDmaIndex, bookSample->medium);

4
src/audio/audio_thread.c
View File

@ -47,8 +47,8 @@ void AudioThread_CreateNextAudioBuffer(s16 *samples, u32 num_samples) {
OSMesg msg; OSMesg msg;
gCurAudioFrameDmaCount = 0; gCurAudioFrameDmaCount = 0;
// AudioLoad_DecreaseSampleDmaTtls(); AudioLoad_DecreaseSampleDmaTtls();
// AudioLoad_ProcessLoads(gAudioResetStep); AudioLoad_ProcessLoads(gAudioResetStep);
if (MQ_GET_MESG(gAudioSpecQueue, &specId)) { if (MQ_GET_MESG(gAudioSpecQueue, &specId)) {
if (gAudioResetStep == 0) { if (gAudioResetStep == 0) {

8
src/audio/note_data.c
View File

@ -200,10 +200,10 @@ u8 gDefaultShortNoteGateTimeTable[] = {
}; };
EnvelopePoint gDefaultEnvelope[] = { EnvelopePoint gDefaultEnvelope[] = {
{ 4, 32000 }, { BE16SWAP_CONST(4), BE16SWAP_CONST(32000) },
{ 1000, 32000 }, { BE16SWAP_CONST(1000), BE16SWAP_CONST(32000) },
{ ADSR_HANG, 0 }, { BE16SWAP_CONST(ADSR_HANG), 0 },
{ ADSR_DISABLE, 0 }, { BE16SWAP_CONST(ADSR_DISABLE), 0 },
}; };
NoteSubEu gZeroNoteSub = { 0 }; NoteSubEu gZeroNoteSub = { 0 };

2
src/port/Engine.cpp
View File

@ -66,7 +66,7 @@ GameEngine::GameEngine() {
} }
} }
this->context = Ship::Context::CreateInstance("Starship", "ship", "starship.cfg.json", OTRFiles, {}, 3, { 44100, 1024, 2480 }); this->context = Ship::Context::CreateInstance("Starship", "ship", "starship.cfg.json", OTRFiles, {}, 3, { 32000, 512, 1100 });
auto loader = context->GetResourceManager()->GetResourceLoader(); auto loader = context->GetResourceManager()->GetResourceLoader();
loader->RegisterResourceFactory(std::make_shared<SF64::ResourceFactoryBinaryAnimV0>(), RESOURCE_FORMAT_BINARY, "Animation", static_cast<uint32_t>(SF64::ResourceType::AnimData), 0); loader->RegisterResourceFactory(std::make_shared<SF64::ResourceFactoryBinaryAnimV0>(), RESOURCE_FORMAT_BINARY, "Animation", static_cast<uint32_t>(SF64::ResourceType::AnimData), 0);

65
src/port/resource/loaders/AudioLoader.cpp
View File

@ -6,10 +6,11 @@
#include <vector> #include <vector>
#include <fstream> #include <fstream>
#include <filesystem> #include <filesystem>
#include "test.c"
namespace fs = std::filesystem; namespace fs = std::filesystem;
Ship::BinaryReader Audio_MakeReader(const char* resource, u32 offset = 0){ Ship::BinaryReader Audio_MakeReader(const char* resource, u32 offset){
auto data = (char*)ResourceGetDataByName(resource); auto data = (char*)ResourceGetDataByName(resource);
auto size = ResourceGetSizeByName(resource); auto size = ResourceGetSizeByName(resource);
@ -59,20 +60,21 @@ extern "C" SoundFont* Audio_LoadFont(AudioTableEntry entry) {
font->instruments = memallocn(Instrument*, font->numInstruments); font->instruments = memallocn(Instrument*, font->numInstruments);
font->drums = memallocn(Drum*, font->numDrums); font->drums = memallocn(Drum*, font->numDrums);
uint32_t drumBaseAddr = entry.romAddr + reader.ReadUInt32(); uint32_t drumBaseAddr = reader.ReadUInt32();
uint32_t instBaseAddr = 4; uint32_t instBaseAddr = 4;
if(font->drums != nullptr && drumBaseAddr != 0){ if(font->drums != nullptr && drumBaseAddr != 0){
reader.Seek(drumBaseAddr, Ship::SeekOffsetType::Start); reader.Seek(entry.romAddr + drumBaseAddr, Ship::SeekOffsetType::Start);
for(size_t i = 0; i < font->numDrums; i++){ for(size_t i = 0; i < font->numDrums; i++){
font->drums[i] = Audio_LoadDrum(entry.romAddr + reader.ReadUInt32(), entry.romAddr, font->sampleBankId1); font->drums[i] = Audio_LoadDrum(reader.ReadUInt32(), entry, font->sampleBankId1);
} }
} }
if(font->instruments != nullptr){ if(font->instruments != nullptr){
reader.Seek(instBaseAddr, Ship::SeekOffsetType::Start); reader.Seek(entry.romAddr + instBaseAddr, Ship::SeekOffsetType::Start);
for(size_t i = 1; i < font->numInstruments; i++){ for(size_t i = 0; i < font->numInstruments; i++){
font->instruments[i] = Audio_LoadInstrument(reader.ReadUInt32(), font->sampleBankId1); u32 instAddr = reader.ReadUInt32();
font->instruments[i] = Audio_LoadInstrument(instAddr, entry, font->sampleBankId1);
} }
} }
@ -119,19 +121,22 @@ extern "C" AdpcmBook* Audio_LoadBook(uint32_t addr) {
return book; return book;
} }
Sample* Audio_LoadSample(uint32_t sampleAddr, uint32_t baseAddr = 0, uint32_t sampleBankID = 0) { Sample* Audio_LoadSample(uint32_t sampleAddr, AudioTableEntry entry, uint32_t sampleBankID) {
auto reader = Audio_MakeReader(gAudioBank, sampleAddr); auto reader = Audio_MakeReader(gAudioBank, entry.romAddr + sampleAddr);
Sample* sample = memalloc(Sample); Sample* sample = memalloc(Sample);
sample->size = reader.ReadUInt32(); uint32_t flags = reader.ReadUInt32();
sample->codec = (flags >> 28) & 0x0F;
sample->medium = MEDIUM_RAM; // (flags >> 24) & 0x03;
sample->unk_bit26 = (flags >> 22) & 0x01;
sample->size = flags;
uint32_t addr = reader.ReadUInt32(); uint32_t addr = reader.ReadUInt32();
sample->loop = Audio_LoadLoop(baseAddr + reader.ReadUInt32()); sample->loop = Audio_LoadLoop(entry.romAddr + reader.ReadUInt32());
sample->book = Audio_LoadBook(baseAddr + reader.ReadUInt32()); sample->book = Audio_LoadBook(entry.romAddr + reader.ReadUInt32());
sample->isRelocated = 1; sample->isRelocated = 1;
sample->sampleAddr = (uint8_t*) Audio_LoadBlob(gAudioTable, gSampleBankTable->entries[sampleBankID].romAddr + addr); sample->sampleAddr = (uint8_t*) Audio_LoadBlob(gAudioTable, gSampleBankTable->entries[sampleBankID].romAddr + addr);
std::filesystem::path path{ "dumps/" + std::to_string(sampleAddr) + ".raw" }; std::filesystem::path path{ "dumps/" + std::to_string(addr) + ".raw" };
std::ofstream ofs(path); std::ofstream ofs(path);
ofs.write(reinterpret_cast<const char*>(sample->sampleAddr), sample->size); ofs.write(reinterpret_cast<const char*>(sample->sampleAddr), sample->size);
ofs.close(); ofs.close();
@ -140,8 +145,8 @@ Sample* Audio_LoadSample(uint32_t sampleAddr, uint32_t baseAddr = 0, uint32_t sa
return sample; return sample;
} }
TunedSample Audio_LoadTunedSample(uint32_t addr, uint32_t baseAddr = 0, uint32_t sampleBankID = 0) { TunedSample Audio_LoadTunedSample(uint32_t addr, AudioTableEntry entry, uint32_t sampleBankID) {
auto reader = Audio_MakeReader(gAudioBank, addr); auto reader = Audio_MakeReader(gAudioBank, entry.romAddr + addr);
auto sampleAddr = reader.ReadUInt32(); auto sampleAddr = reader.ReadUInt32();
auto tuning = reader.ReadFloat(); auto tuning = reader.ReadFloat();
@ -151,39 +156,34 @@ TunedSample Audio_LoadTunedSample(uint32_t addr, uint32_t baseAddr = 0, uint32_t
} }
return { return {
.sample = Audio_LoadSample(baseAddr + sampleAddr, baseAddr, sampleBankID), .sample = Audio_LoadSample(sampleAddr, entry, sampleBankID),
.tuning = tuning .tuning = tuning
}; };
} }
extern "C" Instrument* Audio_LoadInstrument(uint32_t addr, uint32_t sampleBankID) { extern "C" Instrument* Audio_LoadInstrument(uint32_t addr, AudioTableEntry entry, uint32_t sampleBankID) {
if (addr == 0) { if (addr == 0) {
return nullptr; return nullptr;
} }
auto reader = Audio_MakeReader(gAudioBank, addr); auto reader = Audio_MakeReader(gAudioBank, entry.romAddr + addr);
Instrument* instrument = memalloc(Instrument); Instrument* instrument = memalloc(Instrument);
instrument->isRelocated = reader.ReadUByte(); instrument->isRelocated = reader.ReadUByte();
instrument->normalRangeLo = reader.ReadUByte(); instrument->normalRangeLo = reader.ReadUByte();
instrument->normalRangeHi = reader.ReadUByte(); instrument->normalRangeHi = reader.ReadUByte();
instrument->adsrDecayIndex = reader.ReadUByte(); instrument->adsrDecayIndex = reader.ReadUByte();
instrument->envelope = Audio_LoadEnvelope(reader.ReadUInt32()); instrument->envelope = Audio_LoadEnvelope(entry.romAddr + reader.ReadUInt32());
instrument->lowPitchTunedSample = Audio_LoadTunedSample(addr + 8, 0, sampleBankID); instrument->lowPitchTunedSample = Audio_LoadTunedSample(addr + 8, entry, sampleBankID);
instrument->normalPitchTunedSample = Audio_LoadTunedSample(addr + 16, 0, sampleBankID); instrument->normalPitchTunedSample = Audio_LoadTunedSample(addr + 16, entry, sampleBankID);
instrument->highPitchTunedSample = Audio_LoadTunedSample(addr + 24, 0, sampleBankID); instrument->highPitchTunedSample = Audio_LoadTunedSample(addr + 24, entry, sampleBankID);
instrument->isRelocated = 1; instrument->isRelocated = 1;
return instrument; return instrument;
} }
extern "C" Drum* Audio_LoadDrum(uint32_t addr, uint32_t baseAddr, uint32_t sampleBankID) { extern "C" Drum* Audio_LoadDrum(uint32_t addr, AudioTableEntry entry, uint32_t sampleBankID) {
auto reader = Audio_MakeReader(gAudioBank, entry.romAddr + addr);
if(baseAddr != 0 && addr >= baseAddr){
return nullptr;
}
auto reader = Audio_MakeReader(gAudioBank, addr);
Drum* drum = memalloc(Drum); Drum* drum = memalloc(Drum);
drum->adsrDecayIndex = reader.ReadInt8(); drum->adsrDecayIndex = reader.ReadInt8();
@ -192,10 +192,9 @@ extern "C" Drum* Audio_LoadDrum(uint32_t addr, uint32_t baseAddr, uint32_t sampl
reader.ReadUByte(); reader.ReadUByte();
drum->isRelocated = 1; drum->isRelocated = 1;
drum->tunedSample = Audio_LoadTunedSample(addr + 4, entry, sampleBankID);
drum->tunedSample = Audio_LoadTunedSample(addr + 4, baseAddr, sampleBankID);
reader.Seek(0x8, Ship::SeekOffsetType::Current); reader.Seek(0x8, Ship::SeekOffsetType::Current);
drum->envelope = Audio_LoadEnvelope(reader.ReadUInt32()); drum->envelope = Audio_LoadEnvelope(entry.romAddr + reader.ReadUInt32());
return drum; return drum;
} }

6
src/port/resource/loaders/AudioLoader.h
View File

@ -10,9 +10,9 @@ extern "C" {
char* Audio_LoadBlob(const char* resource, u32 offset); char* Audio_LoadBlob(const char* resource, u32 offset);
AdpcmBook* Audio_LoadBook(uint32_t addr); AdpcmBook* Audio_LoadBook(uint32_t addr);
AdpcmLoop* Audio_LoadLoop(uint32_t addr); AdpcmLoop* Audio_LoadLoop(uint32_t addr);
Instrument* Audio_LoadInstrument(uint32_t addr, uint32_t sampleBankID); Instrument* Audio_LoadInstrument(uint32_t addr, AudioTableEntry entry, uint32_t sampleBankID);
Drum* Audio_LoadDrum(uint32_t addr, uint32_t baseAddr, uint32_t sampleBankID); Drum* Audio_LoadDrum(uint32_t addr, AudioTableEntry entry, uint32_t sampleBankID);
Sample* Audio_LoadSample(uint32_t addr, uint32_t sampleBankID); Sample* Audio_LoadSample(uint32_t addr, AudioTableEntry entry, uint32_t sampleBankID);
SoundFont* Audio_LoadFont(AudioTableEntry entry); SoundFont* Audio_LoadFont(AudioTableEntry entry);
#ifdef __cplusplus #ifdef __cplusplus

3
src/port/resource/loaders/test.c Normal file
View File

File diff suppressed because one or more lines are too long