Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-22 05:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

EA SCHl: Restored sound merging hack

Browse Source 
Too many sets rely on it, not worth it
This commit is contained in:
NicknineTheEagle 2018-12-27 23:16:59 +03:00
parent 6231905a79
commit 7418e32482
2 changed files with 71 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/layout/blocked_ea_schl.c
View File

@ -6,6 +6,7 @@
void block_update_ea_schl(off_t block_offset, VGMSTREAM * vgmstream) { void block_update_ea_schl(off_t block_offset, VGMSTREAM * vgmstream) {
STREAMFILE* streamFile = vgmstream->ch[0].streamfile; STREAMFILE* streamFile = vgmstream->ch[0].streamfile;
int i; int i;
int new_schl = 0;
size_t block_size, block_samples; size_t block_size, block_samples;
int32_t (*read_32bit)(off_t,STREAMFILE*) = vgmstream->codec_endian ? read_32bitBE : read_32bitLE; int32_t (*read_32bit)(off_t,STREAMFILE*) = vgmstream->codec_endian ? read_32bitBE : read_32bitLE;
@ -48,11 +49,24 @@ void block_update_ea_schl(off_t block_offset, VGMSTREAM * vgmstream) {
break; break;
} }
/* "SCHl" start block (movie "SHxx" shouldn't use multi files) */
if (block_id == 0x5343486C)
new_schl = 1;
/* padding between "SCEl" and next "SCHl" (when subfiles exist) */
if (block_id == 0x00000000)
block_size = 0x04;
/* guard against errors (happens in bad rips/endianness, observed max is vid ~0x20000) */ /* guard against errors (happens in bad rips/endianness, observed max is vid ~0x20000) */
if (block_size == 0x00 || block_size > 0xFFFFF || block_samples > 0xFFFF) { if (block_size == 0x00 || block_size > 0xFFFFF || block_samples > 0xFFFF) {
block_size = 0x04; block_size = 0x04;
block_samples = 0; block_samples = 0;
} }
/* "SCEl" end chunk should be 32b-aligned, fixes some multi-SCHl [ex. Need for Speed 2 (PC) .eam] */
if (((block_offset + block_size) % 0x04) && block_id == 0x5343456C) {
block_size += 0x04 - ((block_offset + block_size) % 0x04);
}
} }
@ -151,6 +165,11 @@ void block_update_ea_schl(off_t block_offset, VGMSTREAM * vgmstream) {
vgmstream->ch[i].offset = block_offset + 0x0C + (0x04*vgmstream->channels) + channel_start; vgmstream->ch[i].offset = block_offset + 0x0C + (0x04*vgmstream->channels) + channel_start;
} }
/* SCHl with multiple SCHl need to reset their MPEG decoder as there are trailing samples in the buffers */
if (new_schl) {
flush_mpeg(vgmstream->codec_data);
}
break; break;
#endif #endif
/* id, size, samples, offsets-per-channel, interleaved data (w/ optional hist per channel) */ /* id, size, samples, offsets-per-channel, interleaved data (w/ optional hist per channel) */

63
src/meta/ea_schl.c
View File

