Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-28 08:20:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some .cstr loops [Star Fox Assault (GC)]

Browse Source
This commit is contained in:
bnnm 2022-10-29 17:54:39 +02:00
parent bae8e1b06e
commit c9483c8c5b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/meta/cstr.c
View File

@ -3,8 +3,8 @@
/* Cstr - from Namco NuSound v1 games [Mr. Driller (GC), Star Fox Assault (GC), Donkey Konga (GC)] */
VGMSTREAM * init_vgmstream_cstr(STREAMFILE* sf) {
VGMSTREAM * vgmstream = NULL;
VGMSTREAM* init_vgmstream_cstr(STREAMFILE* sf) {
VGMSTREAM* vgmstream = NULL;
off_t start_offset;
size_t interleave, first_skip;
int loop_flag, channels, sample_rate;
@ -12,11 +12,12 @@ VGMSTREAM * init_vgmstream_cstr(STREAMFILE* sf) {
/* checks */
if (!is_id32be(0x00,sf, "Cstr"))
goto fail;
if (!check_extensions(sf,"dsp"))
goto fail;
if (read_u32be(0x00,sf) != 0x43737472) /* "Cstr" */
goto fail;
/* 0x04: version (0x0066 = 0.66 as seen in nus_config .txt) */
interleave = read_u16be(0x06, sf);
@ -31,7 +32,7 @@ VGMSTREAM * init_vgmstream_cstr(STREAMFILE* sf) {
/* next is DSP header, with some oddities:
* - loop flag isn't always set vs Cstr's flag (won't have DSP loop_ps/etc)
* - loop start nibbles can be wrong even with loop flag set
* - loop start can be wrong even with loop flag set; rarely matches Cstr's loop_start [SF Assault (GC)]
* - wonky loop_ps as a result (other fields agree between channels) */
num_samples = read_s32be(0x20 + 0x00, sf);
@ -58,10 +59,8 @@ VGMSTREAM * init_vgmstream_cstr(STREAMFILE* sf) {
else
start_offset += first_skip;
}
if (first_skip > 0 && loop_start >= (interleave - first_skip))
loop_start = loop_start - (interleave - first_skip);
loop_start = loop_start * 2;
loop_start = loop_start * channels;
/* Mr. Driller oddity, unreliable loop flag */
if (loop_end == num_nibbles) {