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

EA MPF: Improved parser accuracy

Browse Source
This commit is contained in:
NicknineTheEagle 2020-11-15 22:08:18 +03:00
parent df6212d5e7
commit dc74675b84
2 changed files with 109 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/meta/ea_eaac.c
View File

@ -506,7 +506,7 @@ fail:
static STREAMFILE *open_mapfile_pair(STREAMFILE* sf, int track, int num_tracks) { static STREAMFILE *open_mapfile_pair(STREAMFILE* sf, int track, int num_tracks) {
static const char *const mapfile_pairs[][2] = { static const char *const mapfile_pairs[][2] = {
/* standard cases, replace map part with mus part (from the end to preserve prefixes) */ /* standard cases, replace map part with mus part (from the end to preserve prefixes) */
{"game.mpf", "Game_Stream.mus"}, /* Skate */ {"game.mpf", "Game_Stream.mus"}, /* Skate 1/2/3 */
{"ipod.mpf", "Ipod_Stream.mus"}, {"ipod.mpf", "Ipod_Stream.mus"},
{"world.mpf", "World_Stream.mus"}, {"world.mpf", "World_Stream.mus"},
{"FreSkate.mpf", "track.mus,ram.mus"}, /* Skate It */ {"FreSkate.mpf", "track.mus,ram.mus"}, /* Skate It */
@ -605,37 +605,41 @@ static STREAMFILE *open_mapfile_pair(STREAMFILE* sf, int track, int num_tracks)
/* 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_hash = 0, mus_sounds, mus_stream = 0; uint32_t num_tracks, track_start, track_checksum = 0, mus_sounds, mus_stream = 0;
uint32_t tracks_table, samples_table, eof_offset, table_offset, entry_offset, snr_offset, sns_offset;
uint16_t num_subbanks;
uint8_t version, sub_version; uint8_t version, sub_version;
off_t tracks_table, samples_table, eof_offset, table_offset, entry_offset, snr_offset, sns_offset;
int32_t(*read_32bit)(off_t, STREAMFILE*);
STREAMFILE *musFile = NULL; STREAMFILE *musFile = NULL;
VGMSTREAM *vgmstream = NULL; VGMSTREAM *vgmstream = NULL;
int i; int i;
int target_stream = sf->stream_index, total_streams, is_ram = 0; int target_stream = sf->stream_index, total_streams, is_ram = 0;
uint32_t(*read_u32)(off_t, STREAMFILE *);
uint16_t(*read_u16)(off_t, STREAMFILE *);
/* check extension */ /* check extension */
if (!check_extensions(sf, "mpf")) if (!check_extensions(sf, "mpf"))
goto fail; goto fail;
/* detect endianness */ /* detect endianness */
if (read_32bitBE(0x00, sf) == 0x50464478) { /* "PFDx" */ if (read_u32be(0x00, sf) == 0x50464478) { /* "PFDx" */
read_32bit = read_32bitBE; read_u32 = read_u32be;
} else if (read_32bitLE(0x00, sf) == 0x50464478) { /* "xDFP" */ read_u16 = read_u16be;
read_32bit = read_32bitLE; } else if (read_u32le(0x00, sf) == 0x50464478) { /* "xDFP" */
read_u32 = read_u32le;
read_u16 = read_u16le;
} else { } else {
goto fail; goto fail;
} }
version = read_8bit(0x04, sf); version = read_u8(0x04, sf);
sub_version = read_8bit(0x05, sf); sub_version = read_u8(0x05, sf);
if (version != 5 || sub_version < 2 || sub_version > 3) goto fail; if (version != 5 || sub_version < 2 || sub_version > 3) goto fail;
num_tracks = read_8bit(0x0d, sf); num_tracks = read_u8(0x0d, sf);
tracks_table = read_32bit(0x2c, sf); tracks_table = read_u32(0x2c, sf);
samples_table = read_32bit(0x34, sf); samples_table = read_u32(0x34, sf);
eof_offset = read_32bit(0x38, sf); eof_offset = read_u32(0x38, sf);
total_streams = (eof_offset - samples_table) / 0x08; total_streams = (eof_offset - samples_table) / 0x08;
if (target_stream == 0) target_stream = 1; if (target_stream == 0) target_stream = 1;
@ -643,24 +647,30 @@ VGMSTREAM * init_vgmstream_ea_mpf_mus_eaac(STREAMFILE* sf) {
goto fail; goto fail;
for (i = num_tracks - 1; i >= 0; i--) { for (i = num_tracks - 1; i >= 0; i--) {
entry_offset = read_32bit(tracks_table + i * 0x04, sf) * 0x04; entry_offset = read_u32(tracks_table + i * 0x04, sf) * 0x04;
track_start = read_32bit(entry_offset + 0x00, sf); track_start = read_u32(entry_offset + 0x00, sf);
if (track_start == 0 && i != 0) if (track_start == 0 && i != 0)
continue; /* empty track */ continue; /* empty track */
if (track_start <= target_stream - 1) { if (track_start <= target_stream - 1) {
track_hash = read_32bitBE(entry_offset + 0x08, sf); num_subbanks = read_u16(entry_offset + 0x04, sf);
is_ram = (track_hash == 0xF1F1F1F1); track_checksum = read_u32be(entry_offset + 0x08, sf);
is_ram = (num_subbanks != 0);
if (num_subbanks > 1) {
VGM_LOG("EA MPF: Found EAAC MPF with more than 1 RAM sub-bank.\n");
goto fail;
}
/* checks to distinguish it from older versions */ /* checks to distinguish it from older versions */
if (is_ram) { if (is_ram) {
if (read_32bitBE(entry_offset + 0x0c, sf) != 0x00) if (read_u32(entry_offset + 0x0c, sf) != 0x00)
goto fail; goto fail;
track_hash = read_32bitBE(entry_offset + 0x14, sf); track_checksum = read_u32be(entry_offset + 0x14, sf);
} else { } else {
if (read_32bitBE(entry_offset + 0x0c, sf) == 0x00) if (read_u32(entry_offset + 0x0c, sf) == 0x00)
goto fail; goto fail;
} }
@ -674,13 +684,13 @@ VGMSTREAM * init_vgmstream_ea_mpf_mus_eaac(STREAMFILE* sf) {
if (!musFile) if (!musFile)
goto fail; goto fail;
if (read_32bitBE(0x00, musFile) != track_hash) if (read_u32be(0x00, musFile) != track_checksum)
goto fail; goto fail;
/* sample offsets table is still there but it just holds SNS offsets, it's of little use to us */ /* sample offsets table is still there but it just holds SNS offsets, it's of little use to us */
/* MUS file has a header, however */ /* MUS file has a header, however */
if (sub_version == 2) { if (sub_version == 2) {
if (read_32bit(0x04, musFile) != 0x00) if (read_u32(0x04, musFile) != 0x00)
goto fail; goto fail;
/* /*
@ -690,11 +700,11 @@ VGMSTREAM * init_vgmstream_ea_mpf_mus_eaac(STREAMFILE* sf) {
*/ */
table_offset = 0x08; table_offset = 0x08;
entry_offset = table_offset + mus_stream * 0x0c; entry_offset = table_offset + mus_stream * 0x0c;
snr_offset = read_32bit(entry_offset + 0x04, musFile); snr_offset = read_u32(entry_offset + 0x04, musFile);
sns_offset = read_32bit(entry_offset + 0x08, musFile); sns_offset = read_u32(entry_offset + 0x08, musFile);
} else if (sub_version == 3) { } else if (sub_version == 3) {
/* number of files is always little endian */ /* number of samples is always little endian */
mus_sounds = read_32bitLE(0x04, musFile); mus_sounds = read_u32le(0x04, musFile);
if (mus_stream >= mus_sounds) if (mus_stream >= mus_sounds)
goto fail; goto fail;
@ -705,9 +715,9 @@ VGMSTREAM * init_vgmstream_ea_mpf_mus_eaac(STREAMFILE* sf) {
} }
/* /*
* 0x00: hash? * 0x00: checksum
* 0x04: index * 0x04: index
* 0x06: zero * 0x06: sub-index
* 0x08: SNR offset * 0x08: SNR offset
* 0x0c: SNS offset * 0x0c: SNS offset
* 0x10: SNR size * 0x10: SNR size
@ -716,8 +726,8 @@ VGMSTREAM * init_vgmstream_ea_mpf_mus_eaac(STREAMFILE* sf) {
*/ */
table_offset = 0x28; table_offset = 0x28;
entry_offset = table_offset + mus_stream * 0x1c; entry_offset = table_offset + mus_stream * 0x1c;
snr_offset = read_32bit(entry_offset + 0x08, musFile) * 0x10; snr_offset = read_u32(entry_offset + 0x08, musFile) * 0x10;
sns_offset = read_32bit(entry_offset + 0x0c, musFile) * 0x80; sns_offset = read_u32(entry_offset + 0x0c, musFile) * 0x80;
} else { } else {
goto fail; goto fail;
} }

119
src/meta/ea_schl.c
View File

@ -391,10 +391,10 @@ VGMSTREAM * init_vgmstream_ea_abk(STREAMFILE* sf) {
if (target_entry_offset == 0) if (target_entry_offset == 0)
goto fail; goto fail;
/* 0x00: type (0x00 - normal, 0x01 - streamed, 0x02 - streamed looped) */ /* 0x00: type (0x00 - RAM, 0x01 - streamed, 0x02 - streamed looped) */
/* 0x01: priority */ /* 0x01: priority */
/* 0x02: padding */ /* 0x02: padding */
/* 0x04: index for normal sounds, offset for streamed sounds */ /* 0x04: index for RAM sounds, offset for streamed sounds */
/* 0x08: loop offset for streamed sounds */ /* 0x08: loop offset for streamed sounds */
sound_type = read_8bit(target_entry_offset + 0x00, sf); sound_type = read_8bit(target_entry_offset + 0x00, sf);
@ -733,6 +733,7 @@ static STREAMFILE* open_mapfile_pair(STREAMFILE* sf, int track, int num_tracks)
} }
/* EA MAP/MUS combo - used in older games for interactive music (for EA's PathFinder tool) */ /* EA MAP/MUS combo - used in older games for interactive music (for EA's PathFinder tool) */
/* seen in Need for Speed II, Need for Speed III: Hot Pursuit, SSX */
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;
@ -758,14 +759,14 @@ VGMSTREAM * init_vgmstream_ea_map_mus(STREAMFILE* sf) {
* 0x04: version * 0x04: version
* 0x05: starting node * 0x05: starting node
* 0x06: number of nodes * 0x06: number of nodes
* 0x07: number of sections * 0x07: number of events
* 0x08: three zeroes * 0x08: three zeroes
* 0x0b: number of events * 0x0b: number of sections
* 0x0c: data start * 0x0c: data start
*/ */
num_sounds = read_8bit(0x06, sf); num_sounds = read_8bit(0x06, sf);
num_sections = read_8bit(0x07, sf); num_events = read_8bit(0x07, sf);
num_events = read_8bit(0x0b, sf); num_sections = read_8bit(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 */
@ -802,24 +803,25 @@ 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_hash = 0, tracks_table, samples_table = 0, section_offset, entry_offset = 0, eof_offset = 0, off_mult, sound_offset; uint32_t track_start, track_end = 0, track_checksum = 0;
uint16_t num_nodes; uint32_t tracks_table, samples_table = 0, section_offset, entry_offset = 0, eof_offset = 0, off_mult, sound_offset;
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;
uint32_t(*read_u32)(off_t, STREAMFILE*);
uint16_t(*read_u16)(off_t, STREAMFILE*);
int i; int i;
int target_stream = sf->stream_index, total_streams, big_endian, is_bnk = 0; int target_stream = sf->stream_index, total_streams, big_endian, is_bnk = 0;
uint32_t(*read_u32)(off_t, STREAMFILE *);
uint16_t(*read_u16)(off_t, STREAMFILE *);
/* check extension */ /* check extension */
if (!check_extensions(sf, "mpf")) if (!check_extensions(sf, "mpf"))
goto fail; goto fail;
/* detect endianness */ /* detect endianness */
if (read_32bitBE(0x00, sf) == 0x50464478) { /* "PFDx" */ if (read_u32be(0x00, sf) == 0x50464478) { /* "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_32bitLE(0x00, sf) == 0x50464478) { /* "xDFP" */ } else if (read_u32le(0x00, sf) == 0x50464478) { /* "xDFP" */
read_u32 = read_u32le; read_u32 = read_u32le;
read_u16 = read_u16le; read_u16 = read_u16le;
big_endian = 0; big_endian = 0;
@ -840,28 +842,47 @@ VGMSTREAM * init_vgmstream_ea_mpf_mus(STREAMFILE* sf) {
num_vars = read_u8(0x11, sf); num_vars = read_u8(0x11, sf);
num_nodes = read_u16(0x12, sf); num_nodes = read_u16(0x12, sf);
/* HACK: number of sub-entries for nodes and events is stored in bitstreams that are different in LE and BE */ /* Some structs here use C bitfields which are different on LE and BE AND their
/* I can't figure it out, so let's just use a workaround for now */ * implementation is compiler dependent, fun times.
* Earlier versions don't have section offsets so we have to go through all of them
* to get to the samples table. */
if (target_stream == 0) target_stream = 1; if (target_stream == 0) target_stream = 1;
if (version == 3) if (version == 3 && (sub_version == 1 || sub_version == 2))
/* SSX Tricky (v3.1), Harry Potter and the Chamber of Secrets (v3.4) */ { /* SSX Tricky, Sled Storm */ {
/* we need to go through all the sections to get to the samples table */
if (sub_version != 1 && sub_version != 2 && sub_version != 4)
goto fail;
/* get the last entry offset */
section_offset = 0x24; section_offset = 0x24;
entry_offset = read_u16(section_offset + (num_nodes - 1) * 0x02, sf) * 0x04; entry_offset = read_u16(section_offset + (num_nodes - 1) * 0x02, sf) * 0x04;
if (sub_version == 1 || sub_version == 2) { subentry_num = read_u8(entry_offset + 0x0b, sf);
subentry_num = read_u8(entry_offset + 0x0b, sf); section_offset = entry_offset + 0x0c + subentry_num * 0x04;
} else if (sub_version == 4) {
if (big_endian) { section_offset += align_size_to_block(num_events * num_tracks * num_sections, 0x04);
subentry_num = (read_u32be(entry_offset + 0x04, sf) >> 19) & 0xFF; section_offset += num_routers * 0x04;
} else { section_offset += num_vars * 0x04;
subentry_num = (read_u32be(entry_offset + 0x04, sf) >> 16) & 0xFF;
} tracks_table = read_u32(section_offset, sf) * 0x04;
samples_table = tracks_table + num_tracks * 0x04;
eof_offset = get_streamfile_size(sf);
total_streams = (eof_offset - samples_table) / 0x08;
off_mult = 0x04;
track_start = total_streams;
for (i = num_tracks - 1; i >= 0; i--) {
track_end = track_start;
track_start = read_u32(tracks_table + i * 0x04, sf) * 0x04;
track_start = (track_start - samples_table) / 0x08;
if (track_start <= target_stream - 1)
break;
}
} else if (version == 3 && sub_version == 4)
/* Harry Potter and the Chamber of Secrets, Shox */ {
section_offset = 0x24;
entry_offset = read_u16(section_offset + (num_nodes - 1) * 0x02, sf) * 0x04;
if (big_endian) {
subentry_num = (read_u32be(entry_offset + 0x04, sf) >> 19) & 0x1F;
} else {
subentry_num = (read_u32be(entry_offset + 0x04, sf) >> 16) & 0x1F;
} }
section_offset = entry_offset + 0x0c + subentry_num * 0x04; section_offset = entry_offset + 0x0c + subentry_num * 0x04;
@ -870,14 +891,8 @@ VGMSTREAM * init_vgmstream_ea_mpf_mus(STREAMFILE* sf) {
section_offset += num_vars * 0x04; section_offset += num_vars * 0x04;
tracks_table = read_u32(section_offset, sf) * 0x04; tracks_table = read_u32(section_offset, sf) * 0x04;
if (sub_version == 1 || sub_version == 2) samples_table = tracks_table + (num_tracks + 1) * 0x04;
samples_table = tracks_table + num_tracks * 0x04; eof_offset = read_u32(tracks_table + num_tracks * 0x04, sf) * 0x04;
else if (sub_version == 4)
samples_table = tracks_table + (num_tracks + 1) * 0x04;
if (sub_version == 1 || sub_version == 2)
eof_offset = get_streamfile_size(sf);
else if (sub_version == 4)
eof_offset = read_u32(tracks_table + num_tracks * 0x04, sf) * 0x04;
total_streams = (eof_offset - samples_table) / 0x08; total_streams = (eof_offset - samples_table) / 0x08;
off_mult = 0x04; off_mult = 0x04;
@ -892,23 +907,20 @@ VGMSTREAM * init_vgmstream_ea_mpf_mus(STREAMFILE* sf) {
} }
} else if (version == 4) { } else if (version == 4) {
/* Need for Speed: Underground 2, SSX 3, Harry Potter and the Prisoner of Azkaban */ /* Need for Speed: Underground 2, SSX 3, Harry Potter and the Prisoner of Azkaban */
/* we need to go through all the sections to get to the samples table */
/* get the last entry offset */
section_offset = 0x20; section_offset = 0x20;
entry_offset = read_u16(section_offset + (num_nodes - 1) * 0x02, sf) * 0x04; entry_offset = read_u16(section_offset + (num_nodes - 1) * 0x02, sf) * 0x04;
if (big_endian) { if (big_endian) {
subentry_num = (read_u32be(entry_offset + 0x04, sf) >> 15) & 0xFF; subentry_num = (read_u32be(entry_offset + 0x04, sf) >> 15) & 0x0F;
} else { } else {
subentry_num = (read_u32be(entry_offset + 0x04, sf) >> 20) & 0xFF; subentry_num = (read_u32be(entry_offset + 0x04, sf) >> 20) & 0x0F;
} }
section_offset = entry_offset + 0x10 + subentry_num * 0x04; section_offset = entry_offset + 0x10 + subentry_num * 0x04;
/* get the last entry offset */
entry_offset = read_u16(section_offset + (num_events - 1) * 0x02, sf) * 0x04; entry_offset = read_u16(section_offset + (num_events - 1) * 0x02, sf) * 0x04;
if (big_endian) { if (big_endian) {
subentry_num = (read_u32be(entry_offset + 0x0c, sf) >> 10) & 0xFF; subentry_num = (read_u32be(entry_offset + 0x0c, sf) >> 10) & 0x3F;
} else { } else {
subentry_num = (read_u32be(entry_offset + 0x0c, sf) >> 8) & 0xFF; subentry_num = (read_u32be(entry_offset + 0x0c, sf) >> 8) & 0x3F;
} }
section_offset = entry_offset + 0x10 + subentry_num * 0x10; section_offset = entry_offset + 0x10 + subentry_num * 0x10;
@ -933,7 +945,7 @@ VGMSTREAM * init_vgmstream_ea_mpf_mus(STREAMFILE* sf) {
break; break;
} }
} else if (version == 5) { } else if (version == 5) {
/* Need for Speed: Most Wanted, Need for Speed: Carbon */ /* Need for Speed: Most Wanted, Need for Speed: Carbon, SSX on Tour */
tracks_table = read_u32(0x2c, sf); tracks_table = read_u32(0x2c, 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);
@ -951,8 +963,9 @@ VGMSTREAM * init_vgmstream_ea_mpf_mus(STREAMFILE* sf) {
continue; /* empty track */ continue; /* empty track */
if (track_start <= target_stream - 1) { if (track_start <= target_stream - 1) {
track_hash = read_u32be(entry_offset + 0x08, sf); num_subbanks = read_u16(entry_offset + 0x04, sf);
is_bnk = (track_hash == 0xF1F1F1F1); track_checksum = read_u32be(entry_offset + 0x08, sf);
is_bnk = (num_subbanks != 0);
/* checks to distinguish it from SNR/SNS version */ /* checks to distinguish it from SNR/SNS version */
if (is_bnk) { if (is_bnk) {
@ -1017,11 +1030,15 @@ VGMSTREAM * init_vgmstream_ea_mpf_mus(STREAMFILE* sf) {
} }
if (version == 5) { if (version == 5) {
track_hash = read_u32be(entry_offset + 0x14 + 0x10 * bnk_index, sf); track_checksum = read_u32be(entry_offset + 0x14 + 0x10 * bnk_index, sf);
if (read_u32be(0x00, sf_mus) != track_hash) if (read_u32be(0x00, sf_mus) != track_checksum)
goto fail; goto fail;
} }
if (read_u32be(bnk_offset, sf_mus) != EA_BNK_HEADER_LE &&
read_u32be(bnk_offset, sf_mus) != EA_BNK_HEADER_BE)
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 */
if (target_stream < track_end) { if (target_stream < track_end) {
next_entry = read_u32(samples_table + (target_stream - 0) * 0x08 + 0x00, sf); next_entry = read_u32(samples_table + (target_stream - 0) * 0x08 + 0x00, sf);
@ -1050,11 +1067,11 @@ VGMSTREAM * init_vgmstream_ea_mpf_mus(STREAMFILE* sf) {
if (!vgmstream) if (!vgmstream)
goto fail; goto fail;
} else { } else {
if (version == 5 && read_u32be(0x00, sf_mus) != track_hash) if (version == 5 && read_u32be(0x00, sf_mus) != track_checksum)
goto fail; goto fail;
sound_offset *= off_mult;; sound_offset *= off_mult;;
if (read_32bitBE(sound_offset, sf_mus) != EA_BLOCKID_HEADER) if (read_u32be(sound_offset, sf_mus) != EA_BLOCKID_HEADER)
goto fail; goto fail;
vgmstream = parse_schl_block(sf_mus, sound_offset, 0); vgmstream = parse_schl_block(sf_mus, sound_offset, 0);