mirror of
https://github.com/vgmstream/vgmstream.git
synced 2024-11-24 15:00:11 +01:00
Ubi SB: Tweaked parsing of older versions
This commit is contained in:
NicknineTheEagle
parent
a349c26be6
commit
9e6469c15e
@ -36,6 +36,7 @@ typedef struct {
|
||||
int audio_external_and;
|
||||
int audio_loop_and;
|
||||
int audio_group_and;
|
||||
int audio_stream_type_rsh;
|
||||
int audio_has_internal_names;
|
||||
size_t audio_interleave;
|
||||
int audio_fix_psx_samples;
|
||||
@ -1173,6 +1174,7 @@ static int parse_type_audio(ubi_sb_header * sb, off_t offset, STREAMFILE* stream
|
||||
if (sb->cfg.audio_group_id) {
|
||||
sb->group_id = read_32bit(offset + sb->cfg.audio_group_id, streamFile);
|
||||
if (sb->cfg.audio_group_and) sb->group_id &= sb->cfg.audio_group_and;
|
||||
if (sb->cfg.audio_stream_type_rsh) sb->group_id = (int)!sb->group_id; /* old group flag */
|
||||
|
||||
/* normalize bitflag, known groups are only id 0/1 (if needed could calculate
|
||||
* shift-right value here, based on cfg.audio_group_and first 1-bit) */
|
||||
@ -1450,14 +1452,16 @@ static int parse_stream_codec(ubi_sb_header * sb) {
|
||||
if (sb->type == UBI_SEQUENCE)
|
||||
return 1;
|
||||
|
||||
/* in early versions, this is a bitfield with either 1 or 2 rightmost bits being flags */
|
||||
sb->stream_type >>= sb->cfg.audio_stream_type_rsh;
|
||||
|
||||
if (sb->cfg.default_codec_for_group0 && sb->type == UBI_AUDIO && sb->group_id == 0) {
|
||||
/* early Xbox games contain garbage in stream_type field in this case, it seems that 0x00 is assumed */
|
||||
sb->stream_type = 0x00;
|
||||
}
|
||||
|
||||
/* guess codec */
|
||||
switch (sb->stream_type) {
|
||||
case 0x00: /* platform default (rarely external) */
|
||||
if (sb->stream_type == 0x00) {
|
||||
switch (sb->platform) {
|
||||
case UBI_PC:
|
||||
sb->codec = RAW_PCM;
|
||||
@ -1493,44 +1497,48 @@ static int parse_stream_codec(ubi_sb_header * sb) {
|
||||
VGM_LOG("UBI SB: unknown internal format\n");
|
||||
goto fail;
|
||||
}
|
||||
break;
|
||||
|
||||
} else if (sb->version == 0x00000000) {
|
||||
switch (sb->stream_type) {
|
||||
case 0x01:
|
||||
switch (sb->version) {
|
||||
case 0x00000003: /* Donald Duck: Goin' Quackers */
|
||||
case 0x00000004: /* Myst III: Exile */
|
||||
case 0x00000007: /* Splinter Cell */
|
||||
case 0x0000000D: /* Prince of Persia: The Sands of Time Demo */
|
||||
switch (sb->platform) {
|
||||
case UBI_PS2: sb->codec = RAW_PSX; break;
|
||||
case UBI_GC: sb->codec = RAW_DSP; break;
|
||||
case UBI_PC: sb->codec = RAW_PCM; break;
|
||||
case UBI_XBOX: sb->codec = RAW_XBOX; break;
|
||||
default: VGM_LOG("UBI SB: unknown old internal format\n"); goto fail;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
sb->codec = RAW_PCM; /* uncommon, ex. Wii/PSP/3DS */
|
||||
break;
|
||||
}
|
||||
sb->codec = FMT_MPDX;
|
||||
break;
|
||||
|
||||
case 0x02:
|
||||
switch (sb->version) {
|
||||
case 0x00000000: /* Tonic Trouble Special Edition */
|
||||
sb->codec = FMT_MPDX;
|
||||
sb->codec = FMT_APM;
|
||||
break;
|
||||
case 0x00000007: /* Splinter Cell, Splinter Cell: Pandora Tomorrow */
|
||||
case 0x0000000D: /* Prince of Persia: The Sands of Time Demo */
|
||||
case 0x000A0000:
|
||||
case 0x000A0002:
|
||||
case 0x00120012: /* Myst IV: Exile */
|
||||
//todo splinter Cell Essentials
|
||||
|
||||
default:
|
||||
VGM_LOG("Unknown stream_type %02x for version %08x", sb->stream_type, sb->version);
|
||||
goto fail;
|
||||
}
|
||||
} else if (sb->version < 0x000A0000) {
|
||||
switch (sb->stream_type) {
|
||||
case 0x01:
|
||||
sb->codec = UBI_ADPCM;
|
||||
break;
|
||||
|
||||
case 0x02:
|
||||
sb->codec = UBI_IMA; /* Ubi IMA v2/v3 */
|
||||
break;
|
||||
|
||||
default:
|
||||
VGM_LOG("Unknown stream_type %02x for version %08x", sb->stream_type, sb->version);
|
||||
goto fail;
|
||||
}
|
||||
} else {
|
||||
switch (sb->stream_type) {
|
||||
case 0x01:
|
||||
sb->codec = RAW_PCM; /* uncommon, ex. Wii/PSP/3DS */
|
||||
break;
|
||||
|
||||
case 0x02:
|
||||
switch (sb->platform) {
|
||||
case UBI_PS3:
|
||||
sb->codec = RAW_PSX; /* PS3 */
|
||||
break;
|
||||
default:
|
||||
sb->codec = UBI_ADPCM;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
@ -1539,18 +1547,8 @@ static int parse_stream_codec(ubi_sb_header * sb) {
|
||||
break;
|
||||
|
||||
case 0x04:
|
||||
switch (sb->version) {
|
||||
case 0x00000000: /* Rayman 2, Tonic Trouble */
|
||||
sb->codec = FMT_APM;
|
||||
break;
|
||||
case 0x00000007: /* Splinter Cell, Splinter Cell: Pandora Tomorrow */
|
||||
sb->codec = UBI_IMA;
|
||||
break;
|
||||
default:
|
||||
sb->codec = FMT_OGG; /* later PC games */
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case 0x05:
|
||||
switch (sb->platform) {
|
||||
@ -1568,36 +1566,22 @@ static int parse_stream_codec(ubi_sb_header * sb) {
|
||||
break;
|
||||
|
||||
case 0x06:
|
||||
switch (sb->version) {
|
||||
case 0x00000003: /* Batman: Vengeance (PC) */
|
||||
sb->codec = UBI_ADPCM;
|
||||
break;
|
||||
default:
|
||||
sb->codec = RAW_PSX; /* later PSP and PS3(?) games */
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case 0x07:
|
||||
sb->codec = RAW_AT3; /* PS3 games */
|
||||
sb->codec = RAW_AT3; /* PS3 */
|
||||
break;
|
||||
|
||||
case 0x08:
|
||||
switch (sb->version) {
|
||||
case 0x00000003: /* Donald Duck: Goin' Quackers */
|
||||
case 0x00000004: /* Myst III: Exile */
|
||||
sb->codec = UBI_IMA; /* Ubi IMA v2/v3 */
|
||||
break;
|
||||
default:
|
||||
sb->codec = FMT_AT3;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
VGM_LOG("UBI SB: unknown stream_type %x\n", sb->stream_type);
|
||||
VGM_LOG("Unknown stream_type %02x", sb->stream_type);
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
fail:
|
||||
@ -1895,6 +1879,15 @@ static void config_sb_audio_fb(ubi_sb_header * sb, off_t flag_bits, int external
|
||||
sb->cfg.audio_group_and = group_and;
|
||||
sb->cfg.audio_loop_and = loop_and;
|
||||
}
|
||||
static void config_sb_audio_fbc(ubi_sb_header * sb, off_t flag_bits, int external_and, int loop_and, off_t codec_flag_bits, int group_and) {
|
||||
/* audio header with bit flags and separate codec flags */
|
||||
sb->cfg.audio_external_flag = flag_bits;
|
||||
sb->cfg.audio_group_id = codec_flag_bits;
|
||||
sb->cfg.audio_loop_flag = flag_bits;
|
||||
sb->cfg.audio_external_and = external_and;
|
||||
sb->cfg.audio_group_and = group_and;
|
||||
sb->cfg.audio_loop_and = loop_and;
|
||||
}
|
||||
static void config_sb_audio_hs(ubi_sb_header * sb, off_t channels, off_t sample_rate, off_t num_samples, off_t num_samples2, off_t stream_name, off_t stream_type) {
|
||||
/* audio header with stream name */
|
||||
sb->cfg.audio_channels = channels;
|
||||
@ -2096,8 +2089,7 @@ static int config_sb_version(ubi_sb_header * sb, STREAMFILE *streamFile) {
|
||||
|
||||
sb->cfg.random_extra_offset = 0x10;
|
||||
//sb->cfg.random_extra_size = 0x0c;
|
||||
}
|
||||
else if (sb->version <= 0x00000007) {
|
||||
} else if (sb->version <= 0x00000007) {
|
||||
sb->cfg.audio_stream_size = 0x0c;
|
||||
sb->cfg.audio_extra_offset = 0x10;
|
||||
sb->cfg.audio_stream_offset = 0x14;
|
||||
@ -2105,8 +2097,7 @@ static int config_sb_version(ubi_sb_header * sb, STREAMFILE *streamFile) {
|
||||
sb->cfg.sequence_extra_offset = 0x10;
|
||||
|
||||
sb->cfg.layer_extra_offset = 0x10;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
sb->cfg.audio_stream_size = 0x08;
|
||||
sb->cfg.audio_extra_offset = 0x0c;
|
||||
sb->cfg.audio_stream_offset = 0x10;
|
||||
@ -2116,6 +2107,14 @@ static int config_sb_version(ubi_sb_header * sb, STREAMFILE *streamFile) {
|
||||
sb->cfg.layer_extra_offset = 0x0c;
|
||||
}
|
||||
|
||||
if (sb->version == 0x00000000 || sb->version == 0x00000200) {
|
||||
sb->cfg.audio_stream_type_rsh = 1;
|
||||
} else if (sb->version <= 0x00000004) {
|
||||
sb->cfg.audio_stream_type_rsh = 2;
|
||||
} else if (sb->version < 0x000A0000) {
|
||||
sb->cfg.audio_stream_type_rsh = 1;
|
||||
}
|
||||
|
||||
sb->allowed_types[0x01] = 1;
|
||||
sb->allowed_types[0x05] = 1;
|
||||
sb->allowed_types[0x0c] = 1;
|
||||
@ -2173,7 +2172,7 @@ static int config_sb_version(ubi_sb_header * sb, STREAMFILE *streamFile) {
|
||||
if (sb->version == 0x00000000 && sb->platform == UBI_PC && is_ttse_pc) {
|
||||
config_sb_entry(sb, 0x20, 0x5c);
|
||||
|
||||
config_sb_audio_fs(sb, 0x2c, 0x2c, 0x30); /* no group id */
|
||||
config_sb_audio_fs(sb, 0x2c, 0x44, 0x30);
|
||||
config_sb_audio_hs(sb, 0x42, 0x3c, 0x38, 0x38, 0x48, 0x44);
|
||||
sb->cfg.audio_has_internal_names = 1;
|
||||
|
||||
@ -2195,7 +2194,7 @@ static int config_sb_version(ubi_sb_header * sb, STREAMFILE *streamFile) {
|
||||
if (sb->version == 0x00000000 && sb->platform == UBI_PC) {
|
||||
config_sb_entry(sb, 0x20, 0x5c);
|
||||
|
||||
config_sb_audio_fs(sb, 0x2c, 0x2c, 0x30); /* no group id */
|
||||
config_sb_audio_fs(sb, 0x2c, 0x44, 0x30);
|
||||
config_sb_audio_hs(sb, 0x42, 0x3c, 0x34, 0x34, 0x48, 0x44);
|
||||
sb->cfg.audio_has_internal_names = 1;
|
||||
|
||||
@ -2216,7 +2215,7 @@ static int config_sb_version(ubi_sb_header * sb, STREAMFILE *streamFile) {
|
||||
(sb->version == 0x00000003 && sb->platform == UBI_XBOX)) {
|
||||
config_sb_entry(sb, 0x40, 0x68);
|
||||
|
||||
config_sb_audio_fs(sb, 0x30, 0x30, 0x34); /* no group id? use external flag */
|
||||
config_sb_audio_fs(sb, 0x30, 0x54, 0x34);
|
||||
config_sb_audio_hs(sb, 0x52, 0x4c, 0x38, 0x40, 0x58, 0x54);
|
||||
sb->cfg.audio_has_internal_names = 1;
|
||||
|
||||
@ -2233,7 +2232,7 @@ static int config_sb_version(ubi_sb_header * sb, STREAMFILE *streamFile) {
|
||||
if (sb->version == 0x00000003 && sb->platform == UBI_GC) {
|
||||
config_sb_entry(sb, 0x40, 0x6c);
|
||||
|
||||
config_sb_audio_fs(sb, 0x30, 0x30, 0x34); /* no group id? use external flag */
|
||||
config_sb_audio_fs(sb, 0x30, 0x58, 0x34);
|
||||
config_sb_audio_hs(sb, 0x56, 0x50, 0x48, 0x48, 0x5c, 0x58); /* 0x38 may be num samples too? */
|
||||
|
||||
config_sb_sequence(sb, 0x2c, 0x1c);
|
||||
@ -2263,6 +2262,7 @@ static int config_sb_version(ubi_sb_header * sb, STREAMFILE *streamFile) {
|
||||
}
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
//todo group flags and maybe num_samples for sfx are off
|
||||
/* Myst III: Exile (2001)(PS2)-map */
|
||||
if (sb->version == 0x00000004 && sb->platform == UBI_PS2) {
|
||||
@ -2275,13 +2275,14 @@ static int config_sb_version(ubi_sb_header * sb, STREAMFILE *streamFile) {
|
||||
config_sb_sequence(sb, 0x2c, 0x24);
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Splinter Cell (2002)(PC)-map */
|
||||
/* Splinter Cell: Pandora Tomorrow (2004)(PC)-map */
|
||||
if (sb->version == 0x00000007 && sb->platform == UBI_PC) {
|
||||
config_sb_entry(sb, 0x58, 0x80);
|
||||
|
||||
config_sb_audio_fs(sb, 0x28, 0x28, 0x2c); /* no group id? use external flag */
|
||||
config_sb_audio_fs(sb, 0x28, 0x4c, 0x2c);
|
||||
config_sb_audio_hs(sb, 0x4a, 0x44, 0x30, 0x38, 0x50, 0x4c);
|
||||
sb->cfg.audio_has_internal_names = 1;
|
||||
|
||||
@ -2297,7 +2298,7 @@ static int config_sb_version(ubi_sb_header * sb, STREAMFILE *streamFile) {
|
||||
if (sb->version == 0x00000007 && sb->platform == UBI_XBOX) {
|
||||
config_sb_entry(sb, 0x58, 0x78);
|
||||
|
||||
config_sb_audio_fs(sb, 0x28, 0x28, 0x2c); /* no group id? use external flag */
|
||||
config_sb_audio_fs(sb, 0x28, 0x4c, 0x2c);
|
||||
config_sb_audio_hs(sb, 0x4a, 0x44, 0x30, 0x38, 0x50, 0x4c);
|
||||
sb->cfg.audio_has_internal_names = 1;
|
||||
|
||||
@ -2325,7 +2326,7 @@ static int config_sb_version(ubi_sb_header * sb, STREAMFILE *streamFile) {
|
||||
if (sb->version == 0x00000007 && sb->platform == UBI_PS2) {
|
||||
config_sb_entry(sb, 0x40, 0x70);
|
||||
|
||||
config_sb_audio_fb(sb, 0x1c, (1 << 2), (1 << 3), (1 << 4));
|
||||
config_sb_audio_fbc(sb, 0x1c, (1 << 2), (1 << 4), 0x6c, (1 << 0));
|
||||
config_sb_audio_hs(sb, 0x24, 0x28, 0x34, 0x3c, 0x44, 0x6c); /* num_samples may be null */
|
||||
|
||||
config_sb_sequence(sb, 0x2c, 0x30);
|
||||
@ -2346,7 +2347,7 @@ static int config_sb_version(ubi_sb_header * sb, STREAMFILE *streamFile) {
|
||||
if (sb->version == 0x00000007 && sb->platform == UBI_GC) {
|
||||
config_sb_entry(sb, 0x58, 0x78);
|
||||
|
||||
config_sb_audio_fs(sb, 0x24, 0x24, 0x28); /* no group id? use external flag */
|
||||
config_sb_audio_fs(sb, 0x24, 0x4c, 0x28);
|
||||
config_sb_audio_hs(sb, 0x4a, 0x44, 0x2c, 0x34, 0x50, 0x4c);
|
||||
|
||||
config_sb_sequence(sb, 0x2c, 0x34);
|
||||
@ -2365,7 +2366,7 @@ static int config_sb_version(ubi_sb_header * sb, STREAMFILE *streamFile) {
|
||||
if (sb->version == 0x0000000D && sb->platform == UBI_XBOX) {
|
||||
config_sb_entry(sb, 0x5c, 0x74);
|
||||
|
||||
config_sb_audio_fs(sb, 0x24, 0x24, 0x28); /* no group id? use external flag */
|
||||
config_sb_audio_fs(sb, 0x24, 0x48, 0x28);
|
||||
config_sb_audio_hs(sb, 0x46, 0x40, 0x2c, 0x34, 0x4c, 0x48);
|
||||
sb->cfg.audio_has_internal_names = 1;
|
||||
return 1;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user