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

EA MPF: Improved format detection

Browse Source
This commit is contained in:
NicknineTheEagle 2022-09-03 22:31:30 +03:00
parent 585dd9a5bb
commit a4e347c057
2 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/meta/ea_eaac.c
View File

@ -610,8 +610,8 @@ static STREAMFILE *open_mapfile_pair(STREAMFILE* sf, int track /*, int num_track
/* EA MPF/MUS combo - used in older 7th gen games for storing interactive music */ /* EA MPF/MUS combo - used in older 7th gen games for storing interactive music */
VGMSTREAM* init_vgmstream_ea_mpf_mus_eaac(STREAMFILE* sf) { VGMSTREAM* init_vgmstream_ea_mpf_mus_eaac(STREAMFILE* sf) {
uint32_t num_tracks, track_start, track_checksum = 0, mus_sounds, mus_stream = 0, bnk_index = 0, bnk_sound_index = 0; uint32_t num_tracks, track_start, track_checksum = 0, mus_sounds, mus_stream = 0, bnk_index = 0, bnk_sound_index = 0,
uint32_t tracks_table, samples_table, eof_offset, table_offset, entry_offset, snr_offset, sns_offset; tracks_table, samples_table, eof_offset, table_offset, entry_offset = 0, snr_offset, sns_offset;
uint16_t num_subbanks, index, sub_index; uint16_t num_subbanks, index, sub_index;
uint8_t version, sub_version; uint8_t version, sub_version;
STREAMFILE *sf_mus = NULL; STREAMFILE *sf_mus = NULL;
@ -627,10 +627,10 @@ VGMSTREAM* init_vgmstream_ea_mpf_mus_eaac(STREAMFILE* sf) {
goto fail; goto fail;
/* detect endianness */ /* detect endianness */
if (read_u32be(0x00, sf) == 0x50464478) { /* "PFDx" */ if (is_id32be(0x00, sf, "PFDx")) {
read_u32 = read_u32be; read_u32 = read_u32be;
read_u16 = read_u16be; read_u16 = read_u16be;
} else if (read_u32le(0x00, sf) == 0x50464478) { /* "xDFP" */ } else if (is_id32le(0x00, sf, "PFDx")) {
read_u32 = read_u32le; read_u32 = read_u32le;
read_u16 = read_u16le; read_u16 = read_u16le;
} else { } else {
@ -663,11 +663,6 @@ VGMSTREAM* init_vgmstream_ea_mpf_mus_eaac(STREAMFILE* sf) {
num_subbanks = read_u16(entry_offset + 0x04, sf); num_subbanks = read_u16(entry_offset + 0x04, sf);
track_checksum = read_u32be(entry_offset + 0x08, sf); track_checksum = read_u32be(entry_offset + 0x08, sf);
is_ram = (num_subbanks != 0); is_ram = (num_subbanks != 0);
if (is_ram) {
track_checksum = read_u32be(entry_offset + 0x14, sf);
}
mus_stream = target_stream - 1 - track_start; mus_stream = target_stream - 1 - track_start;
break; break;
} }

42
src/meta/ea_schl.c
View File

@ -756,8 +756,9 @@ static STREAMFILE* open_mapfile_pair(STREAMFILE* sf, int track /*, int num_track
VGMSTREAM* init_vgmstream_ea_map_mus(STREAMFILE* sf) { VGMSTREAM* init_vgmstream_ea_map_mus(STREAMFILE* sf) {
VGMSTREAM* vgmstream = NULL; VGMSTREAM* vgmstream = NULL;
STREAMFILE* sf_mus = NULL; STREAMFILE* sf_mus = NULL;
uint32_t schl_offset;
uint8_t version, num_sounds, num_events, num_sections; uint8_t version, num_sounds, num_events, num_sections;
off_t section_offset, schl_offset; off_t section_offset;
int target_stream = sf->stream_index; int target_stream = sf->stream_index;
/* check extension */ /* check extension */
@ -765,10 +766,10 @@ VGMSTREAM* init_vgmstream_ea_map_mus(STREAMFILE* sf) {
goto fail; goto fail;
/* always big endian */ /* always big endian */
if (read_32bitBE(0x00, sf) != 0x50464478) /* "PFDx" */ if (!is_id32be(0x00, sf, "PFDx"))
goto fail; goto fail;
version = read_8bit(0x04, sf); version = read_u8(0x04, sf);
if (version > 1) goto fail; if (version > 1) goto fail;
sf_mus = open_mapfile_pair(sf, 0); //, 1 sf_mus = open_mapfile_pair(sf, 0); //, 1
@ -783,9 +784,9 @@ VGMSTREAM* init_vgmstream_ea_map_mus(STREAMFILE* sf) {
* 0x0b: number of sections * 0x0b: number of sections
* 0x0c: data start * 0x0c: data start
*/ */
num_sounds = read_8bit(0x06, sf); num_sounds = read_u8(0x06, sf);
num_events = read_8bit(0x07, sf); num_events = read_u8(0x07, sf);
num_sections = read_8bit(0x0b, sf); num_sections = read_u8(0x0b, sf);
section_offset = 0x0c; section_offset = 0x0c;
/* section 1: nodes, contains information about segment playback order */ /* section 1: nodes, contains information about segment playback order */
@ -799,8 +800,8 @@ VGMSTREAM* init_vgmstream_ea_map_mus(STREAMFILE* sf) {
goto fail; goto fail;
/* section 3: samples */ /* section 3: samples */
schl_offset = read_32bitBE(section_offset + (target_stream - 1) * 0x04, sf); schl_offset = read_u32be(section_offset + (target_stream - 1) * 0x04, sf);
if (read_32bitBE(schl_offset, sf_mus) != EA_BLOCKID_HEADER) if (read_u32be(schl_offset, sf_mus) != EA_BLOCKID_HEADER)
goto fail; goto fail;
vgmstream = parse_schl_block(sf_mus, schl_offset); vgmstream = parse_schl_block(sf_mus, schl_offset);
@ -822,8 +823,8 @@ VGMSTREAM* init_vgmstream_ea_mpf_mus(STREAMFILE* sf) {
VGMSTREAM* vgmstream = NULL; VGMSTREAM* vgmstream = NULL;
STREAMFILE* sf_mus = NULL; STREAMFILE* sf_mus = NULL;
segmented_layout_data *data_s = NULL; segmented_layout_data *data_s = NULL;
uint32_t track_start, track_end = 0, track_checksum = 0; uint32_t tracks_table, tracks_data, samples_table = 0, section_offset, entry_offset = 0, eof_offset = 0, sound_offset,
uint32_t tracks_table, samples_table = 0, section_offset, entry_offset = 0, eof_offset = 0, off_mult, sound_offset; off_mult = 0, track_start, track_end = 0, track_checksum = 0;
uint16_t num_nodes, num_subbanks = 0; uint16_t num_nodes, num_subbanks = 0;
uint8_t version, sub_version, num_tracks, num_sections, num_events, num_routers, num_vars, subentry_num = 0; uint8_t version, sub_version, num_tracks, num_sections, num_events, num_routers, num_vars, subentry_num = 0;
int i; int i;
@ -836,11 +837,11 @@ VGMSTREAM* init_vgmstream_ea_mpf_mus(STREAMFILE* sf) {
goto fail; goto fail;
/* detect endianness */ /* detect endianness */
if (read_u32be(0x00, sf) == 0x50464478) { /* "PFDx" */ if (is_id32be(0x00, sf, "PFDx")) {
read_u32 = read_u32be; read_u32 = read_u32be;
read_u16 = read_u16be; read_u16 = read_u16be;
big_endian = 1; big_endian = 1;
} else if (read_u32le(0x00, sf) == 0x50464478) { /* "xDFP" */ } else if (is_id32le(0x00, sf, "PFDx")) {
read_u32 = read_u32le; read_u32 = read_u32le;
read_u16 = read_u16le; read_u16 = read_u16le;
big_endian = 0; big_endian = 0;
@ -964,11 +965,16 @@ VGMSTREAM* init_vgmstream_ea_mpf_mus(STREAMFILE* sf) {
} else if (version == 5) { } else if (version == 5) {
/* Need for Speed: Most Wanted, Need for Speed: Carbon, SSX on Tour */ /* Need for Speed: Most Wanted, Need for Speed: Carbon, SSX on Tour */
tracks_table = read_u32(0x2c, sf); tracks_table = read_u32(0x2c, sf);
tracks_data = read_u32(0x30, sf);
samples_table = read_u32(0x34, sf); samples_table = read_u32(0x34, sf);
eof_offset = read_u32(0x38, sf); eof_offset = read_u32(0x38, sf);
total_streams = (eof_offset - samples_table) / 0x08; total_streams = (eof_offset - samples_table) / 0x08;
off_mult = 0x80; off_mult = 0x80;
/* check to distinguish it from SNR/SNS version (first streamed sample is always at 0x100) */
if (read_u16(tracks_data + 0x04, sf) == 0 && read_u32(samples_table + 0x00, sf) != 0x02)
goto fail;
track_start = total_streams; track_start = total_streams;
for (i = num_tracks - 1; i >= 0; i--) { for (i = num_tracks - 1; i >= 0; i--) {
@ -983,15 +989,6 @@ VGMSTREAM* init_vgmstream_ea_mpf_mus(STREAMFILE* sf) {
num_subbanks = read_u16(entry_offset + 0x04, sf); num_subbanks = read_u16(entry_offset + 0x04, sf);
track_checksum = read_u32be(entry_offset + 0x08, sf); track_checksum = read_u32be(entry_offset + 0x08, sf);
is_ram = (num_subbanks != 0); is_ram = (num_subbanks != 0);
/* checks to distinguish it from SNR/SNS version */
if (is_ram) {
if (read_u32(entry_offset + 0x0c, sf) == 0x00)
goto fail;
} else {
if (read_u32(entry_offset + 0x0c, sf) != 0x00)
goto fail;
}
break; break;
} }
} }
@ -1052,8 +1049,7 @@ VGMSTREAM* init_vgmstream_ea_mpf_mus(STREAMFILE* sf) {
goto fail; goto fail;
} }
if (read_u32be(bnk_offset, sf_mus) != EA_BNK_HEADER_LE && if (read_u32be(bnk_offset, sf_mus) != (big_endian ? EA_BNK_HEADER_BE : EA_BNK_HEADER_LE))
read_u32be(bnk_offset, sf_mus) != EA_BNK_HEADER_BE)
goto fail; goto fail;
/* play until the next entry in MPF track or the end of BNK */ /* play until the next entry in MPF track or the end of BNK */