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

Fix some wwise [Captain America: Super Soldier (X360)]

Browse Source
This commit is contained in:
bnnm 2019-08-10 17:25:15 +02:00
parent bd8dad46df
commit 35c471a9a9
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/meta/wwise.c
View File

@ -303,7 +303,7 @@ VGMSTREAM * init_vgmstream_wwise(STREAMFILE *streamFile) {
cfg.setup_type = WWV_EXTERNAL_CODEBOOKS; /* setup_type will be corrected later */ cfg.setup_type = WWV_EXTERNAL_CODEBOOKS; /* setup_type will be corrected later */
break; break;
case 0x2a: /* uncommon (mid 2011) [inFamous 2 (PS3)] */ case 0x2a: /* uncommon (mid 2011) [inFamous 2 (PS3), Captain America: Super Soldier (X360)] */
data_offsets = 0x10; data_offsets = 0x10;
block_offsets = 0x28; block_offsets = 0x28;
cfg.header_type = WWV_TYPE_2; cfg.header_type = WWV_TYPE_2;
@ -325,6 +325,14 @@ VGMSTREAM * init_vgmstream_wwise(STREAMFILE *streamFile) {
} }
ww.data_size -= audio_offset; ww.data_size -= audio_offset;
/* detect normal packets */
if (vorb_size == 0x2a) {
/* almost all blocksizes are 0x08+0x0B except a few with 0x0a+0x0a [Captain America: Super Soldier (X360) voices/sfx] */
if (cfg.blocksize_0_exp == cfg.blocksize_1_exp)
cfg.packet_type = WWV_STANDARD;
}
/* detect setup type: /* detect setup type:
* - full inline: ~2009, ex. The King of Fighters XII (X360), The Saboteur (PC) * - full inline: ~2009, ex. The King of Fighters XII (X360), The Saboteur (PC)
* - trimmed inline: ~2010, ex. Army of Two: 40 days (X360) some multiplayer files * - trimmed inline: ~2010, ex. Army of Two: 40 days (X360) some multiplayer files
@ -378,11 +386,9 @@ VGMSTREAM * init_vgmstream_wwise(STREAMFILE *streamFile) {
cfg.blocksize_0_exp = read_8bit(extra_offset + block_offsets + 0x01, streamFile); /* big */ cfg.blocksize_0_exp = read_8bit(extra_offset + block_offsets + 0x01, streamFile); /* big */
ww.data_size -= audio_offset; ww.data_size -= audio_offset;
/* Normal packets are used rarely (ex. Oddworld New 'n' Tasty! (PSV)). They are hard to detect (decoding /* detect normal packets */
* will mostly work with garbage results) but we'll try. Setup size and "fmt" bitrate fields may matter too. */
if (ww.extra_size == 0x30) { if (ww.extra_size == 0x30) {
/* all blocksizes I've seen are 0x08+0x0B except Oddworld (PSV), that uses 0x09+0x09 /* almost all blocksizes are 0x08+0x0B except some with 0x09+0x09 [Oddworld New 'n' Tasty! (PSV)] */
* (maybe lower spec machines = needs simpler packets) */
if (cfg.blocksize_0_exp == cfg.blocksize_1_exp) if (cfg.blocksize_0_exp == cfg.blocksize_1_exp)
cfg.packet_type = WWV_STANDARD; cfg.packet_type = WWV_STANDARD;
} }