Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-01-29 19:37:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix VAG interleave in rare cases [The Simpsons Wrestling (PS)]

Browse Source
This commit is contained in:
bnnm 2017-08-28 18:26:55 +02:00
parent 3001b7acba
commit b758e8f60d
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/meta/ps2_vag.c
View File

@ -63,7 +63,11 @@ VGMSTREAM * init_vgmstream_ps2_vag(STREAMFILE *streamFile) {
break; break;
case 'p': /* "VAGp" (extended) [most common, ex Ratchet & Clank] */ case 'p': /* "VAGp" (extended) [most common, ex Ratchet & Clank] */
if ((version <= 0x00000004) && (datasize < filesize / 2)) { /* two VAGp in the same file */ if (read_32bitBE(0x6000,streamFile) == 0x56414770) { /* "VAGp" */
channel_count = 2; /* The Simpsons Wrestling PSX interleave */
loop_flag = 0;
}
else if ((version <= 0x00000004) && (datasize < filesize / 2)) { /* two VAGp in the same file */
if (is_swag) if (is_swag)
loop_flag = vag_find_loop_offsets(streamFile, 0x30, &loopStart, &loopEnd); loop_flag = vag_find_loop_offsets(streamFile, 0x30, &loopStart, &loopEnd);
else else
@ -129,7 +133,15 @@ VGMSTREAM * init_vgmstream_ps2_vag(STREAMFILE *streamFile) {
case 'p': // VAGp case 'p': // VAGp
interleave=0x10; interleave=0x10;
if ((version == 0x00000004) && (datasize < filesize / 2)) { if (read_32bitBE(0x6000,streamFile) == 0x56414770) { /* "VAGp" */
interleave = 0x6000; /* The Simpsons Wrestling PSX interleave, includes header */
vgmstream->layout_type = layout_interleave;
vgmstream->meta_type = meta_PS2_VAGs;
vgmstream->num_samples = datasize / 16 * 28;
start_offset = 0x30;
}
else if ((version == 0x00000004) && (datasize < filesize / 2)) {
vgmstream->channels=2; vgmstream->channels=2;
vgmstream->layout_type=layout_interleave; vgmstream->layout_type=layout_interleave;
vgmstream->meta_type=meta_PS2_VAGs; vgmstream->meta_type=meta_PS2_VAGs;