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

Sony BNK: cleanup/skip processing SBlk for ZLSD streams

Browse Source
This commit is contained in:
EdnessP 2024-09-08 10:36:00 +03:00
parent 9413f6f8dc
commit 17afd78304
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/meta/bnk_sony.c
View File

@ -159,7 +159,7 @@ VGMSTREAM* init_vgmstream_bnk_sony(STREAMFILE* sf) {
temp_vs->num_streams = vgmstream->num_streams; temp_vs->num_streams = vgmstream->num_streams;
//temp_vs->stream_size = vgmstream->stream_size; //temp_vs->stream_size = vgmstream->stream_size;
temp_vs->meta_type = vgmstream->meta_type; temp_vs->meta_type = vgmstream->meta_type;
//strcpy(temp_vs->stream_name, vgmstream->stream_name); strcpy(temp_vs->stream_name, vgmstream->stream_name);
close_vgmstream(vgmstream); close_vgmstream(vgmstream);
return temp_vs; return temp_vs;
@ -532,6 +532,10 @@ static bool process_headers(STREAMFILE* sf, bnk_header_t* h) {
//;VGM_LOG("BNK: header entry at %x\n", h->table3_offset + h->table3_entry_offset); //;VGM_LOG("BNK: header entry at %x\n", h->table3_offset + h->table3_entry_offset);
/* is currently working on ZLSD streams */
if (h->zlsd_offset && h->target_subsong > h->total_subsongs)
return true;
sndh_offset = h->table3_offset + h->table3_entry_offset; sndh_offset = h->table3_offset + h->table3_entry_offset;
/* parse sounds */ /* parse sounds */
@ -636,6 +640,10 @@ static bool process_names(STREAMFILE* sf, bnk_header_t* h) {
if (h->table4_offset <= h->sblk_offset) if (h->table4_offset <= h->sblk_offset)
return true; return true;
/* is currently working on ZLSD streams */
if (h->zlsd_offset && h->target_subsong > h->total_subsongs)
return true;
int i; int i;
int table4_entry_id = -1; int table4_entry_id = -1;
uint32_t table4_entry_idx, table4_entries_offset, table4_names_offset; uint32_t table4_entry_idx, table4_entries_offset, table4_names_offset;
@ -791,6 +799,10 @@ static bool process_data(STREAMFILE* sf, bnk_header_t* h) {
read_s32_t read_s32 = h->big_endian ? read_s32be : read_s32le; read_s32_t read_s32 = h->big_endian ? read_s32be : read_s32le;
read_u64_t read_u64 = h->big_endian ? read_u64be : read_u64le; read_u64_t read_u64 = h->big_endian ? read_u64be : read_u64le;
/* is currently working on ZLSD streams */
if (h->zlsd_offset && h->target_subsong > h->total_subsongs)
return true;
int subtype, loop_length; int subtype, loop_length;
uint32_t extradata_size = 0, postdata_size = 0; uint32_t extradata_size = 0, postdata_size = 0;
uint32_t stream_name_size, stream_name_offset; uint32_t stream_name_size, stream_name_offset;
@ -1104,8 +1116,7 @@ static bool process_data(STREAMFILE* sf, bnk_header_t* h) {
read_string(h->stream_name, stream_name_size, stream_name_offset, sf); read_string(h->stream_name, stream_name_size, stream_name_offset, sf);
/* the stream name likely has to be hashed and that can be used to find the appropeiate ZLSD entry */ /* the stream name likely has to be hashed and that can be used to find the appropeiate ZLSD entry */
if (read_u32(info_offset + 0x0c, sf) != 0x01) //if (read_u32(info_offset + 0x0c, sf) != 0x01) break;
break;
info_offset += 0x18; info_offset += 0x18;
@ -1190,7 +1201,7 @@ static bool process_zlsd(STREAMFILE* sf, bnk_header_t* h) {
* 14: null */ * 14: null */
/* known streams are standard XVAG (no subsongs) */ /* known streams are standard XVAG (no subsongs) */
/* negative if still working on SBlk streams */ /* target_subsong is negative if it's working on SBlk streams */
target_subsong = h->target_subsong - h->total_subsongs - 1; target_subsong = h->target_subsong - h->total_subsongs - 1;
h->total_subsongs += zlsd_entries; h->total_subsongs += zlsd_entries;
@ -1201,14 +1212,13 @@ static bool process_zlsd(STREAMFILE* sf, bnk_header_t* h) {
return true; return true;
zlsd_table_entry_offset = h->zlsd_offset + zlsd_table_offset + target_subsong * 0x18; zlsd_table_entry_offset = h->zlsd_offset + zlsd_table_offset + target_subsong * 0x18;
h->start_offset = zlsd_table_entry_offset + 0x04 + read_u32(zlsd_table_entry_offset + 0x04, sf); h->start_offset = zlsd_table_entry_offset + 0x04 + read_u32(zlsd_table_entry_offset + 0x04, sf);
h->stream_size = read_u32(zlsd_table_entry_offset + 0x0C, sf); h->stream_size = read_u32(zlsd_table_entry_offset + 0x0C, sf);
/* should be a switch case, but no other formats known yet */ /* should be a switch case, but no other formats known yet */
if (!is_id32be(h->start_offset, sf, "XVAG")) { if (!is_id32be(h->start_offset, sf, "XVAG")) {
/* maybe also a separate warning if XVAG returns more than 1 subsong? */ /* maybe also a separate warning if XVAG returns more than 1 subsong? */
vgm_logi("BNK: unsupported ZLSD subtype found (report)\n"); vgm_logi("BNK: unsupported ZLSD subfile found (report)\n");
goto fail; goto fail;
} }
@ -1224,11 +1234,11 @@ fail:
/* parse SCREAM bnk (usually SFX but also used for music) */ /* parse SCREAM bnk (usually SFX but also used for music) */
static bool parse_bnk_v3(STREAMFILE* sf, bnk_header_t* h) { static bool parse_bnk_v3(STREAMFILE* sf, bnk_header_t* h) {
/* bnk/SCREAM tool version (v2 is a bit different, not seen v1) */ /* bnk/SCREAM tool version (v2 is a bit different, not seen v1) */
if (read_u32be(0x00,sf) == 0x03) { /* PS3 */ if (read_u32be(0x00,sf) == 0x03) { /* PS3 */
h->big_endian = 1; h->big_endian = 1;
} }
else if (read_u32le(0x00,sf) == 0x03) { /* PS2/PSP/Vita/PS4 */ else if (read_u32le(0x00,sf) == 0x03) { /* PS2/PSP/Vita/PS4/PS5 */
h->big_endian = 0; h->big_endian = 0;
} }
else { else {
@ -1242,7 +1252,7 @@ static bool parse_bnk_v3(STREAMFILE* sf, bnk_header_t* h) {
return false; return false;
/* in theory a bank can contain multiple blocks but only those are used */ /* in theory a bank can contain multiple blocks but only those are used */
/* section sizes don't include padding (sometimes aligned to 0x10/0x800) */ /* file is sometimes aligned to 0x10/0x800, so this can't be used for total size checks */
h->sblk_offset = read_u32(0x08,sf); h->sblk_offset = read_u32(0x08,sf);
//h->sblk_size = read_u32(0x0c,sf); //h->sblk_size = read_u32(0x0c,sf);
h->data_offset = read_u32(0x10,sf); h->data_offset = read_u32(0x10,sf);