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

Minor tweaks

Browse Source
This commit is contained in:
NicknineTheEagle 2018-07-22 04:43:10 +03:00
parent 0210489f83
commit 4f832266e3
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/meta/ea_eaac.c
View File

@ -7,7 +7,7 @@
static VGMSTREAM * init_vgmstream_eaaudiocore_header(STREAMFILE * streamHead, STREAMFILE * streamData, off_t header_offset, off_t start_offset, meta_t meta_type); static VGMSTREAM * init_vgmstream_eaaudiocore_header(STREAMFILE * streamHead, STREAMFILE * streamData, off_t header_offset, off_t start_offset, meta_t meta_type);
static size_t get_snr_size(STREAMFILE *streamFile, off_t offset); static size_t get_snr_size(STREAMFILE *streamFile, off_t offset);
static VGMSTREAM *parse_s10a_header(STREAMFILE *streamFile, off_t offset); static VGMSTREAM *parse_s10a_header(STREAMFILE *streamFile, off_t offset, uint16_t target_index);
/* .SNR+SNS - from EA latest games (~2008-2013), v0 header */ /* .SNR+SNS - from EA latest games (~2008-2013), v0 header */
VGMSTREAM * init_vgmstream_ea_snr_sns(STREAMFILE * streamFile) { VGMSTREAM * init_vgmstream_ea_snr_sns(STREAMFILE * streamFile) {
@ -150,10 +150,10 @@ fail:
return NULL; return NULL;
} }
/* EA HDR/STH/DAT - used for storing speech in some newer games */ /* EA HDR/STH/DAT - seen in early 7th-gen games, used for storing speech */
VGMSTREAM * init_vgmstream_ea_hdr_sth_dat(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_ea_hdr_sth_dat(STREAMFILE *streamFile) {
int target_stream = streamFile->stream_index; int target_stream = streamFile->stream_index;
uint8_t userdata_size, total_sounds, block_id, flags; uint8_t userdata_size, total_sounds, block_id;
uint8_t i; uint8_t i;
off_t snr_offset, sns_offset; off_t snr_offset, sns_offset;
size_t file_size, block_size; size_t file_size, block_size;
@ -209,7 +209,6 @@ VGMSTREAM * init_vgmstream_ea_hdr_sth_dat(STREAMFILE *streamFile) {
for (i = 0; i < total_sounds; i++) { for (i = 0; i < total_sounds; i++) {
snr_offset = (off_t)read_16bitBE(0x10 + (0x02+userdata_size) * i, streamFile) + 0x04; snr_offset = (off_t)read_16bitBE(0x10 + (0x02+userdata_size) * i, streamFile) + 0x04;
flags = (read_8bit(snr_offset + 0x04, sthFile) >> 4) & 0x0F;
if (i == target_stream - 1) if (i == target_stream - 1)
break; break;
@ -228,13 +227,8 @@ VGMSTREAM * init_vgmstream_ea_hdr_sth_dat(STREAMFILE *streamFile) {
sns_offset += block_size; sns_offset += block_size;
if (flags & 4) { if (block_id == 0x80)
if (block_id == 0x80)
break;
}
else {
break; break;
}
} }
} }
@ -260,9 +254,9 @@ fail:
VGMSTREAM * init_vgmstream_ea_abk_new(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_ea_abk_new(STREAMFILE *streamFile) {
int is_dupe, total_sounds = 0, target_stream = streamFile->stream_index; int is_dupe, total_sounds = 0, target_stream = streamFile->stream_index;
off_t bnk_offset, header_table_offset, base_offset, value_offset, table_offset, entry_offset; off_t bnk_offset, header_table_offset, base_offset, value_offset, table_offset, entry_offset;
uint32_t i, j, k, num_sounds, total_sound_tables; uint32_t i, j, k, version, num_sounds, total_sound_tables;
uint16_t num_tables, bnk_index, bnk_target_index; uint16_t num_tables, bnk_index, bnk_target_index;
uint8_t version, num_entries; uint8_t num_entries;
off_t sound_table_offsets[0x2000]; off_t sound_table_offsets[0x2000];
STREAMFILE *astData = NULL; STREAMFILE *astData = NULL;
VGMSTREAM *vgmstream; VGMSTREAM *vgmstream;
@ -276,8 +270,8 @@ VGMSTREAM * init_vgmstream_ea_abk_new(STREAMFILE *streamFile) {
if (read_32bitBE(0x00, streamFile) != 0x41424B43) /* "ABKC" */ if (read_32bitBE(0x00, streamFile) != 0x41424B43) /* "ABKC" */
goto fail; goto fail;
version = read_8bit(0x06, streamFile); version = read_32bitBE(0x04, streamFile);
if (version != 0x02) if (version != 0x01010202)
goto fail; goto fail;
/* use table offset to check endianness */ /* use table offset to check endianness */
@ -357,7 +351,6 @@ fail:
/* EA S10A header - seen inside new ABK files. Putting it here in case it's encountered stand-alone. */ /* EA S10A header - seen inside new ABK files. Putting it here in case it's encountered stand-alone. */
static VGMSTREAM * parse_s10a_header(STREAMFILE *streamFile, off_t offset, uint16_t target_index) { static VGMSTREAM * parse_s10a_header(STREAMFILE *streamFile, off_t offset, uint16_t target_index) {
int i;
uint32_t header, num_sounds; uint32_t header, num_sounds;
off_t snr_offset, sns_offset; off_t snr_offset, sns_offset;

17
src/meta/ea_schl.c
View File

@ -131,13 +131,15 @@ fail:
return NULL; return NULL;
} }
/* EA ABK - contains embedded BNK file or references streams in AST file */ /* EA ABK - common soundbank format in 6th-gen games, can reference RAM and streamed assets */
/* RAM assets are stored in embedded BNK file */
/* streamed assets are stored externally in AST file (mostly seen in earlier 6th games) */
VGMSTREAM * init_vgmstream_ea_abk(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_ea_abk(STREAMFILE *streamFile) {
int bnk_target_stream, is_dupe, total_sounds = 0, target_stream = streamFile->stream_index; int bnk_target_stream, is_dupe, total_sounds = 0, target_stream = streamFile->stream_index;
off_t bnk_offset, header_table_offset, base_offset, value_offset, table_offset, entry_offset, target_entry_offset, schl_offset; off_t bnk_offset, header_table_offset, base_offset, value_offset, table_offset, entry_offset, target_entry_offset, schl_offset;
uint32_t i, j, k, num_sounds, total_sound_tables; uint32_t i, j, k, version, num_sounds, total_sound_tables;
uint16_t num_tables; uint16_t num_tables;
uint8_t version, sound_type, num_entries; uint8_t sound_type, num_entries;
off_t sound_table_offsets[0x2000]; off_t sound_table_offsets[0x2000];
STREAMFILE * astData = NULL; STREAMFILE * astData = NULL;
VGMSTREAM * vgmstream; VGMSTREAM * vgmstream;
@ -151,8 +153,9 @@ VGMSTREAM * init_vgmstream_ea_abk(STREAMFILE *streamFile) {
if (read_32bitBE(0x00, streamFile) != 0x41424B43) /* "ABKC" */ if (read_32bitBE(0x00, streamFile) != 0x41424B43) /* "ABKC" */
goto fail; goto fail;
version = read_8bit(0x06, streamFile); version = read_32bitBE(0x04, streamFile);
if (version > 0x01) if (version != 0x01010000 &&
version != 0x01010100)
goto fail; goto fail;
/* use table offset to check endianness */ /* use table offset to check endianness */
@ -272,7 +275,7 @@ fail:
return NULL; return NULL;
} }
/* EA HDR/DAT combo - frequently used for storing speech */ /* EA HDR/DAT combo - seen in late 6th-gen games, used for storing speech and other streamed sounds (except for music) */
VGMSTREAM * init_vgmstream_ea_hdr_dat(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_ea_hdr_dat(STREAMFILE *streamFile) {
int target_stream = streamFile->stream_index; int target_stream = streamFile->stream_index;
uint8_t userdata_size, total_sounds; uint8_t userdata_size, total_sounds;
@ -324,7 +327,7 @@ fail:
return NULL; return NULL;
} }
/* EA IDX/BIG combo - used for storing speech, it's basically a set of HDR/DAT compiled into one file */ /* EA IDX/BIG combo - basically a set of HDR/DAT compiled into one file */
VGMSTREAM * init_vgmstream_ea_idx_big(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_ea_idx_big(STREAMFILE *streamFile) {
int target_stream = streamFile->stream_index, total_sounds, subsound_index; int target_stream = streamFile->stream_index, total_sounds, subsound_index;
uint32_t num_hdr; uint32_t num_hdr;