@ -97,13 +97,14 @@ typedef struct {
int codec_config; int codec_config;
} ea_header; } ea_header;
static VGMSTREAM * parse_schl_block(STREAMFILE *streamFile, off_t offset); static VGMSTREAM * parse_schl_block(STREAMFILE *streamFile, off_t offset, int standalone);
static VGMSTREAM * parse_bnk_header(STREAMFILE *streamFile, off_t offset, int target_stream, int is_embedded); static VGMSTREAM * parse_bnk_header(STREAMFILE *streamFile, off_t offset, int target_stream, int is_embedded);
static int parse_variable_header(STREAMFILE* streamFile, ea_header* ea, off_t begin_offset, int max_length, int bnk_version); static int parse_variable_header(STREAMFILE* streamFile, ea_header* ea, off_t begin_offset, int max_length, int bnk_version);
static uint32_t read_patch(STREAMFILE* streamFile, off_t* offset); static uint32_t read_patch(STREAMFILE* streamFile, off_t* offset);
static off_t get_ea_stream_mpeg_start_offset(STREAMFILE* streamFile, off_t start_offset, const ea_header* ea); static off_t get_ea_stream_mpeg_start_offset(STREAMFILE* streamFile, off_t start_offset, const ea_header* ea);
static VGMSTREAM * init_vgmstream_ea_variable_header(STREAMFILE *streamFile, ea_header *ea, off_t start_offset, int is_bnk); static VGMSTREAM * init_vgmstream_ea_variable_header(STREAMFILE *streamFile, ea_header *ea, off_t start_offset, int is_bnk, int standalone);
static int get_ea_stream_size(STREAMFILE* streamFile, off_t start_offset, VGMSTREAM *vgmstream); static int get_ea_stream_size(STREAMFILE* streamFile, off_t start_offset, VGMSTREAM *vgmstream);
static int get_ea_stream_total_samples(STREAMFILE* streamFile, off_t start_offset, VGMSTREAM* vgmstream);
/* EA SCHl with variable header - from EA games (roughly 1997~2010); generated by EA Canada's sx.exe/Sound eXchange */ /* EA SCHl with variable header - from EA games (roughly 1997~2010); generated by EA Canada's sx.exe/Sound eXchange */
VGMSTREAM * init_vgmstream_ea_schl(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_ea_schl(STREAMFILE *streamFile) {
@ -126,7 +127,7 @@ VGMSTREAM * init_vgmstream_ea_schl(STREAMFILE *streamFile) {
/* Stream is divided into blocks/chunks: SCHl=audio header, SCCl=count of SCDl, SCDl=data xN, SCLl=loop end, SCEl=end. /* Stream is divided into blocks/chunks: SCHl=audio header, SCCl=count of SCDl, SCDl=data xN, SCLl=loop end, SCEl=end.
* Video uses picture blocks (MVhd/MV0K/etc) and sometimes multiaudio blocks (SHxx/SCxx/SDxx/SExx where xx=language=EN/FR/GE/IT/SP/RU/JA). * Video uses picture blocks (MVhd/MV0K/etc) and sometimes multiaudio blocks (SHxx/SCxx/SDxx/SExx where xx=language=EN/FR/GE/IT/SP/RU/JA).
* The number/size is affected by: block rate setting, sample rate, channels, CPU location (SPU/main/DSP/others), etc */ * The number/size is affected by: block rate setting, sample rate, channels, CPU location (SPU/main/DSP/others), etc */
return parse_schl_block(streamFile, 0x00); return parse_schl_block(streamFile, 0x00, 1);
fail: fail:
return NULL; return NULL;
@ -280,7 +281,7 @@ VGMSTREAM * init_vgmstream_ea_abk(STREAMFILE *streamFile) {
if (read_32bitBE(schl_offset, astData) != EA_BLOCKID_HEADER) if (read_32bitBE(schl_offset, astData) != EA_BLOCKID_HEADER)
goto fail; goto fail;
vgmstream = parse_schl_block(astData, schl_offset); vgmstream = parse_schl_block(astData, schl_offset, 0);
if (!vgmstream) if (!vgmstream)
goto fail; goto fail;
break; break;
@ -340,7 +341,7 @@ VGMSTREAM * init_vgmstream_ea_hdr_dat(STREAMFILE *streamFile) {
if (read_32bitBE(schl_offset, datFile) != EA_BLOCKID_HEADER) if (read_32bitBE(schl_offset, datFile) != EA_BLOCKID_HEADER)
goto fail; goto fail;
vgmstream = parse_schl_block(datFile, schl_offset); vgmstream = parse_schl_block(datFile, schl_offset, 0);
if (!vgmstream) if (!vgmstream)
goto fail; goto fail;
@ -400,7 +401,7 @@ VGMSTREAM * init_vgmstream_ea_map_mus(STREAMFILE *streamFile) {
if (read_32bitBE(schl_offset, musFile) != EA_BLOCKID_HEADER) if (read_32bitBE(schl_offset, musFile) != EA_BLOCKID_HEADER)
goto fail; goto fail;
vgmstream = parse_schl_block(musFile, schl_offset); vgmstream = parse_schl_block(musFile, schl_offset, 0);
if (!vgmstream) if (!vgmstream)
goto fail; goto fail;
@ -494,7 +495,7 @@ VGMSTREAM * init_vgmstream_ea_mpf_mus(STREAMFILE *streamFile) {
if (read_32bitBE(schl_offset, musFile) != EA_BLOCKID_HEADER) if (read_32bitBE(schl_offset, musFile) != EA_BLOCKID_HEADER)
goto fail; goto fail;
vgmstream = parse_schl_block(musFile, schl_offset); vgmstream = parse_schl_block(musFile, schl_offset, 0);
if (!vgmstream) if (!vgmstream)
goto fail; goto fail;
@ -508,7 +509,7 @@ fail:
} }
/* EA SCHl with variable header - from EA games (roughly 1997~2010); generated by EA Canada's sx.exe/Sound eXchange */ /* EA SCHl with variable header - from EA games (roughly 1997~2010); generated by EA Canada's sx.exe/Sound eXchange */
static VGMSTREAM * parse_schl_block(STREAMFILE *streamFile, off_t offset) { static VGMSTREAM * parse_schl_block(STREAMFILE *streamFile, off_t offset, int standalone) {
off_t start_offset, header_offset; off_t start_offset, header_offset;
size_t header_size; size_t header_size;
ea_header ea = { 0 }; ea_header ea = { 0 };
@ -529,7 +530,7 @@ static VGMSTREAM * parse_schl_block(STREAMFILE *streamFile, off_t offset) {
start_offset = offset + header_size; /* starts in "SCCl" (skipped in block layout) or very rarely "SCDl" and maybe movie blocks */ start_offset = offset + header_size; /* starts in "SCCl" (skipped in block layout) or very rarely "SCDl" and maybe movie blocks */
/* rest is common */ /* rest is common */
return init_vgmstream_ea_variable_header(streamFile, &ea, start_offset, 0); return init_vgmstream_ea_variable_header(streamFile, &ea, start_offset, 0, standalone);
fail: fail:
return NULL; return NULL;
@ -620,7 +621,7 @@ static VGMSTREAM * parse_bnk_header(STREAMFILE *streamFile, off_t offset, int ta
start_offset = ea.offsets[0]; /* first channel, presumably needed for MPEG */ start_offset = ea.offsets[0]; /* first channel, presumably needed for MPEG */
/* rest is common */ /* rest is common */
vgmstream = init_vgmstream_ea_variable_header(streamFile, &ea, start_offset, bnk_version); vgmstream = init_vgmstream_ea_variable_header(streamFile, &ea, start_offset, bnk_version, 0);
if (!vgmstream) goto fail; if (!vgmstream) goto fail;
if (!is_embedded) { if (!is_embedded) {
vgmstream->num_streams = real_bnk_sounds; vgmstream->num_streams = real_bnk_sounds;
@ -633,7 +634,7 @@ fail:
} }
/* inits VGMSTREAM from a EA header */ /* inits VGMSTREAM from a EA header */
static VGMSTREAM * init_vgmstream_ea_variable_header(STREAMFILE *streamFile, ea_header * ea, off_t start_offset, int bnk_version) { static VGMSTREAM * init_vgmstream_ea_variable_header(STREAMFILE *streamFile, ea_header * ea, off_t start_offset, int bnk_version, int standalone) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM * vgmstream = NULL;
int i, ch; int i, ch;
int is_bnk = bnk_version; int is_bnk = bnk_version;
@ -866,6 +867,14 @@ static VGMSTREAM * init_vgmstream_ea_variable_header(STREAMFILE *streamFile, ea_
} }
else { else {
vgmstream->stream_size = get_ea_stream_size(streamFile, start_offset, vgmstream); vgmstream->stream_size = get_ea_stream_size(streamFile, start_offset, vgmstream);
/* regular SCHls, except ATRAC3plus */
if (standalone) {
/* HACK: fix num_samples for streams with multiple SCHl. Need to eventually get rid of this */
int total_samples = get_ea_stream_total_samples(streamFile, start_offset, vgmstream);
if (total_samples > vgmstream->num_samples)
vgmstream->num_samples = total_samples;
}
} }
return vgmstream; return vgmstream;
@ -1284,6 +1293,38 @@ static int get_ea_stream_size(STREAMFILE* streamFile, off_t start_offset, VGMSTR
return stream_size; return stream_size;
} }
/* Get total samples by parsing block headers, needed when multiple files are stitched together.
* Some EA files (.mus/eam/sng/etc) concat many small subfiles, used for interactive/mapped
* music (.map/lin). Subfiles always share header, except num_samples. */
static int get_ea_stream_total_samples(STREAMFILE* streamFile, off_t start_offset, VGMSTREAM* vgmstream) {
int num_samples = 0;
int multiple_schl = 0;
/* calc num_samples as playable data size varies between files/blocks */
{
vgmstream->next_block_offset = start_offset;
do {
uint32_t block_id = read_32bitBE(vgmstream->next_block_offset + 0x00, streamFile);
if (block_id == EA_BLOCKID_HEADER) /* "SCHl" start block (movie "SHxx" shouldn't use multi files) */
multiple_schl = 1;
block_update_ea_schl(vgmstream->next_block_offset, vgmstream);
num_samples += vgmstream->current_block_samples;
} while (vgmstream->next_block_offset < get_streamfile_size(streamFile));
/* reset after getting samples */
block_update(start_offset, vgmstream);
}
/* only use calculated samples with multiple subfiles (rarely header samples may be less due to padding) */
if (multiple_schl) {
; VGM_LOG("EA SCHl: multiple SCHl found\n");
return num_samples;
} else {
return 0;
}
}
/* find data start offset inside the first SCDl; not very elegant but oh well */ /* find data start offset inside the first SCDl; not very elegant but oh well */
static off_t get_ea_stream_mpeg_start_offset(STREAMFILE* streamFile, off_t start_offset, const ea_header* ea) { static off_t get_ea_stream_mpeg_start_offset(STREAMFILE* streamFile, off_t start_offset, const ea_header* ea) {
size_t file_size = get_streamfile_size(streamFile); size_t file_size = get_streamfile_size(streamFile);