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

ubi_bao changes (6/?)

Browse Source 
atomic BAOs now open depending on whether or not said BAO has a "{id}.sbao" name on it.
it's still not perfect but (mostly) works.
This commit is contained in:
modusc896d352 2022-02-01 08:39:21 -03:00 committed by GitHub
parent 25497b99f3
commit fd51df32be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/meta/ubi_bao.c
View File

@ -135,7 +135,7 @@ static int parse_bao(ubi_bao_header* bao, STREAMFILE* sf, off_t offset, int targ
static int parse_pk(ubi_bao_header* bao, STREAMFILE* sf);
static VGMSTREAM* init_vgmstream_ubi_bao_header(ubi_bao_header* bao, STREAMFILE* sf);
static STREAMFILE* setup_bao_streamfile(ubi_bao_header* bao, STREAMFILE* sf);
static STREAMFILE* open_atomic_bao(ubi_bao_file file_type, uint32_t file_id, int is_stream, STREAMFILE* sf);
static STREAMFILE* open_atomic_bao(ubi_bao_file file_type, uint32_t file_id, int is_stream, int stream_is_sbao, STREAMFILE* sf);
static int find_package_bao(uint32_t target_id, STREAMFILE* sf, off_t* p_offset, size_t* p_size);
static int config_bao_version(ubi_bao_header* bao, STREAMFILE* sf);
@ -169,7 +169,7 @@ fail:
return NULL;
}
/* .BAO - single BAO files from Ubisoft's sound engine ("DARE") games in 2008+ */
/* .BAO - single BAO files from Ubisoft's sound engine ("DARE") games in 2007+ */
VGMSTREAM* init_vgmstream_ubi_bao_atomic(STREAMFILE* sf) {
ubi_bao_header bao = { 0 };
STREAMFILE* streamData = NULL;
@ -530,7 +530,7 @@ static VGMSTREAM* init_vgmstream_ubi_bao_sequence(ubi_bao_header* bao, STREAMFIL
if (bao->is_atomic) {
/* open memory audio BAO */
streamChain = open_atomic_bao(bao->cfg.file_type, entry_id, 0, sf);
streamChain = open_atomic_bao(bao->cfg.file_type, entry_id, 0, bao->cfg.switch_to_sbao_if_bao_is_streamed, sf);
if (!streamChain) {
VGM_LOG("UBI BAO: chain BAO %08x not found\n", entry_id);
goto fail;
@ -1328,7 +1328,7 @@ static const char* language_bao_formats[] = {
};
/* opens a file BAO's companion BAO (memory or stream) */
static STREAMFILE* open_atomic_bao(ubi_bao_file file_type, uint32_t file_id, int is_stream, STREAMFILE* sf) {
static STREAMFILE* open_atomic_bao(ubi_bao_file file_type, uint32_t file_id, int is_stream, int stream_is_sbao, STREAMFILE* sf) {
STREAMFILE* sf_bao = NULL;
char buf[255];
size_t buf_size = 255;
@ -1341,6 +1341,7 @@ static STREAMFILE* open_atomic_bao(ubi_bao_file file_type, uint32_t file_id, int
/* Try default extensionless (as extracted from .forge bigfile) and with common extension.
* .forge data can be uncompressed (stream BAOs) and compressed (subfiles per area with memory BAOs). */
if (is_stream) {
/* (todo) optimize all of this (in bnnm's words, "open_streamfile attempts add up extra time") */
snprintf(buf,buf_size, "Common_BAO_0x%08x", file_id);
sf_bao = open_streamfile_by_filename(sf, buf);
if (sf_bao) return sf_bao;
@ -1364,11 +1365,12 @@ static STREAMFILE* open_atomic_bao(ubi_bao_file file_type, uint32_t file_id, int
/* If all else fails, try %08x.bao/%08x.sbao nomenclature.
* (id).bao is for mimicking engine loading files by internal ID,
* original names (like Common_BAO_0x5NNNNNNN, French_BAO_0x5NNNNNNN and the like) are OK too. */
if (!bao->cfg.switch_to_sbao_if_bao_is_streamed) {
if (!stream_is_sbao) {
/* %08x.bao nomenclature present in Assassin's Creed (Windows Vista) exe. */
snprintf(buf,buf_size, "%08x.bao", file_id);
sf_bao = open_streamfile_by_filename(sf, buf);
if (sf_bao) return sf_bao;
}
else {
/* %08x.sbao nomenclature (in addition to %08x.bao) present in Shaun White Snowboarding (Windows Vista) exe. */
snprintf(buf,buf_size, "%08x.sbao", file_id);
@ -1460,7 +1462,7 @@ static STREAMFILE* setup_bao_streamfile(ubi_bao_header* bao, STREAMFILE* sf) {
if (bao->is_atomic) {
/* file BAOs re-open new STREAMFILEs so no need to wrap them */
if (bao->is_prefetched) {
new_sf = open_atomic_bao(bao->cfg.file_type, bao->prefetch_id, 0, sf);
new_sf = open_atomic_bao(bao->cfg.file_type, bao->prefetch_id, 0, bao->cfg.switch_to_sbao_if_bao_is_streamed, sf);
if (!new_sf) goto fail;
stream_segments[0] = new_sf;
@ -1469,7 +1471,7 @@ static STREAMFILE* setup_bao_streamfile(ubi_bao_header* bao, STREAMFILE* sf) {
stream_segments[0] = new_sf;
if (bao->stream_size - bao->prefetch_size != 0) {
new_sf = open_atomic_bao(bao->cfg.file_type, bao->stream_id, 1, sf);
new_sf = open_atomic_bao(bao->cfg.file_type, bao->stream_id, 1, bao->cfg.switch_to_sbao_if_bao_is_streamed, sf);
if (!new_sf) goto fail;
stream_segments[1] = new_sf;
@ -1490,7 +1492,7 @@ static STREAMFILE* setup_bao_streamfile(ubi_bao_header* bao, STREAMFILE* sf) {
}
}
else {
new_sf = open_atomic_bao(bao->cfg.file_type, bao->stream_id, bao->is_external, sf);
new_sf = open_atomic_bao(bao->cfg.file_type, bao->stream_id, bao->is_external, bao->cfg.switch_to_sbao_if_bao_is_streamed, sf);
if (!new_sf) goto fail;
temp_sf = new_sf;
@ -1810,12 +1812,12 @@ static int config_bao_version(ubi_bao_header* bao, STREAMFILE* sf) {
bao->cfg.file_type = UBI_FORGE_b;
if (version == 0x001F0010) /* Shaun White Snowboarding (Vista/PS3/X360), Prince of Persia 2008 (Vista/PS3/X360) */
bao->cfg.switch_to_sbao_if_bao_is_streamed = 1;
if (version == 0x0022000D) /* Just Dance (Wii) oddity */
bao->cfg.audio_ignore_resource_size = 1;
if (version == 0x0022000D) /* We Dare (Wii) */
config_bao_audio_c(bao, 0x68, 0x78);
if (version == 0x001F0010) /* Shaun White Snowboarding (Vista/PS3/X360), Prince of Persia 2008 (Vista/PS3/X360) */
bao->cfg.switch_to_sbao_if_bao_is_streamed = 1;
return 1;