Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-24 06:50:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some .snu [Dead Space 3 (PC)]

Browse Source
This commit is contained in:
bnnm 2023-12-31 02:08:26 +01:00
parent 14336e9795
commit f76dc31146
3 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/meta/ea_eaac.c
View File

@ -40,10 +40,11 @@
#define EAAC_BLOCKID1_DATA 0x44 /* 'D' */
#define EAAC_BLOCKID1_END 0x45 /* 'E' */
static VGMSTREAM* init_vgmstream_eaaudiocore_header(STREAMFILE* sf_head, STREAMFILE* sf_data, off_t header_offset, off_t start_offset, meta_t meta_type, bool standalone);
static VGMSTREAM* init_vgmstream_eaaudiocore_header(STREAMFILE* sf_head, STREAMFILE* sf_data, off_t header_offset, off_t start_offset, meta_t meta_type, bool standalone, bool is_sps);
VGMSTREAM* load_vgmstream_ea_eaac(eaac_meta_t* info) {
return init_vgmstream_eaaudiocore_header(info->sf_head, info->sf_body, info->head_offset, info->body_offset, info->type, info->standalone);
info->is_sps = info->is_sps || info->type == meta_EA_SPS;
return init_vgmstream_eaaudiocore_header(info->sf_head, info->sf_body, info->head_offset, info->body_offset, info->type, info->standalone, info->is_sps);
}
@ -77,12 +78,12 @@ static VGMSTREAM* init_vgmstream_eaaudiocore_main(eaac_header_t* eaac, STREAMFIL
* Audio "assets" come in separate RAM headers (.SNR/SPH) and raw blocked streams (.SNS/SPS),
* or together in pseudoformats (.SNU, .SBR+.SBS banks, .AEMS, .MUS, etc).
* Some .SNR include stream data, while .SPS have headers so .SPH is optional. */
static VGMSTREAM* init_vgmstream_eaaudiocore_header(STREAMFILE* sf_head, STREAMFILE* sf_data, off_t header_offset, off_t start_offset, meta_t meta_type, bool standalone) {
static VGMSTREAM* init_vgmstream_eaaudiocore_header(STREAMFILE* sf_head, STREAMFILE* sf_data, off_t header_offset, off_t start_offset, meta_t meta_type, bool standalone, bool is_sps) {
eaac_header_t eaac = {0};
/* SPS put the header in the first block */
uint32_t header_block_size = 0;
if (meta_type == meta_EA_SPS) {
if (is_sps) {
uint32_t header_block_info = read_u32be(header_offset, sf_head);
uint8_t header_block_id;

29
src/meta/ea_eaac_standard.c
View File

@ -2,6 +2,9 @@
#include "../util/endianness.h"
#define EAAC_BLOCKID1_HEADER 0x48 /* 'H' */
/* .SNR+SNS - from EA latest games (~2005-2010), v0 header */
VGMSTREAM* init_vgmstream_ea_snr_sns(STREAMFILE* sf) {
eaac_meta_t info = {0};
@ -23,6 +26,8 @@ VGMSTREAM* init_vgmstream_ea_sps(STREAMFILE* sf) {
eaac_meta_t info = {0};
/* checks */
if (read_u8(0x00, sf) != EAAC_BLOCKID1_HEADER) /* validated later but fails faster */
return NULL;
if (!check_extensions(sf,"sps"))
return NULL;
@ -54,10 +59,24 @@ VGMSTREAM* init_vgmstream_ea_snu(STREAMFILE* sf) {
/* use start offset as endianness flag */
read_u32 = guess_read_u32(0x08,sf);
info.sf_head = sf;
info.sf_body = sf;
info.head_offset = 0x10; /* SNR header */
info.body_offset = read_u32(0x08,sf); /* SNS blocks */
info.type = meta_EA_SNU;
uint32_t body_offset = read_u32(0x08,sf);
uint8_t block_id = read_u8(body_offset, sf);
if (block_id == EAAC_BLOCKID1_HEADER) {
/* Dead Space 3 (PC) */
info.sf_head = sf;
info.head_offset = body_offset; /* header also at 0x10, but useless in SPS */
info.type = meta_EA_SNU;
info.is_sps = true;
}
else {
info.sf_head = sf;
info.sf_body = sf;
info.head_offset = 0x10; /* SNR header */
info.body_offset = body_offset; /* SNR body */
info.type = meta_EA_SNU;
}
return load_vgmstream_ea_eaac(&info);
}

1
src/meta/meta.h
View File

@ -657,6 +657,7 @@ typedef struct {
uint32_t body_offset;
meta_t type;
bool standalone;
bool is_sps;
} eaac_meta_t;
VGMSTREAM* load_vgmstream_ea_eaac(eaac_meta_t* info);