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

Fix VPK looping [Sly 2: Band of Thieves (PS2)]

Browse Source
This commit is contained in:
bnnm 2019-06-15 13:02:24 +02:00
parent 3267bdd34a
commit 42edcf7524
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/meta/vpk.c
View File

@ -5,7 +5,7 @@
VGMSTREAM * init_vgmstream_ps2_vpk(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_ps2_vpk(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM * vgmstream = NULL;
int loop_flag, channel_count; int loop_flag, channel_count;
off_t start_offset; off_t start_offset, loop_channel_offset;
size_t channel_size; size_t channel_size;
@ -16,13 +16,14 @@ VGMSTREAM * init_vgmstream_ps2_vpk(STREAMFILE *streamFile) {
if (read_32bitBE(0x00,streamFile) != 0x204B5056) /* " KPV" */ if (read_32bitBE(0x00,streamFile) != 0x204B5056) /* " KPV" */
goto fail; goto fail;
/* seems this consistently has 0x10-0x20 extra bytes, landing in garbage frames at the end */ /* seems this consistently has 0x10-0x20 extra bytes, landing in garbage 0xC00000..00 frames at the end */
channel_size = read_32bitLE(0x04,streamFile) - 0x20; /* remove for cleaner ends */ channel_size = read_32bitLE(0x04,streamFile) - 0x20; /* remove for cleaner ends */
start_offset = read_32bitLE(0x08,streamFile); start_offset = read_32bitLE(0x08,streamFile);
channel_count = read_32bitLE(0x14,streamFile); channel_count = read_32bitLE(0x14,streamFile);
/* 0x18+(per channel): channel config? */ /* 0x18+(per channel): channel config(?) */
loop_flag = (read_32bitLE(0x7FC,streamFile) != 0); /* used? */ loop_channel_offset = read_32bitLE(0x7FC,streamFile);
loop_flag = (loop_channel_offset != 0); /* found in Sly 2/3 */
/* build the VGMSTREAM */ /* build the VGMSTREAM */
@ -32,7 +33,7 @@ VGMSTREAM * init_vgmstream_ps2_vpk(STREAMFILE *streamFile) {
vgmstream->sample_rate = read_32bitLE(0x10,streamFile); vgmstream->sample_rate = read_32bitLE(0x10,streamFile);
vgmstream->num_samples = ps_bytes_to_samples(channel_size*vgmstream->channels,vgmstream->channels); vgmstream->num_samples = ps_bytes_to_samples(channel_size*vgmstream->channels,vgmstream->channels);
if (vgmstream->loop_flag) { if (vgmstream->loop_flag) {
vgmstream->loop_start_sample = read_32bitLE(0x7FC,streamFile); vgmstream->loop_start_sample = ps_bytes_to_samples(loop_channel_offset*vgmstream->channels,vgmstream->channels);
vgmstream->loop_end_sample = vgmstream->num_samples; vgmstream->loop_end_sample = vgmstream->num_samples;
} }