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

Merge pull request #719 from NicknineTheEagle/ubi

Browse Source 
Ubi
This commit is contained in:
NicknineTheEagle 2020-09-29 15:50:58 +03:00 committed by GitHub
commit 3888d1eb2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/meta/ubi_sb.c
View File

@ -120,6 +120,7 @@ typedef struct {
int is_dat;
int is_ps2_bnm;
int is_blk;
int has_numbered_banks;
STREAMFILE* sf_header;
uint32_t version; /* 16b+16b major+minor version */
uint32_t version_empty; /* map sbX versions are empty */
@ -639,7 +640,7 @@ static VGMSTREAM *init_vgmstream_ubi_dat_main(ubi_sb_header *sb, STREAMFILE *sf_
sf_data = open_streamfile_by_filename(sf, sb->resource_name);
if (!sf_data) {
VGM_LOG("UBI DAT: no matching KAT found\n");
VGM_LOG("UBI DAT: external stream '%s' not found\n", sb->resource_name);
goto fail;
}
}
@ -1410,7 +1411,7 @@ static VGMSTREAM* init_vgmstream_ubi_sb_sequence(ubi_sb_header* sb, STREAMFILE*
/* bnm sequences may use to entries from other banks, do some voodoo */
if (sb->is_bnm || sb->is_dat || sb->is_ps2_bnm) {
if (sb->has_numbered_banks) {
/* see if *current* bank has changed (may use a different bank N times) */
if (is_other_bank(sb, sf_bank, sb->sequence_banks[i])) {
char bank_name[255];
@ -1947,7 +1948,7 @@ static int parse_type_sequence(ubi_sb_header* sb, off_t offset, STREAMFILE* sf)
uint32_t entry_number = (uint32_t)read_32bit(table_offset+sb->cfg.sequence_entry_number, sf);
/* bnm sequences may refer to entries from different banks, whee */
if (sb->is_bnm || sb->is_dat || sb->is_ps2_bnm) {
if (sb->has_numbered_banks) {
int16_t bank_number = (entry_number >> 16) & 0xFFFF;
entry_number = (entry_number >> 00) & 0xFFFF;
@ -2113,7 +2114,7 @@ static int parse_type_random(ubi_sb_header* sb, off_t offset, STREAMFILE* sf) {
uint32_t entry_number = (uint32_t)read_32bit(table_offset+0x00, sf);
//uint32_t entry_chance = (uint32_t)read_32bit(table_offset+0x04, sf);
if (sb->is_bnm) {
if (sb->has_numbered_banks) {
int16_t bank_number = (entry_number >> 16) & 0xFFFF;
entry_number = (entry_number >> 00) & 0xFFFF;
@ -2866,6 +2867,10 @@ static int config_sb_version(ubi_sb_header* sb, STREAMFILE* sf) {
/* games <= 0x00100000 seem to use old types, rest new types */
if (sb->is_bnm || sb->is_dat || sb->is_ps2_bnm) {
/* these all have names in BNK_%num% format and can reference each other by index */
sb->has_numbered_banks = 1;
}
/* maybe 0x20/0x24 for some but ok enough (null terminated) */
sb->cfg.resource_name_size = 0x28; /* min for Brother in Arms 2 (PS2) */

2
src/streamfile.c
View File

@ -890,7 +890,7 @@ STREAMFILE* open_streamfile_by_filename(STREAMFILE *streamfile, const char * fil
char partname[PATH_LIMIT];
char *path, *name;
if (!streamfile || !filename) return NULL;
if (!streamfile || !filename || !filename[0]) return NULL;
streamfile->get_name(streamfile, fullname, sizeof(fullname));