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

Adjust Maxis XA header detection (again)

Browse Source
This commit is contained in:
Mateus B. Cassiano 2021-05-09 08:21:44 -04:00
parent 5757eee603
commit b73197d751
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/formats.c
View File

@ -1101,7 +1101,7 @@ static const meta_info meta_info_list[] = {
{meta_CAFF, "Apple Core Audio Format File header"}, {meta_CAFF, "Apple Core Audio Format File header"},
{meta_PC_MXST, "Lego Island MxSt Header"}, {meta_PC_MXST, "Lego Island MxSt Header"},
{meta_SAB, "Sensaura SAB header"}, {meta_SAB, "Sensaura SAB header"},
{meta_MAXIS_XA, "Maxis XAI/XAJ Header"}, {meta_MAXIS_XA, "Maxis XA Header"},
{meta_EXAKT_SC, "assumed Activision / EXAKT SC by extension"}, {meta_EXAKT_SC, "assumed Activision / EXAKT SC by extension"},
{meta_WII_BNS, "Nintendo BNS header"}, {meta_WII_BNS, "Nintendo BNS header"},
{meta_WII_WAS, "Sumo Digital iSWS header"}, {meta_WII_WAS, "Sumo Digital iSWS header"},

30
src/meta/maxis_xa.c
View File

@ -1,32 +1,46 @@
#include "meta.h" #include "meta.h"
#include "../util.h" #include "../util.h"
/* Maxis XA - found in Sim City 3000 (PC) */ /* Maxis XA - found in Sim City 3000 (PC), The Sims 2 (PC) */
VGMSTREAM * init_vgmstream_maxis_xa(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_maxis_xa(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM * vgmstream = NULL;
off_t start_offset; off_t start_offset;
int loop_flag, channel_count; int avg_byte_rate, channel_count, loop_flag, resolution, sample_align, sample_rate;
/* check extension, case insensitive */ /* check extension, case insensitive */
if (!check_extensions(streamFile,"xa")) if (!check_extensions(streamFile,"xa"))
goto fail; goto fail;
/* check header */ /* check header */
if ((read_32bitBE(0x00,streamFile) != 0x58414900) && /* "XAI\0" (sound/speech) */ if ((read_16bitBE(0x00,streamFile) != 0x5841)) /* "XA" */
(read_32bitBE(0x00,streamFile) != 0x58414A00) && /* "XAJ\0" (music, no apparent diffs) */ goto fail;
(read_32bitBE(0x00,streamFile) != 0x58410000) && /* "XA\0\0" (sound/speech from The Sims 2, no apparent diffs) */
(read_32bitBE(0x00,streamFile) != 0x58411200)) /* "XA\x12\0" (music from The Sims 2, no apparent diffs) */ /* check format tag */
if ((read_16bitLE(0x08,streamFile) != 0x0001))
goto fail;
channel_count = read_16bitLE(0x0A,streamFile);
sample_rate = read_32bitLE(0x0C,streamFile);
avg_byte_rate = read_32bitLE(0x10,streamFile);
sample_align = read_16bitLE(0x14,streamFile);
resolution = read_16bitLE(0x16,streamFile);
/* check alignment */
if (sample_align != (resolution/8)*channel_count)
goto fail;
/* check average byte rate */
if (avg_byte_rate != sample_rate*sample_align)
goto fail; goto fail;
loop_flag = 0; loop_flag = 0;
channel_count = read_16bitLE(0x0A,streamFile);
start_offset = 0x18; start_offset = 0x18;
/* build the VGMSTREAM */ /* build the VGMSTREAM */
vgmstream = allocate_vgmstream(channel_count,loop_flag); vgmstream = allocate_vgmstream(channel_count,loop_flag);
if (!vgmstream) goto fail; if (!vgmstream) goto fail;
vgmstream->sample_rate = read_32bitLE(0x0C,streamFile); vgmstream->sample_rate = sample_rate;
vgmstream->num_samples = read_32bitLE(0x04,streamFile)/2/channel_count; vgmstream->num_samples = read_32bitLE(0x04,streamFile)/2/channel_count;
vgmstream->meta_type = meta_MAXIS_XA; vgmstream->meta_type = meta_MAXIS_XA;