Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-01-18 07:44:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix FSB5 bank loops in some subsongs

Browse Source
This commit is contained in:
bnnm 2019-11-11 22:35:45 +01:00
parent 523b59b2ba
commit 533e787cf6
1 changed files with 81 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
src/meta/fsb5.c
View File

@ -82,7 +82,7 @@ VGMSTREAM * init_vgmstream_fsb5(STREAMFILE *streamFile) {
/* find target stream header and data offset, and read all needed values for later use /* find target stream header and data offset, and read all needed values for later use
* (reads one by one as the size of a single stream header is variable) */ * (reads one by one as the size of a single stream header is variable) */
for (i = 1; i <= fsb5.total_subsongs; i++) { for (i = 0; i < fsb5.total_subsongs; i++) {
size_t stream_header_size = 0; size_t stream_header_size = 0;
off_t data_offset = 0; off_t data_offset = 0;
uint32_t sample_mode1, sample_mode2; /* maybe one uint64? */ uint32_t sample_mode1, sample_mode2; /* maybe one uint64? */
@ -138,77 +138,83 @@ VGMSTREAM * init_vgmstream_fsb5(STREAMFILE *streamFile) {
extraflag_size = (extraflag >> 1) & 0xFFFFFF; /* bits 25..1 (24)*/ extraflag_size = (extraflag >> 1) & 0xFFFFFF; /* bits 25..1 (24)*/
extraflag_end = (extraflag & 0x01); /* bit 0 (1) */ extraflag_end = (extraflag & 0x01); /* bit 0 (1) */
switch(extraflag_type) { /* parse target only, as flags change between subsongs */
case 0x01: /* channels */ if (i + 1 == target_subsong) {
fsb5.channels = read_8bit(extraflag_offset+0x04,streamFile); switch(extraflag_type) {
break; case 0x01: /* channels */
case 0x02: /* sample rate */ fsb5.channels = read_8bit(extraflag_offset+0x04,streamFile);
fsb5.sample_rate = read_32bitLE(extraflag_offset+0x04,streamFile); break;
break; case 0x02: /* sample rate */
case 0x03: /* loop info */ fsb5.sample_rate = read_32bitLE(extraflag_offset+0x04,streamFile);
fsb5.loop_start = read_32bitLE(extraflag_offset+0x04,streamFile); break;
if (extraflag_size > 0x04) { /* probably not needed */ case 0x03: /* loop info */
fsb5.loop_end = read_32bitLE(extraflag_offset+0x08,streamFile); fsb5.loop_start = read_32bitLE(extraflag_offset+0x04,streamFile);
fsb5.loop_end += 1; /* correct compared to FMOD's tools */ if (extraflag_size > 0x04) { /* probably not needed */
} fsb5.loop_end = read_32bitLE(extraflag_offset+0x08,streamFile);
fsb5.loop_end += 1; /* correct compared to FMOD's tools */
/* autodetect unwanted loops */
{
/* like FSB4 jingles/sfx/music do full loops for no reason, but happens a lot less.
* Most songs loop normally now with proper values [ex. Shantae, FFX] */
int full_loop, ajurika_loops;
/* could use the same checks as FSB4 but simplified (ex. Sonic Boom Fire & Ice jingles) */
full_loop = fsb5.loop_start != 0x00;
/* wrong values in some files [Pac-Man CE2 Plus (Switch) pce2p_bgm_ajurika_*.fsb] */
ajurika_loops = fsb5.loop_start == 0x3c && fsb5.loop_end == 0x007F007F &&
fsb5.num_samples > fsb5.loop_end + 100000; /* arbitrary limit */
//;VGM_LOG("FSB5: loop start=%i, loop end=%i, samples=%i\n", fsb5.loop_start, fsb5.loop_end, fsb5.num_samples);
fsb5.loop_flag = 1;
if (!full_loop || ajurika_loops) {
VGM_LOG("FSB5: disabled unwanted loop\n");
fsb5.loop_flag = 0;
} }
} //;VGM_LOG("FSB5: stream %i loop start=%i, loop end=%i, samples=%i\n", i, fsb5.loop_start, fsb5.loop_end, fsb5.num_samples);
break;
case 0x04: /* free comment, or maybe SFX info */ /* autodetect unwanted loops */
break; {
case 0x05: /* unknown 32b */ //todo multistream marker? /* like FSB4 jingles/sfx/music do full loops for no reason, but happens a lot less.
/* found in Tearaway Vita, value 0, first stream only */ * Most songs loop normally now with proper values [ex. Shantae, FFX] */
VGM_LOG("FSB5: flag %x with value %08x\n", extraflag_type, read_32bitLE(extraflag_offset+0x04,streamFile)); int full_loop, ajurika_loops, is_small;
break;
case 0x06: /* XMA seek table */ /* disable some jingles, it's even possible one jingle (StingerA Var1) to not have loops
/* no need for it */ * and next one (StingerA Var2) do [Sonic Boom Fire & Ice (3DS)] */
break; full_loop = fsb5.loop_start == 0 && fsb5.loop_end + 20 >= fsb5.num_samples; /* around ~15 samples less */
case 0x07: /* DSP coefs */ /* a few longer Sonic songs shouldn't repeat, may add if other games need it */
fsb5.extradata_offset = extraflag_offset + 0x04; is_small = 0; //fsb5.num_samples < 20 * fsb5.sample_rate;
break;
case 0x09: /* ATRAC9 config */ /* wrong values in some files [Pac-Man CE2 Plus (Switch) pce2p_bgm_ajurika_*.fsb] */
fsb5.extradata_offset = extraflag_offset + 0x04; ajurika_loops = fsb5.loop_start == 0x3c && fsb5.loop_end == 0x007F007F &&
fsb5.extradata_size = extraflag_size; fsb5.num_samples > fsb5.loop_end + 10000; /* arbitrary test in case some game does have those */
break;
case 0x0a: /* XWMA config */ fsb5.loop_flag = 1;
fsb5.extradata_offset = extraflag_offset + 0x04; if ((full_loop && is_small) || ajurika_loops) {
break; VGM_LOG("FSB5: stream %i disabled unwanted loop ls=%i, le=%i, ns=%i\n", i, fsb5.loop_start, fsb5.loop_end, fsb5.num_samples);
case 0x0b: /* Vorbis setup ID and seek table */ fsb5.loop_flag = 0;
fsb5.extradata_offset = extraflag_offset + 0x04; }
/* seek table format: }
* 0x08: table_size (total_entries = seek_table_size / (4+4)), not counting this value; can be 0 break;
* 0x0C: sample number (only some samples are saved in the table) case 0x04: /* free comment, or maybe SFX info */
* 0x10: offset within data, pointing to a FSB vorbis block (with the 16b block size header) break;
* (xN entries) case 0x05: /* unknown 32b */
*/ /* rare, found in Tearaway (Vita) with value 0 in first stream and
break; * Shantae and the Seven Sirens (Mobile) with value 0x0003bd72 BE in #44 (Arena Town) */
case 0x0d: /* unknown 32b (config? usually 0x3fnnnn00 BE) */ VGM_LOG("FSB5: stream %i flag %x with value %08x\n", i, extraflag_type, read_32bitLE(extraflag_offset+0x04,streamFile));
/* found in some XMA2/Vorbis/FADPCM */ break;
VGM_LOG("FSB5: flag %x with value %08x\n", extraflag_type, read_32bitLE(extraflag_offset+0x04,streamFile)); case 0x06: /* XMA seek table */
break; /* no need for it */
default: break;
VGM_LOG("FSB5: unknown extraflag 0x%x at %x + 0x04 (size 0x%x)\n", extraflag_type, (uint32_t)extraflag_offset, extraflag_size); case 0x07: /* DSP coefs */
break; fsb5.extradata_offset = extraflag_offset + 0x04;
break;
case 0x09: /* ATRAC9 config */
fsb5.extradata_offset = extraflag_offset + 0x04;
fsb5.extradata_size = extraflag_size;
break;
case 0x0a: /* XWMA config */
fsb5.extradata_offset = extraflag_offset + 0x04;
break;
case 0x0b: /* Vorbis setup ID and seek table */
fsb5.extradata_offset = extraflag_offset + 0x04;
/* seek table format:
* 0x08: table_size (total_entries = seek_table_size / (4+4)), not counting this value; can be 0
* 0x0C: sample number (only some samples are saved in the table)
* 0x10: offset within data, pointing to a FSB vorbis block (with the 16b block size header)
* (xN entries)
*/
break;
case 0x0d: /* unknown 32b (config? usually 0x3fnnnn00 BE and sometimes 0x3dnnnn00 BE) */
/* found in some XMA2/Vorbis/FADPCM */
VGM_LOG("FSB5: stream %i flag %x with value %08x\n", i, extraflag_type, read_32bitLE(extraflag_offset+0x04,streamFile));
break;
default:
VGM_LOG("FSB5: stream %i unknown flag 0x%x at %x + 0x04 (size 0x%x)\n", i, extraflag_type, (uint32_t)extraflag_offset, extraflag_size);
break;
}
} }
extraflag_offset += 0x04 + extraflag_size; extraflag_offset += 0x04 + extraflag_size;
@ -216,12 +222,12 @@ VGMSTREAM * init_vgmstream_fsb5(STREAMFILE *streamFile) {
} while (extraflag_end != 0x00); } while (extraflag_end != 0x00);
} }
/* stream found */ /* target found */
if (i == target_subsong) { if (i + 1 == target_subsong) {
fsb5.stream_offset = fsb5.base_header_size + fsb5.sample_header_size + fsb5.name_table_size + data_offset; fsb5.stream_offset = fsb5.base_header_size + fsb5.sample_header_size + fsb5.name_table_size + data_offset;
/* get stream size from next stream offset or full size if there is only one */ /* get stream size from next stream offset or full size if there is only one */
if (i == fsb5.total_subsongs) { if (i + 1 == fsb5.total_subsongs) {
fsb5.stream_size = fsb5.sample_data_size - data_offset; fsb5.stream_size = fsb5.sample_data_size - data_offset;
} }
else { else {
@ -237,7 +243,7 @@ VGMSTREAM * init_vgmstream_fsb5(STREAMFILE *streamFile) {
break; break;
} }
/* continue searching */ /* continue searching target */
fsb5.sample_header_offset += stream_header_size; fsb5.sample_header_offset += stream_header_size;
} }
/* target stream not found*/ /* target stream not found*/