Updated VGMStream to r1667-90-gc57f4383
Christopher Snowhill
parent
4344f358c2
commit
58384cb831
|
|
@ -465,6 +465,7 @@ static const char* extension_list[] = {
|
|||
"seb",
|
||||
"sed",
|
||||
"seg",
|
||||
"sem", //txth/reserved [Oretachi Game Center Zoku: Sonic Wings (PS2)]
|
||||
"sf0",
|
||||
"sfl",
|
||||
"sfs",
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ VGMSTREAM* init_vgmstream_bkhd(STREAMFILE* sf) {
|
|||
uint32_t (*read_u32)(off_t,STREAMFILE*);
|
||||
float (*read_f32)(off_t,STREAMFILE*);
|
||||
int total_subsongs, target_subsong = sf->stream_index;
|
||||
int prefetch = 0;
|
||||
|
||||
|
||||
/* checks */
|
||||
|
|
@ -151,7 +152,7 @@ VGMSTREAM* init_vgmstream_bkhd(STREAMFILE* sf) {
|
|||
if (!temp_sf) goto fail;
|
||||
|
||||
if (is_riff) {
|
||||
vgmstream = init_vgmstream_wwise(temp_sf);
|
||||
vgmstream = init_vgmstream_wwise_bnk(temp_sf, &prefetch);
|
||||
if (!vgmstream) goto fail;
|
||||
}
|
||||
else {
|
||||
|
|
@ -178,6 +179,8 @@ VGMSTREAM* init_vgmstream_bkhd(STREAMFILE* sf) {
|
|||
snprintf(vgmstream->stream_name, STREAM_NAME_SIZE, "%u/%s", subfile_id, info);
|
||||
else
|
||||
snprintf(vgmstream->stream_name, STREAM_NAME_SIZE, "%u", subfile_id);
|
||||
if (prefetch)
|
||||
concatn(STREAM_NAME_SIZE, vgmstream->stream_name, " [pre]");
|
||||
}
|
||||
|
||||
close_streamfile(temp_sf);
|
||||
|
|
|
|||
|
|
@ -122,8 +122,8 @@ typedef struct {
|
|||
size_t stream_size;
|
||||
} ea_header;
|
||||
|
||||
static VGMSTREAM * parse_schl_block(STREAMFILE* sf, off_t offset, int standalone);
|
||||
static VGMSTREAM * parse_bnk_header(STREAMFILE* sf, off_t offset, int target_stream, int is_embedded);
|
||||
static VGMSTREAM* parse_schl_block(STREAMFILE* sf, off_t offset, int standalone);
|
||||
static VGMSTREAM* parse_bnk_header(STREAMFILE* sf, off_t offset, int target_stream, int is_embedded);
|
||||
static int parse_variable_header(STREAMFILE* sf, ea_header* ea, off_t begin_offset, int max_length, int bnk_version);
|
||||
static uint32_t read_patch(STREAMFILE* sf, off_t* offset);
|
||||
static off_t get_ea_stream_mpeg_start_offset(STREAMFILE* sf, off_t start_offset, const ea_header* ea);
|
||||
|
|
@ -1538,17 +1538,18 @@ static int parse_variable_header(STREAMFILE* sf, ea_header* ea, off_t begin_offs
|
|||
ea->codec2 = EA_CODEC2_NONE;
|
||||
|
||||
/* get platform info */
|
||||
platform_id = read_32bitBE(offset, sf);
|
||||
if (platform_id != 0x47535452 && (platform_id & 0xFFFF0000) != 0x50540000) {
|
||||
platform_id = read_u32be(offset, sf);
|
||||
if (platform_id != get_id32be("GSTR") && (platform_id & 0xFFFF0000) != get_id32be("PT\0\0")) {
|
||||
offset += 4; /* skip unknown field (related to blocks/size?) in "nbapsstream" (NBA2000 PS, FIFA2001 PS) */
|
||||
platform_id = read_32bitBE(offset, sf);
|
||||
platform_id = read_u32be(offset, sf);
|
||||
}
|
||||
if (platform_id == 0x47535452) { /* "GSTR" = Generic STReam */
|
||||
|
||||
if (platform_id == get_id32be("GSTR")) { /* Generic STReam */
|
||||
ea->platform = EA_PLATFORM_GENERIC;
|
||||
offset += 4 + 4; /* GSTRs have an extra field (config?): ex. 0x01000000, 0x010000D8 BE */
|
||||
}
|
||||
else if ((platform_id & 0xFFFF0000) == 0x50540000) { /* "PT" = PlaTform */
|
||||
ea->platform = (uint16_t)read_16bitLE(offset + 2,sf);
|
||||
else if ((platform_id & 0xFFFF0000) == get_id32be("PT\0\0")) { /* PlaTform */
|
||||
ea->platform = read_u16le(offset + 2,sf);
|
||||
offset += 4;
|
||||
}
|
||||
else {
|
||||
|
|
@ -1558,7 +1559,7 @@ static int parse_variable_header(STREAMFILE* sf, ea_header* ea, off_t begin_offs
|
|||
|
||||
/* parse mini-chunks/tags (variable, ommited if default exists; some are removed in later versions of sx.exe) */
|
||||
while (!is_header_end && offset - begin_offset < max_length) {
|
||||
uint8_t patch_type = read_8bit(offset,sf);
|
||||
uint8_t patch_type = read_u8(offset,sf);
|
||||
offset++;
|
||||
|
||||
//;{ off_t test = offset; VGM_LOG("EA SCHl: patch=%02x at %lx, value=%x\n", patch_type, offset-1, read_patch(sf, &test)); }
|
||||
|
|
@ -1568,6 +1569,8 @@ static int parse_variable_header(STREAMFILE* sf, ea_header* ea, off_t begin_offs
|
|||
read_patch(sf, &offset);
|
||||
break;
|
||||
|
||||
case 0x03: /* unknown (0x3c, rare: Madden NFL 2001 PS1) */
|
||||
case 0x04: /* unknown (0x3c, rare: Madden NFL 2001 PS1) */
|
||||
case 0x05: /* unknown (usually 0x50 except Madden NFL 3DS: 0x3e800) */
|
||||
case 0x06: /* priority (0..100, always 0x65 for streams, others for BNKs; rarely ommited) */
|
||||
case 0x07: /* unknown (BNK only: 36|3A|40) */
|
||||
|
|
@ -1734,7 +1737,7 @@ static int parse_variable_header(STREAMFILE* sf, ea_header* ea, off_t begin_offs
|
|||
break;
|
||||
|
||||
default:
|
||||
VGM_LOG("EA SCHl: unknown patch 0x%02x\n", patch_type);
|
||||
VGM_LOG("EA SCHl: unknown patch 0x%02x at %x\n", patch_type, (uint32_t)offset);
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
|
@ -1901,7 +1904,7 @@ fail:
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void update_ea_stream_size(STREAMFILE* sf, off_t start_offset, VGMSTREAM *vgmstream) {
|
||||
static void update_ea_stream_size(STREAMFILE* sf, off_t start_offset, VGMSTREAM* vgmstream) {
|
||||
uint32_t block_id;
|
||||
size_t stream_size = 0, file_size;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,98 +16,176 @@ static void load_key(ogg_vorbis_io_config_data* cfg, const uint8_t* key, size_t
|
|||
memcpy(cfg->key, key, size);
|
||||
}
|
||||
|
||||
/* parser for various encrypted games */
|
||||
VGMSTREAM* init_vgmstream_encrypted(STREAMFILE* sf) {
|
||||
VGMSTREAM* vgmstream = NULL;
|
||||
STREAMFILE* temp_sf = NULL;
|
||||
ogg_vorbis_io_config_data cfg = {0};
|
||||
typedef struct {
|
||||
uint32_t id;
|
||||
uint8_t keybuf[0x100];
|
||||
size_t key_size;
|
||||
off_t start;
|
||||
|
||||
VGMSTREAM* vgmstream;
|
||||
STREAMFILE* temp_sf;
|
||||
STREAMFILE* new_sf;
|
||||
} encrypted_t;
|
||||
|
||||
|
||||
/* checks */
|
||||
id = read_u32be(0x00, sf);
|
||||
/* The Pirate's Fate (PC) */
|
||||
static VGMSTREAM* init_vgmstream_encrypted_ogg_tpf(STREAMFILE* sf) {
|
||||
ogg_vorbis_io_config_data cfg = {0};
|
||||
encrypted_t e = {0};
|
||||
|
||||
if (check_extensions(sf,"ogg,logg")) {
|
||||
/* The Pirate's Fate (PC) */
|
||||
if (id == 0x454C513C) { /* "OggS" xored */
|
||||
load_key(&cfg, tpf_key, sizeof(tpf_key));
|
||||
}
|
||||
else {
|
||||
goto fail;
|
||||
}
|
||||
e.id = read_u32be(0x00, sf);
|
||||
if (e.id != 0x454C513C) /* "OggS" xored */
|
||||
goto fail;
|
||||
|
||||
temp_sf = setup_ogg_vorbis_streamfile(sf, &cfg);
|
||||
if (!temp_sf) goto fail;
|
||||
if (!check_extensions(sf,"ogg,logg"))
|
||||
goto fail;
|
||||
|
||||
vgmstream = init_vgmstream_ogg_vorbis(temp_sf);
|
||||
close_streamfile(temp_sf);
|
||||
return vgmstream;
|
||||
}
|
||||
load_key(&cfg, tpf_key, sizeof(tpf_key));
|
||||
|
||||
if (check_extensions(sf,"mp3")) {
|
||||
/* The Pirate's Fate (PC) */
|
||||
if ((id & 0xFFFFFF00) == 0x436F0500) { /* "ID3\0" xored */
|
||||
load_key(&cfg, tpf_key, sizeof(tpf_key));
|
||||
}
|
||||
else {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
temp_sf = setup_ogg_vorbis_streamfile(sf, &cfg);
|
||||
if (!temp_sf) goto fail;
|
||||
|
||||
#ifdef VGM_USE_FFMPEG //TODO: allow MP3 without FFmpeg
|
||||
vgmstream = init_vgmstream_ffmpeg(temp_sf);
|
||||
#endif
|
||||
close_streamfile(temp_sf);
|
||||
return vgmstream;
|
||||
}
|
||||
|
||||
if (check_extensions(sf,"wav,lwav")) {
|
||||
/* The Pirate's Fate (PC) */
|
||||
if (id == 0x58627029) { /* "RIFF" xored */
|
||||
load_key(&cfg, tpf_key, sizeof(tpf_key));
|
||||
}
|
||||
else {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
temp_sf = setup_ogg_vorbis_streamfile(sf, &cfg);
|
||||
if (!temp_sf) goto fail;
|
||||
|
||||
vgmstream = init_vgmstream_riff(temp_sf);
|
||||
close_streamfile(temp_sf);
|
||||
return vgmstream;
|
||||
}
|
||||
|
||||
if (check_extensions(sf,"bgm,mse,koe")) {
|
||||
/* Studio Ring games [Nanami to Konomi no Oshiete ABC (PC), Oyatsu no Jikan (PC)]
|
||||
* .bgm: BGM, .mse: SE, .koe: Voice */
|
||||
uint8_t keybuf[0x100];
|
||||
size_t key_size;
|
||||
off_t start;
|
||||
|
||||
if (id != get_id32be("RIFF"))
|
||||
goto fail;
|
||||
|
||||
/* Standard RIFF xor'd past "data", sometimes including extra chunks like JUNK or smpl.
|
||||
* If .bgm is added to riff.c this needs to be reworked so detection goes first, or bgm+bgmkey is
|
||||
* rejected in riff.c (most files are rejected due to the xor'd extra chunks though). */
|
||||
key_size = read_key_file(keybuf, sizeof(keybuf), sf);
|
||||
if (key_size <= 0) goto fail;
|
||||
|
||||
if (!find_chunk_le(sf, get_id32be("data"), 0x0c, 0, &start, NULL))
|
||||
goto fail;
|
||||
|
||||
temp_sf = setup_bgm_streamfile(sf, start, keybuf, key_size);
|
||||
if (!temp_sf) goto fail;
|
||||
|
||||
vgmstream = init_vgmstream_riff(temp_sf);
|
||||
close_streamfile(temp_sf);
|
||||
return vgmstream;
|
||||
}
|
||||
e.temp_sf = setup_ogg_vorbis_streamfile(sf, &cfg);
|
||||
if (!e.temp_sf) goto fail;
|
||||
|
||||
e.vgmstream = init_vgmstream_ogg_vorbis(e.temp_sf);
|
||||
close_streamfile(e.temp_sf);
|
||||
return e.vgmstream;
|
||||
|
||||
fail:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* The Pirate's Fate (PC) */
|
||||
static VGMSTREAM* init_vgmstream_encrypted_mp3_tpf(STREAMFILE* sf) {
|
||||
ogg_vorbis_io_config_data cfg = {0};
|
||||
encrypted_t e = {0};
|
||||
|
||||
e.id = read_u32be(0x00, sf);
|
||||
if ((e.id & 0xFFFFFF00) != 0x436F0500) /* "ID3\0" xored */
|
||||
goto fail;
|
||||
|
||||
if (!check_extensions(sf,"mp3"))
|
||||
goto fail;
|
||||
|
||||
load_key(&cfg, tpf_key, sizeof(tpf_key));
|
||||
|
||||
e.temp_sf = setup_ogg_vorbis_streamfile(sf, &cfg);
|
||||
if (!e.temp_sf) goto fail;
|
||||
|
||||
#ifdef VGM_USE_FFMPEG //TODO: allow MP3 without FFmpeg
|
||||
e.vgmstream = init_vgmstream_ffmpeg(e.temp_sf);
|
||||
#endif
|
||||
close_streamfile(e.temp_sf);
|
||||
return e.vgmstream;
|
||||
|
||||
fail:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Studio Ring games [Nanami to Konomi no Oshiete ABC (PC), Oyatsu no Jikan (PC)] */
|
||||
static VGMSTREAM* init_vgmstream_encrypted_riff(STREAMFILE* sf) {
|
||||
encrypted_t e = {0};
|
||||
|
||||
e.id = read_u32be(0x00, sf);
|
||||
if (e.id != get_id32be("RIFF"))
|
||||
goto fail;
|
||||
|
||||
/* .bgm: BGM, .mse: SE, .koe: Voice */
|
||||
if (!check_extensions(sf,"bgm,mse,koe"))
|
||||
goto fail;
|
||||
|
||||
/* Standard RIFF xor'd past "data", sometimes including extra chunks like JUNK or smpl.
|
||||
* If .bgm/etc is added to riff.c this needs to be reworked so detection goes first, or bgm+bgmkey is
|
||||
* rejected in riff.c (most files are rejected due to the xor'd extra chunks though). */
|
||||
e.key_size = read_key_file(e.keybuf, sizeof(e.keybuf), sf);
|
||||
if (e.key_size <= 0) goto fail;
|
||||
|
||||
if (!find_chunk_le(sf, get_id32be("data"), 0x0c, 0, &e.start, NULL))
|
||||
goto fail;
|
||||
|
||||
e.temp_sf = setup_bgm_streamfile(sf, e.start, e.keybuf, e.key_size);
|
||||
if (!e.temp_sf) goto fail;
|
||||
|
||||
e.vgmstream = init_vgmstream_riff(e.temp_sf);
|
||||
close_streamfile(e.temp_sf);
|
||||
return e.vgmstream;
|
||||
|
||||
fail:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* RPGMVO / Omori (PC) */
|
||||
static VGMSTREAM* init_vgmstream_encrypted_rpgmvo_riff(STREAMFILE* sf) {
|
||||
ogg_vorbis_io_config_data cfg = {0};
|
||||
encrypted_t e = {0};
|
||||
uint32_t xor;
|
||||
uint32_t riff_size;
|
||||
|
||||
if (!is_id64be(0x00, sf, "RPGMV\0\0\0"))
|
||||
goto fail;
|
||||
|
||||
if (!check_extensions(sf,"rpgmvo"))
|
||||
goto fail;
|
||||
|
||||
/* 0x08: version? */
|
||||
|
||||
|
||||
/* Ogg .rpgmvo has per-game key, so this is probably the same. Reversing key is simple though,
|
||||
* calc suspected key and pass to RIFF to validate (format is the same as Ogg) */
|
||||
riff_size = get_streamfile_size(sf) - 0x10;
|
||||
|
||||
xor = read_u32be(0x10, sf);
|
||||
xor ^= get_id32be("RIFF");
|
||||
put_u32be(e.keybuf + 0x00, xor);
|
||||
|
||||
xor = read_u32le(0x14, sf);
|
||||
xor ^= riff_size - 0x08;
|
||||
put_u32le(e.keybuf + 0x04, xor);
|
||||
|
||||
xor = read_u32be(0x18, sf);
|
||||
xor ^= get_id32be("WAVE");
|
||||
put_u32be(e.keybuf + 0x08, xor);
|
||||
|
||||
xor = read_u32be(0x1c, sf);
|
||||
xor ^= get_id32be("fmt ");
|
||||
put_u32be(e.keybuf + 0x0c, xor);
|
||||
|
||||
e.key_size = 0x10;
|
||||
load_key(&cfg, e.keybuf, e.key_size);
|
||||
cfg.start = 0x10;
|
||||
cfg.max_offset = 0x10;
|
||||
|
||||
e.temp_sf = setup_ogg_vorbis_streamfile(sf, &cfg);
|
||||
if (!e.temp_sf) goto fail;
|
||||
|
||||
e.new_sf = setup_subfile_streamfile(e.temp_sf, 0x10, riff_size, "wav");
|
||||
if (!e.new_sf) goto fail;
|
||||
dump_streamfile(e.new_sf, 0);
|
||||
e.vgmstream = init_vgmstream_riff(e.new_sf);
|
||||
close_streamfile(e.temp_sf);
|
||||
close_streamfile(e.new_sf);
|
||||
return e.vgmstream;
|
||||
|
||||
fail:
|
||||
close_streamfile(e.temp_sf);
|
||||
close_streamfile(e.new_sf);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
/* parser for various encrypted games */
|
||||
VGMSTREAM* init_vgmstream_encrypted(STREAMFILE* sf) {
|
||||
VGMSTREAM* v = NULL;
|
||||
|
||||
v = init_vgmstream_encrypted_ogg_tpf(sf);
|
||||
if (v) return v;
|
||||
|
||||
v = init_vgmstream_encrypted_mp3_tpf(sf);
|
||||
if (v) return v;
|
||||
|
||||
v = init_vgmstream_encrypted_riff(sf);
|
||||
if (v) return v;
|
||||
|
||||
v = init_vgmstream_encrypted_rpgmvo_riff(sf);
|
||||
if (v) return v;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,6 +83,9 @@ static const uint8_t key_wrb[] = { 0x46,0x58,0x6E,0x54,0x66,0x66,0x47,0x4A,0x39,
|
|||
/* Bubble Fighter (PC) */ //"qjvkeoqkrdhkdckd"
|
||||
static const uint8_t key_bbf[] = { 0x71,0x6A,0x76,0x6B,0x65,0x6F,0x71,0x6B,0x72,0x64,0x68,0x6B,0x64,0x63,0x6B,0x64 };
|
||||
|
||||
/* Fall Guys (PC)-update */ //"p@4_ih*srN:UJk&8"
|
||||
static const uint8_t key_fgs[] = { 0x70,0x40,0x34,0x5F,0x69,0x68,0x2A,0x73,0x72,0x4E,0x3A,0x55,0x4A,0x6B,0x26,0x38 };
|
||||
|
||||
// Unknown:
|
||||
// - Battle: Los Angeles
|
||||
// - Guitar Hero: Warriors of Rock, DJ hero FSB
|
||||
|
|
@ -156,6 +159,7 @@ static const fsbkey_info fsbkey_list[] = {
|
|||
{ 0,1, sizeof(key_ghm),key_ghm },// FSB4
|
||||
{ 1,0, sizeof(key_wrb),key_wrb },// FSB5
|
||||
{ 0,0, sizeof(key_bbf),key_bbf },// FSB4
|
||||
{ 1,0, sizeof(key_fgs),key_fgs },// FSB5
|
||||
};
|
||||
static const int fsbkey_list_count = sizeof(fsbkey_list) / sizeof(fsbkey_list[0]);
|
||||
|
||||
|
|
|
|||
|
|
@ -40,14 +40,13 @@ static void bruteforce_hca_key_bin_type(STREAMFILE* sf, hca_codec_data* hca_data
|
|||
hca_keytest_t hk = {0};
|
||||
|
||||
hk.subkey = subkey;
|
||||
|
||||
*p_keycode = 0;
|
||||
|
||||
/* load whole file in memory for performance (exes with keys shouldn't be too big) */
|
||||
sf_keys = open_streamfile_by_filename(sf, "keys.bin");
|
||||
if (!sf_keys) return;
|
||||
|
||||
VGM_LOG("HCA BF: test keys.bin (type %i)\n", type);
|
||||
*p_keycode = 0;
|
||||
|
||||
keys_size = get_streamfile_size(sf_keys);
|
||||
|
||||
|
|
@ -110,16 +109,14 @@ done:
|
|||
|
||||
static void bruteforce_hca_key_bin(STREAMFILE* sf, hca_codec_data* hca_data, unsigned long long* p_keycode, uint16_t subkey) {
|
||||
bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_64LE_1);
|
||||
/*
|
||||
bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_32LE_1);
|
||||
bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_64BE_1);
|
||||
bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_32BE_1);
|
||||
//bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_32LE_1);
|
||||
//bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_64BE_1);
|
||||
//bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_32BE_1);
|
||||
|
||||
bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_64LE_4);
|
||||
bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_32LE_4);
|
||||
bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_64BE_4);
|
||||
bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_32BE_4);
|
||||
*/
|
||||
//bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_64LE_4);
|
||||
//bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_32LE_4);
|
||||
//bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_64BE_4);
|
||||
//bruteforce_hca_key_bin_type(sf, hca_data, p_keycode, subkey, HBF_TYPE_32BE_4);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -137,14 +134,13 @@ static void bruteforce_hca_key_txt(STREAMFILE* sf, hca_codec_data* hca_data, uns
|
|||
hca_keytest_t hk = {0};
|
||||
|
||||
hk.subkey = subkey;
|
||||
|
||||
*p_keycode = 0;
|
||||
|
||||
/* load whole file in memory for performance (exes with keys shouldn't be too big) */
|
||||
sf_keys = open_streamfile_by_filename(sf, "keys.txt");
|
||||
if (!sf_keys) return;
|
||||
|
||||
VGM_LOG("HCA BF: test keys.txt\n");
|
||||
*p_keycode = 0;
|
||||
|
||||
keys_size = get_streamfile_size(sf_keys);
|
||||
|
||||
|
|
@ -198,14 +194,13 @@ static void bruteforce_hca_key_num(STREAMFILE* sf, hca_codec_data* hca_data, uns
|
|||
hca_keytest_t hk = {0};
|
||||
|
||||
hk.subkey = subkey;
|
||||
|
||||
*p_keycode = 0;
|
||||
|
||||
/* load whole file in memory for performance (exes with keys shouldn't be too big) */
|
||||
sf_keys = open_streamfile_by_filename(sf, "keys.num");
|
||||
if (!sf_keys) return;
|
||||
|
||||
VGM_LOG("HCA BF: test keys.num\n");
|
||||
*p_keycode = 0;
|
||||
|
||||
keys_size = get_streamfile_size(sf_keys);
|
||||
|
||||
|
|
|
|||
|
|
@ -436,6 +436,8 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0x750beaf22ddc700b}, //music_0110018
|
||||
{0x16ccc93f976a8329}, //music_0110019
|
||||
{0x9f7a0810034669fe}, //music_0110020
|
||||
{0xe8333d53d2779e38}, //music_0110021
|
||||
{0x2cdcac4f44f67075}, //music_0110022
|
||||
{0xfb647d074e53fab6}, //music_0120001
|
||||
{0xc24049b9f7ed3105}, //music_0120002
|
||||
{0xdc128f2fd48bf4b}, //music_0120003
|
||||
|
|
@ -465,6 +467,7 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0xff04547fe629c8bf}, //music_0210009
|
||||
{0x5ef795cdbcdcba91}, //music_0210010
|
||||
{0x868acc0102c59a38}, //music_0210011
|
||||
{0x6dc5ff77263450a5}, //music_0210012
|
||||
{0x15bb78c31db0a0b6}, //music_0220001
|
||||
{0x59b1257242c40109}, //music_0220002
|
||||
{0xdb402bd08d522f34}, //music_0220003
|
||||
|
|
@ -481,6 +484,7 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0x4aa31e0c4f787a8}, //music_0220014
|
||||
{0x94466db0d3c10f4b}, //music_0220015
|
||||
{0xe6d1fd6effa46736}, //music_0220017
|
||||
{0xfceaa73248868ec5}, //music_0220019
|
||||
{0x6a15a9610d10d210}, //music_0310001
|
||||
{0x57111c24801b44a1}, //music_0310002
|
||||
{0x40443974a0a86b8b}, //music_0310003
|
||||
|
|
@ -493,6 +497,7 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0xdd9ca800a7123d6f}, //music_0310010
|
||||
{0xc86f8564e0b9078c}, //music_0310011
|
||||
{0xcc5610c09f472ce9}, //music_0310012
|
||||
{0xd447a497c5547a1c}, //music_0310013
|
||||
{0xb921c3992807dadd}, //music_0320001
|
||||
{0x38ad99a045dc971f}, //music_0320002
|
||||
{0xf616642579ba5850}, //music_0320003
|
||||
|
|
@ -519,6 +524,7 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0x2e107d849959c430}, //music_0410009
|
||||
{0x75859a7a2b1ed37d}, //music_0410010
|
||||
{0x2e5f57a6c6e9c97f}, //music_0410011
|
||||
{0xa144f6d7de02e000}, //music_0410012
|
||||
{0x5d1f3fdbbb036f8d}, //music_0420001
|
||||
{0xc04264e8f34ad5c0}, //music_0420002
|
||||
{0x8f0e96b4f71f724f}, //music_0420003
|
||||
|
|
@ -534,6 +540,7 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0xd13a315c0005f0}, //music_0420013
|
||||
{0x35f2d3cec84aba1}, //music_0420014
|
||||
{0xdad11fe0e397ede}, //music_0420015
|
||||
{0xc94236c936f50cc}, //music_0420016
|
||||
{0xdf31e26a7b036a2}, //music_0510001
|
||||
{0xb2770dced3cfd9a7}, //music_0510002
|
||||
{0x6c6c1fd51e28a1e7}, //music_0510003
|
||||
|
|
@ -548,6 +555,7 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0x1980271cfe0da9bd}, //music_0510012
|
||||
{0x75c5bd4e3a01a8a4}, //music_0510013
|
||||
{0xec5f5fbe92bbb771}, //music_0510014
|
||||
{0xb8c3233338ad8e0}, //music_0510015
|
||||
{0x15f82c1617013c36}, //music_0520001
|
||||
{0xc7da8e6f0e2fe399}, //music_0520002
|
||||
{0xe350bffcdc9cb686}, //music_0520003
|
||||
|
|
@ -560,7 +568,9 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0xde4959221bc2675}, //music_0520010
|
||||
{0xeeaf8d2458ccdb36}, //music_0520011
|
||||
{0xb140168a47d55b92}, //music_0520012
|
||||
{0x2e8d1134ce415f8c}, //music_0520013
|
||||
{0x1bf43def1e4b103a}, //music_0520014
|
||||
{0x6721ad5109e4840d}, //music_0520015
|
||||
{0xd2ce91dbfc209b10}, //music_0610001
|
||||
{0xa662be1601e49476}, //music_0610002
|
||||
{0xe5e83d31e64273f8}, //music_0610003
|
||||
|
|
@ -572,6 +582,7 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0x9e68da734cc472f}, //music_0610009
|
||||
{0xa01c597d1aa13358}, //music_0610010
|
||||
{0x6492e7708204838}, //music_0610011
|
||||
{0x957e4d3948427952}, //music_0610012
|
||||
{0x8258ddd6a1d0849b}, //music_0620001
|
||||
{0x1dd21a1244ca12f1}, //music_0620002
|
||||
{0xfdec74b23d8b494b}, //music_0620003
|
||||
|
|
@ -586,6 +597,7 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0xfab3596f11cc4d7a}, //music_0620012
|
||||
{0xe35d52b6d2c094fb}, //music_0620013
|
||||
{0xcdb9bc2ad7024ca2}, //music_0620014
|
||||
{0x5de2b0a34eee1c89}, //music_0620016
|
||||
{0x2a47feac8dc3ca9c}, //music_3010001
|
||||
{0x9ebbaf63ffe9d9ef}, //music_3010002
|
||||
{0xe553dba6592293d8}, //music_3010003
|
||||
|
|
@ -606,6 +618,8 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0x100293729f35b4de}, //music_3020005
|
||||
{0x140ac59d2b870a13}, //music_3020006
|
||||
{0x402b13df5481d4e6}, //music_3020007
|
||||
{0x729efd67aede1a40}, //music_3020008
|
||||
{0xb7b9a143742fa51e}, //music_3020009
|
||||
{0xdfad847a86a126bb}, //music_5030001
|
||||
{0x711ef85045b8c26e}, //music_5030002
|
||||
{0xff7640b46d72b337}, //music_5030003
|
||||
|
|
@ -648,8 +662,16 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0x7f617e396e9a1e5c}, //music_5030040
|
||||
{0xd0471c163265ca1b}, //music_5030041
|
||||
{0xd689966609595d7d}, //music_5030042
|
||||
{0x172171a4ff10fdc1}, //music_5030043
|
||||
{0xcb2c44d594252491}, //music_5030045
|
||||
{0x458b73844ed5219e}, //music_5030048
|
||||
{0x7d83b8da9023ef26}, //music_5030049
|
||||
{0x32cb728ddab4d956}, //music_5030050
|
||||
{0x52c5dfb61fe4c87a}, //music_5030054
|
||||
{0x3ebbccab07c9a9ba}, //music_5030055
|
||||
{0x7a5e0865ba8cafa7}, //music_5030061
|
||||
{0x7679587f7292b057}, //music_5030062
|
||||
{0xc9c804e6fed3387c}, //music_5030063
|
||||
{0x444dda6d55d76095}, //music_5040001
|
||||
{0xcbf4f1324081e0a6}, //music_5040002
|
||||
{0xf1db3c1d9542063a}, //music_5040003
|
||||
|
|
@ -711,6 +733,8 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0xfac398719cd9e4a}, //music_5050039
|
||||
{0x9c4ba796548a019}, //music_5050040
|
||||
{0x7e7c462ba7d473cf}, //music_5050041
|
||||
{0x8a9a7af1379840fb}, //music_5050042
|
||||
{0xa0aa0097e5631019}, //music_5050043
|
||||
{0xe278eccf08eb2565}, //music_5050044
|
||||
{0x1cf133b26d8160d1}, //music_5050045
|
||||
{0xda08e9d3961c93f2}, //music_5050046
|
||||
|
|
@ -746,10 +770,27 @@ static const hcakey_info hcakey_list[] = {
|
|||
{0xf653b47bc8d4d1cd}, //music_5050079
|
||||
{0xb50f482149140fda}, //music_5050080
|
||||
{0xd61cc4e14e7073f4}, //music_5050081
|
||||
{0xfba77b717e43a39a}, //music_5050082
|
||||
{0x85a236b5270bac29}, //music_5050083
|
||||
{0x818d37d319d4c177}, //music_5050084
|
||||
{0xc16fb31c74eb5e59}, //music_5050085
|
||||
{0x598e133e0673b1e6}, //music_5050086
|
||||
{0x4cb2e8101df88d6f}, //music_5050087
|
||||
{0x3f8abfcd47711be2}, //music_5050088
|
||||
{0xcdb3f9edbd51012f}, //music_5050089
|
||||
{0xa28c9867b32a60e1}, //music_5050090
|
||||
{0xb1e06cf5f6a790c2}, //music_5050091
|
||||
{0xcfb9a7e64443e95c}, //music_5050093
|
||||
{0xf9ef74ac89bdfb7d}, //music_5050094
|
||||
{0x561e1e17dfb055ce}, //music_5050095
|
||||
{0x46967c2bc5d4d050}, //music_5050096
|
||||
{0xdcdaeb3067868ad9}, //music_5050097
|
||||
{0x18fab58c80c85580}, //music_5050098
|
||||
{0xba4484d824fb61af}, //music_5050099
|
||||
{0xb70fe5c5e12c7a1c}, //music_5050100
|
||||
{0x7f5d26ba72161054}, //music_5050101
|
||||
{0x52c250eade92393b}, //music_9010001
|
||||
{0xf66e6bb5b0599b07}, //music_9010002
|
||||
{0xfea0d6adff136868}, //music_9050001
|
||||
|
||||
// Mini 4WD Hyper Dash Grand Prix (Android)
|
||||
|
|
|
|||
|
|
@ -594,7 +594,8 @@ VGMSTREAM * init_vgmstream_akb2(STREAMFILE *streamFile);
|
|||
|
||||
VGMSTREAM * init_vgmstream_x360_ast(STREAMFILE *streamFile);
|
||||
|
||||
VGMSTREAM * init_vgmstream_wwise(STREAMFILE *streamFile);
|
||||
VGMSTREAM* init_vgmstream_wwise(STREAMFILE* sf);
|
||||
VGMSTREAM* init_vgmstream_wwise_bnk(STREAMFILE* sf, int* p_prefetch);
|
||||
|
||||
VGMSTREAM * init_vgmstream_ubi_raki(STREAMFILE* streamFile);
|
||||
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
struct dsp_header {
|
||||
uint32_t sample_count; /* 0x00 */
|
||||
uint32_t nibble_count; /* 0x04 (includes frame headers) */
|
||||
uint32_t sample_rate; /* 0x08 (generally 32/48kz but games like Wario World set 32028hz to adjust for GC's rate) */
|
||||
uint32_t sample_rate; /* 0x08 (generally 22/32/44/48kz but games like Wario World set 32028hz to adjust for GC's rate) */
|
||||
uint16_t loop_flag; /* 0x0c */
|
||||
uint16_t format; /* 0x0e (always 0 for ADPCM) */
|
||||
uint32_t loop_start_offset; /* 0x10 */
|
||||
uint32_t loop_end_offset; /* 0x14 */
|
||||
uint32_t ca; /* 0x18 (always 0) */
|
||||
uint32_t initial_offset; /* 0x18 ("ca", in nibbles, should be 2) */
|
||||
int16_t coef[16]; /* 0x1c (eight pairs) */
|
||||
uint16_t gain; /* 0x3c (always 0 for ADPCM) */
|
||||
uint16_t initial_ps; /* 0x3e (predictor/scale in frame header) */
|
||||
|
|
@ -22,12 +22,13 @@ struct dsp_header {
|
|||
uint16_t loop_ps; /* 0x44 (predictor/scale in loop frame header) */
|
||||
int16_t loop_hist1; /* 0x46 */
|
||||
int16_t loop_hist2; /* 0x48 */
|
||||
int16_t channel_count; /* 0x4a (DSPADPCM.exe ~v2.7 extension) */
|
||||
int16_t channels; /* 0x4a (DSPADPCM.exe ~v2.7 extension) */
|
||||
int16_t block_size; /* 0x4c */
|
||||
/* padding/reserved up to 0x60, DSPADPCM.exe from GC adds garbage here (uninitialized MSVC memory?) */
|
||||
/* padding/reserved up to 0x60, DSPADPCM.exe from GC adds garbage here (uninitialized MSVC memory?)
|
||||
* [ex. Batallion Wars (GC), Timesplitters 2 (GC)], 0xcccc...cccc with DSPADPCMD */
|
||||
};
|
||||
|
||||
/* read the above struct; returns nonzero on failure */
|
||||
/* read and do basic validations to the above struct */
|
||||
static int read_dsp_header_endian(struct dsp_header *header, off_t offset, STREAMFILE* sf, int big_endian) {
|
||||
uint32_t (*get_u32)(const uint8_t*) = big_endian ? get_u32be : get_u32le;
|
||||
uint16_t (*get_u16)(const uint8_t*) = big_endian ? get_u16be : get_u16le;
|
||||
|
|
@ -36,31 +37,68 @@ static int read_dsp_header_endian(struct dsp_header *header, off_t offset, STREA
|
|||
uint8_t buf[0x60];
|
||||
|
||||
if (offset > get_streamfile_size(sf))
|
||||
return 1;
|
||||
goto fail;
|
||||
if (read_streamfile(buf, offset, 0x60, sf) != 0x60)
|
||||
return 1;
|
||||
header->sample_count = get_u32(buf+0x00);
|
||||
header->nibble_count = get_u32(buf+0x04);
|
||||
header->sample_rate = get_u32(buf+0x08);
|
||||
header->loop_flag = get_u16(buf+0x0c);
|
||||
header->format = get_u16(buf+0x0e);
|
||||
header->loop_start_offset = get_u32(buf+0x10);
|
||||
header->loop_end_offset = get_u32(buf+0x14);
|
||||
header->ca = get_u32(buf+0x18);
|
||||
for (i=0; i < 16; i++)
|
||||
header->coef[i] = get_s16(buf+0x1c+i*0x02);
|
||||
header->gain = get_u16(buf+0x3c);
|
||||
header->initial_ps = get_u16(buf+0x3e);
|
||||
header->initial_hist1 = get_s16(buf+0x40);
|
||||
header->initial_hist2 = get_s16(buf+0x42);
|
||||
header->loop_ps = get_u16(buf+0x44);
|
||||
header->loop_hist1 = get_s16(buf+0x46);
|
||||
header->loop_hist2 = get_s16(buf+0x48);
|
||||
header->channel_count = get_s16(buf+0x4a);
|
||||
header->block_size = get_s16(buf+0x4c);
|
||||
goto fail;
|
||||
|
||||
/* Since header is rather basic add some extra checks. Some validations like samples vs nibbles
|
||||
* and loop offsets/expected values should be external, since there are buggy variations */
|
||||
|
||||
/* base */
|
||||
header->sample_count = get_u32(buf+0x00);
|
||||
if (header->sample_count > 0x10000000)
|
||||
goto fail; /* unlikely to be that big, should catch fourccs */
|
||||
header->nibble_count = get_u32(buf+0x04);
|
||||
if (header->nibble_count > 0x10000000)
|
||||
goto fail;
|
||||
|
||||
header->sample_rate = get_u32(buf+0x08);
|
||||
if (header->sample_rate < 8000 || header->sample_rate > 48000)
|
||||
goto fail; /* validated later but fail faster (unsure of min) */
|
||||
|
||||
/* context */
|
||||
header->loop_flag = get_u16(buf+0x0c);
|
||||
if (header->loop_flag != 0 && header->loop_flag != 1)
|
||||
goto fail;
|
||||
header->format = get_u16(buf+0x0e);
|
||||
if (header->format != 0)
|
||||
goto fail;
|
||||
header->loop_start_offset = get_u32(buf+0x10);
|
||||
header->loop_end_offset = get_u32(buf+0x14);
|
||||
|
||||
header->initial_offset = get_u32(buf+0x18);
|
||||
if (header->initial_offset != 2 && header->initial_offset != 0)
|
||||
goto fail; /* Dr. Muto uses 0 */
|
||||
|
||||
for (i = 0; i < 16; i++)
|
||||
header->coef[i] = get_s16(buf+0x1c + i*0x02);
|
||||
|
||||
header->gain = get_u16(buf+0x3c);
|
||||
if (header->gain != 0)
|
||||
goto fail;
|
||||
|
||||
/* decoder state */
|
||||
header->initial_ps = get_u16(buf+0x3e);
|
||||
header->initial_hist1 = get_s16(buf+0x40);
|
||||
header->initial_hist2 = get_s16(buf+0x42);
|
||||
header->loop_ps = get_u16(buf+0x44);
|
||||
header->loop_hist1 = get_s16(buf+0x46);
|
||||
header->loop_hist2 = get_s16(buf+0x48);
|
||||
|
||||
/* reserved, may contain garbage */
|
||||
header->channels = get_s16(buf+0x4a);
|
||||
header->block_size = get_s16(buf+0x4c);
|
||||
|
||||
if (header->channels > 64) /* arbitrary max */
|
||||
header->channels = 0;
|
||||
if (header->block_size > 0x100000)
|
||||
header->block_size = 0;
|
||||
|
||||
return 1;
|
||||
fail:
|
||||
return 0;
|
||||
}
|
||||
static int read_dsp_header(struct dsp_header *header, off_t offset, STREAMFILE* file) {
|
||||
static int read_dsp_header_be(struct dsp_header *header, off_t offset, STREAMFILE* file) {
|
||||
return read_dsp_header_endian(header, offset, file, 1);
|
||||
}
|
||||
static int read_dsp_header_le(struct dsp_header *header, off_t offset, STREAMFILE* file) {
|
||||
|
|
@ -115,7 +153,7 @@ static VGMSTREAM* init_vgmstream_dsp_common(STREAMFILE* sf, dsp_meta* dspm) {
|
|||
/* load standard DSP header per channel */
|
||||
{
|
||||
for (i = 0; i < dspm->channels; i++) {
|
||||
if (read_dsp_header_endian(&ch_header[i], dspm->header_offset + i*dspm->header_spacing, sf, !dspm->little_endian)) {
|
||||
if (!read_dsp_header_endian(&ch_header[i], dspm->header_offset + i*dspm->header_spacing, sf, !dspm->little_endian)) {
|
||||
//;VGM_LOG("DSP: bad header\n");
|
||||
goto fail;
|
||||
}
|
||||
|
|
@ -130,16 +168,6 @@ static VGMSTREAM* init_vgmstream_dsp_common(STREAMFILE* sf, dsp_meta* dspm) {
|
|||
}
|
||||
}
|
||||
|
||||
/* check type==0 and gain==0 */
|
||||
{
|
||||
for (i = 0; i < dspm->channels; i++) {
|
||||
if (ch_header[i].format || ch_header[i].gain) {
|
||||
//;VGM_LOG("DSP: bad type/gain\n");
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* check for agreement between channels */
|
||||
if (!dspm->ignore_header_agreement) {
|
||||
for (i = 0; i < dspm->channels - 1; i++) {
|
||||
|
|
@ -269,25 +297,23 @@ VGMSTREAM* init_vgmstream_ngc_dsp_std(STREAMFILE* sf) {
|
|||
struct dsp_header header;
|
||||
const size_t header_size = 0x60;
|
||||
off_t start_offset;
|
||||
int i, channel_count;
|
||||
int i, channels;
|
||||
|
||||
/* checks */
|
||||
if (!read_dsp_header_be(&header, 0x00, sf))
|
||||
goto fail;
|
||||
|
||||
/* .dsp: standard
|
||||
* .adp: Dr. Muto/Battalion Wars (GC) mono files
|
||||
* (extensionless): Tony Hawk's Downhill Jam (Wii) */
|
||||
if (!check_extensions(sf, "dsp,adp,"))
|
||||
goto fail;
|
||||
|
||||
if (read_dsp_header(&header, 0x00, sf))
|
||||
goto fail;
|
||||
|
||||
channel_count = 1;
|
||||
channels = 1;
|
||||
start_offset = header_size;
|
||||
|
||||
if (header.initial_ps != (uint8_t)read_8bit(start_offset,sf))
|
||||
goto fail; /* check initial predictor/scale */
|
||||
if (header.format || header.gain)
|
||||
goto fail; /* check type==0 and gain==0 */
|
||||
if (header.initial_ps != read_u8(start_offset,sf))
|
||||
goto fail;
|
||||
|
||||
/* Check for a matching second header. If we find one and it checks
|
||||
* out thoroughly, we're probably not dealing with a genuine mono DSP.
|
||||
|
|
@ -299,7 +325,7 @@ VGMSTREAM* init_vgmstream_ngc_dsp_std(STREAMFILE* sf) {
|
|||
struct dsp_header header2;
|
||||
|
||||
/* ignore headers one after another */
|
||||
ko = read_dsp_header(&header2, header_size, sf);
|
||||
ko = !read_dsp_header_be(&header2, header_size, sf);
|
||||
if (!ko &&
|
||||
header.sample_count == header2.sample_count &&
|
||||
header.nibble_count == header2.nibble_count &&
|
||||
|
|
@ -310,7 +336,7 @@ VGMSTREAM* init_vgmstream_ngc_dsp_std(STREAMFILE* sf) {
|
|||
|
||||
|
||||
/* ignore headers after interleave [Ultimate Board Collection (Wii)] */
|
||||
ko = read_dsp_header(&header2, 0x10000, sf);
|
||||
ko = !read_dsp_header_be(&header2, 0x10000, sf);
|
||||
if (!ko &&
|
||||
header.sample_count == header2.sample_count &&
|
||||
header.nibble_count == header2.nibble_count &&
|
||||
|
|
@ -324,7 +350,7 @@ VGMSTREAM* init_vgmstream_ngc_dsp_std(STREAMFILE* sf) {
|
|||
off_t loop_off;
|
||||
/* check loop predictor/scale */
|
||||
loop_off = header.loop_start_offset/16*8;
|
||||
if (header.loop_ps != (uint8_t)read_8bit(start_offset+loop_off,sf)) {
|
||||
if (header.loop_ps != read_u8(start_offset+loop_off,sf)) {
|
||||
/* rarely won't match (ex ESPN 2002), not sure if header or calc problem, but doesn't seem to matter
|
||||
* (there may be a "click" when looping, or loop values may be too big and loop disabled anyway) */
|
||||
VGM_LOG("DSP (std): bad loop_predictor\n");
|
||||
|
|
@ -335,7 +361,7 @@ VGMSTREAM* init_vgmstream_ngc_dsp_std(STREAMFILE* sf) {
|
|||
|
||||
|
||||
/* build the VGMSTREAM */
|
||||
vgmstream = allocate_vgmstream(channel_count,header.loop_flag);
|
||||
vgmstream = allocate_vgmstream(channels, header.loop_flag);
|
||||
if (!vgmstream) goto fail;
|
||||
|
||||
vgmstream->sample_rate = header.sample_rate;
|
||||
|
|
@ -373,23 +399,21 @@ VGMSTREAM* init_vgmstream_ngc_dsp_std_le(STREAMFILE* sf) {
|
|||
struct dsp_header header;
|
||||
const size_t header_size = 0x60;
|
||||
off_t start_offset;
|
||||
int i, channel_count;
|
||||
int i, channels;
|
||||
|
||||
/* checks */
|
||||
/* .adpcm: LEGO Worlds */
|
||||
if (!check_extensions(sf, "adpcm"))
|
||||
goto fail;
|
||||
|
||||
if (read_dsp_header_le(&header, 0x00, sf))
|
||||
if (!read_dsp_header_le(&header, 0x00, sf))
|
||||
goto fail;
|
||||
|
||||
channel_count = 1;
|
||||
channels = 1;
|
||||
start_offset = header_size;
|
||||
|
||||
if (header.initial_ps != (uint8_t)read_8bit(start_offset,sf))
|
||||
goto fail; /* check initial predictor/scale */
|
||||
if (header.format || header.gain)
|
||||
goto fail; /* check type==0 and gain==0 */
|
||||
if (header.initial_ps != read_u8(start_offset,sf))
|
||||
goto fail;
|
||||
|
||||
/* Check for a matching second header. If we find one and it checks
|
||||
* out thoroughly, we're probably not dealing with a genuine mono DSP.
|
||||
|
|
@ -397,9 +421,12 @@ VGMSTREAM* init_vgmstream_ngc_dsp_std_le(STREAMFILE* sf) {
|
|||
* predictor/scale check if the first byte is 0 */
|
||||
{
|
||||
struct dsp_header header2;
|
||||
read_dsp_header_le(&header2, header_size, sf);
|
||||
int ko;
|
||||
|
||||
if (header.sample_count == header2.sample_count &&
|
||||
ko = !read_dsp_header_le(&header2, header_size, sf);
|
||||
|
||||
if (!ko &&
|
||||
header.sample_count == header2.sample_count &&
|
||||
header.nibble_count == header2.nibble_count &&
|
||||
header.sample_rate == header2.sample_rate &&
|
||||
header.loop_flag == header2.loop_flag) {
|
||||
|
|
@ -411,24 +438,20 @@ VGMSTREAM* init_vgmstream_ngc_dsp_std_le(STREAMFILE* sf) {
|
|||
off_t loop_off;
|
||||
/* check loop predictor/scale */
|
||||
loop_off = header.loop_start_offset/16*8;
|
||||
if (header.loop_ps != (uint8_t)read_8bit(start_offset+loop_off,sf)) {
|
||||
/* rarely won't match (ex ESPN 2002), not sure if header or calc problem, but doesn't seem to matter
|
||||
* (there may be a "click" when looping, or loop values may be too big and loop disabled anyway) */
|
||||
VGM_LOG("DSP (std): bad loop_predictor\n");
|
||||
//header.loop_flag = 0;
|
||||
//goto fail;
|
||||
if (header.loop_ps != read_u8(start_offset+loop_off,sf)) {
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* build the VGMSTREAM */
|
||||
vgmstream = allocate_vgmstream(channel_count,header.loop_flag);
|
||||
vgmstream = allocate_vgmstream(channels, header.loop_flag);
|
||||
if (!vgmstream) goto fail;
|
||||
|
||||
vgmstream->sample_rate = header.sample_rate;
|
||||
vgmstream->num_samples = header.sample_count;
|
||||
vgmstream->loop_start_sample = dsp_nibbles_to_samples(header.loop_start_offset);
|
||||
vgmstream->loop_end_sample = dsp_nibbles_to_samples(header.loop_end_offset)+1;
|
||||
vgmstream->loop_end_sample = dsp_nibbles_to_samples(header.loop_end_offset) + 1;
|
||||
if (vgmstream->loop_end_sample > vgmstream->num_samples) /* don't know why, but it does happen */
|
||||
vgmstream->loop_end_sample = vgmstream->num_samples;
|
||||
|
||||
|
|
@ -460,29 +483,28 @@ VGMSTREAM* init_vgmstream_ngc_mdsp_std(STREAMFILE* sf) {
|
|||
struct dsp_header header;
|
||||
const size_t header_size = 0x60;
|
||||
off_t start_offset;
|
||||
int i, c, channel_count;
|
||||
int i, c, channels;
|
||||
|
||||
/* checks */
|
||||
if (!read_dsp_header_be(&header, 0x00, sf))
|
||||
goto fail;
|
||||
|
||||
if (!check_extensions(sf, "dsp,mdsp"))
|
||||
goto fail;
|
||||
|
||||
if (read_dsp_header(&header, 0x00, sf))
|
||||
goto fail;
|
||||
channels = header.channels==0 ? 1 : header.channels;
|
||||
start_offset = header_size * channels;
|
||||
|
||||
channel_count = header.channel_count==0 ? 1 : header.channel_count;
|
||||
start_offset = header_size * channel_count;
|
||||
if (header.initial_ps != read_u8(start_offset, sf))
|
||||
goto fail;
|
||||
|
||||
/* named .dsp and no channels? likely another interleaved dsp */
|
||||
if (check_extensions(sf,"dsp") && header.channel_count == 0)
|
||||
if (check_extensions(sf,"dsp") && header.channels == 0)
|
||||
goto fail;
|
||||
|
||||
if (header.initial_ps != (uint8_t)read_8bit(start_offset, sf))
|
||||
goto fail; /* check initial predictor/scale */
|
||||
if (header.format || header.gain)
|
||||
goto fail; /* check type==0 and gain==0 */
|
||||
|
||||
/* build the VGMSTREAM */
|
||||
vgmstream = allocate_vgmstream(channel_count, header.loop_flag);
|
||||
vgmstream = allocate_vgmstream(channels, header.loop_flag);
|
||||
if (!vgmstream) goto fail;
|
||||
|
||||
vgmstream->sample_rate = header.sample_rate;
|
||||
|
|
@ -494,13 +516,14 @@ VGMSTREAM* init_vgmstream_ngc_mdsp_std(STREAMFILE* sf) {
|
|||
|
||||
vgmstream->meta_type = meta_DSP_STD;
|
||||
vgmstream->coding_type = coding_NGC_DSP;
|
||||
vgmstream->layout_type = channel_count == 1 ? layout_none : layout_interleave;
|
||||
vgmstream->layout_type = channels == 1 ? layout_none : layout_interleave;
|
||||
vgmstream->interleave_block_size = header.block_size * 8;
|
||||
if (vgmstream->interleave_block_size)
|
||||
vgmstream->interleave_last_block_size = (header.nibble_count / 2 % vgmstream->interleave_block_size + 7) / 8 * 8;
|
||||
|
||||
for (i = 0; i < channel_count; i++) {
|
||||
if (read_dsp_header(&header, header_size * i, sf)) goto fail;
|
||||
for (i = 0; i < channels; i++) {
|
||||
if (!read_dsp_header_be(&header, header_size * i, sf))
|
||||
goto fail;
|
||||
|
||||
/* adpcm coeffs/history */
|
||||
for (c = 0; c < 16; c++)
|
||||
|
|
@ -525,21 +548,23 @@ VGMSTREAM* init_vgmstream_ngc_dsp_stm(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
/* .lstm/dsp: renamed to avoid hijacking Scream Tracker 2 Modules */
|
||||
if (read_u16be(0x00, sf) != 0x0200)
|
||||
goto fail;
|
||||
|
||||
/* .lstm/dsp: renamed to avoid hijacking Scream Tracker 2 Modules (not needed) */
|
||||
if (!check_extensions(sf, "stm,lstm,dsp"))
|
||||
goto fail;
|
||||
if (read_16bitBE(0x00, sf) != 0x0200)
|
||||
goto fail;
|
||||
/* 0x02(2): sample rate, 0x08+: channel sizes/loop offsets? */
|
||||
/* 0x02: sample rate
|
||||
* 0x08+: channel sizes/loop offsets? */
|
||||
|
||||
dspm.channels = read_32bitBE(0x04, sf);
|
||||
dspm.channels = read_u32be(0x04, sf);
|
||||
dspm.max_channels = 2;
|
||||
dspm.fix_looping = 1;
|
||||
|
||||
dspm.header_offset = 0x40;
|
||||
dspm.header_spacing = 0x60;
|
||||
dspm.start_offset = 0x100;
|
||||
dspm.interleave = (read_32bitBE(0x08, sf) + 0x20) / 0x20 * 0x20; /* strange rounding, but works */
|
||||
dspm.interleave = (read_u32be(0x08, sf) + 0x20) / 0x20 * 0x20; /* strange rounding, but works */
|
||||
|
||||
dspm.meta_type = meta_DSP_STM;
|
||||
return init_vgmstream_dsp_common(sf, &dspm);
|
||||
|
|
@ -619,9 +644,10 @@ VGMSTREAM* init_vgmstream_idsp_namco(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (!check_extensions(sf, "idsp"))
|
||||
if (!is_id32be(0x00,sf, "IDSP"))
|
||||
goto fail;
|
||||
if (read_32bitBE(0x00,sf) != 0x49445350) /* "IDSP" */
|
||||
|
||||
if (!check_extensions(sf, "idsp"))
|
||||
goto fail;
|
||||
|
||||
dspm.max_channels = 8;
|
||||
|
|
@ -653,9 +679,10 @@ VGMSTREAM* init_vgmstream_sadb(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (!check_extensions(sf, "sad"))
|
||||
if (!is_id32be(0x00,sf, "sadb"))
|
||||
goto fail;
|
||||
if (read_32bitBE(0x00,sf) != 0x73616462) /* "sadb" */
|
||||
|
||||
if (!check_extensions(sf, "sad"))
|
||||
goto fail;
|
||||
|
||||
dspm.channels = read_8bit(0x32, sf);
|
||||
|
|
@ -679,17 +706,17 @@ VGMSTREAM* init_vgmstream_idsp_tt(STREAMFILE* sf) {
|
|||
int version_main, version_sub;
|
||||
|
||||
/* checks */
|
||||
if (!is_id32be(0x00,sf, "IDSP"))
|
||||
goto fail;
|
||||
|
||||
/* .gcm: standard
|
||||
* .idsp: header id?
|
||||
* .wua: Lego Dimensions (Wii U) */
|
||||
if (!check_extensions(sf, "gcm,idsp,wua"))
|
||||
goto fail;
|
||||
|
||||
if (read_32bitBE(0x00,sf) != 0x49445350) /* "IDSP" */
|
||||
goto fail;
|
||||
|
||||
version_main = read_32bitBE(0x04, sf);
|
||||
version_sub = read_32bitBE(0x08, sf); /* extra check since there are other IDSPs */
|
||||
version_main = read_u32be(0x04, sf);
|
||||
version_sub = read_u32be(0x08, sf); /* extra check since there are other IDSPs */
|
||||
if (version_main == 0x01 && version_sub == 0xc8) {
|
||||
/* Transformers: The Game (Wii) */
|
||||
dspm.channels = 2;
|
||||
|
|
@ -711,7 +738,7 @@ VGMSTREAM* init_vgmstream_idsp_tt(STREAMFILE* sf) {
|
|||
else if (version_main == 0x03 && version_sub == 0x12c) {
|
||||
/* Lego The Lord of the Rings (Wii) */
|
||||
/* Lego Dimensions (Wii U) */
|
||||
dspm.channels = read_32bitBE(0x10, sf);
|
||||
dspm.channels = read_u32be(0x10, sf);
|
||||
dspm.max_channels = 2;
|
||||
dspm.header_offset = 0x20;
|
||||
/* 0x14+: "I_AM_PADDING" */
|
||||
|
|
@ -722,7 +749,7 @@ VGMSTREAM* init_vgmstream_idsp_tt(STREAMFILE* sf) {
|
|||
|
||||
dspm.header_spacing = 0x60;
|
||||
dspm.start_offset = dspm.header_offset + 0x60 * dspm.channels;
|
||||
dspm.interleave = read_32bitBE(0x0c, sf);
|
||||
dspm.interleave = read_u32be(0x0c, sf);
|
||||
|
||||
dspm.meta_type = meta_IDSP_TT;
|
||||
return init_vgmstream_dsp_common(sf, &dspm);
|
||||
|
|
@ -735,9 +762,9 @@ VGMSTREAM* init_vgmstream_idsp_nl(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (!check_extensions(sf, "idsp"))
|
||||
if (!is_id32be(0x00,sf, "IDSP"))
|
||||
goto fail;
|
||||
if (read_32bitBE(0x00,sf) != 0x49445350) /* "IDSP" */
|
||||
if (!check_extensions(sf, "idsp"))
|
||||
goto fail;
|
||||
|
||||
dspm.channels = 2;
|
||||
|
|
@ -773,16 +800,18 @@ VGMSTREAM* init_vgmstream_wii_wsd(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (read_u32be(0x00,sf) != 0x20)
|
||||
goto fail;
|
||||
if (!check_extensions(sf, "wsd"))
|
||||
goto fail;
|
||||
if (read_32bitBE(0x08,sf) != read_32bitBE(0x0c,sf)) /* channel sizes */
|
||||
if (read_u32be(0x08,sf) != read_u32be(0x0c,sf)) /* channel sizes */
|
||||
goto fail;
|
||||
|
||||
dspm.channels = 2;
|
||||
dspm.max_channels = 2;
|
||||
|
||||
dspm.header_offset = read_32bitBE(0x00,sf);
|
||||
dspm.header_spacing = read_32bitBE(0x04,sf) - dspm.header_offset;
|
||||
dspm.header_offset = read_u32be(0x00,sf);
|
||||
dspm.header_spacing = read_u32be(0x04,sf) - dspm.header_offset;
|
||||
dspm.start_offset = dspm.header_offset + 0x60;
|
||||
dspm.interleave = dspm.header_spacing;
|
||||
|
||||
|
|
@ -792,7 +821,7 @@ fail:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
/* .ddsp - full interleaved dsp [The Sims 2 - Pets (Wii)] */
|
||||
/* .ddsp - full interleaved dsp [The Sims 2: Pets (Wii)] */
|
||||
VGMSTREAM* init_vgmstream_dsp_ddsp(STREAMFILE* sf) {
|
||||
dsp_meta dspm = {0};
|
||||
|
||||
|
|
@ -819,9 +848,9 @@ VGMSTREAM* init_vgmstream_wii_was(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (!check_extensions(sf, "was,dsp,isws"))
|
||||
if (!is_id32be(0x00,sf, "iSWS"))
|
||||
goto fail;
|
||||
if (read_32bitBE(0x00,sf) != 0x69535753) /* "iSWS" */
|
||||
if (!check_extensions(sf, "was,dsp,isws"))
|
||||
goto fail;
|
||||
|
||||
dspm.channels = read_32bitBE(0x08,sf);
|
||||
|
|
@ -888,12 +917,12 @@ VGMSTREAM* init_vgmstream_dsp_ndp(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (!is_id32be(0x00,sf, "NDP\0"))
|
||||
goto fail;
|
||||
/* .nds: standard
|
||||
* .ndp: header id */
|
||||
if (!check_extensions(sf, "nds,ndp"))
|
||||
goto fail;
|
||||
if (!is_id32be(0x00,sf, "NDP\0"))
|
||||
goto fail;
|
||||
if (read_u32le(0x08,sf) + 0x18 != get_streamfile_size(sf))
|
||||
goto fail;
|
||||
/* 0x0c: sample rate */
|
||||
|
|
@ -946,18 +975,19 @@ VGMSTREAM* init_vgmstream_ngc_dsp_aaap(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (!is_id32be(0x00,sf, "AAAp"))
|
||||
goto fail;
|
||||
if (!check_extensions(sf, "dsp"))
|
||||
goto fail;
|
||||
if (read_32bitBE(0x00,sf) != 0x41414170) /* "AAAp" */
|
||||
goto fail;
|
||||
|
||||
dspm.channels = read_16bitBE(0x06,sf);
|
||||
|
||||
dspm.interleave = read_u16be(0x04,sf);
|
||||
dspm.channels = read_u16be(0x06,sf);
|
||||
dspm.max_channels = 2;
|
||||
|
||||
dspm.header_offset = 0x08;
|
||||
dspm.header_spacing = 0x60;
|
||||
dspm.start_offset = dspm.header_offset + dspm.channels*dspm.header_spacing;
|
||||
dspm.interleave = (uint16_t)read_16bitBE(0x04,sf);
|
||||
dspm.start_offset = dspm.header_offset + dspm.channels * dspm.header_spacing;
|
||||
|
||||
dspm.meta_type = meta_NGC_DSP_AAAP;
|
||||
return init_vgmstream_dsp_common(sf, &dspm);
|
||||
|
|
@ -970,15 +1000,15 @@ VGMSTREAM* init_vgmstream_dsp_dspw(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
size_t data_size;
|
||||
|
||||
/* check extension */
|
||||
if (!check_extensions(sf, "dspw"))
|
||||
/* checks */
|
||||
if (!is_id32be(0x00,sf, "DSPW"))
|
||||
goto fail;
|
||||
if (read_32bitBE(0x00,sf) != 0x44535057) /* "DSPW" */
|
||||
if (!check_extensions(sf, "dspw"))
|
||||
goto fail;
|
||||
|
||||
/* ignore time marker */
|
||||
data_size = read_32bitBE(0x08, sf);
|
||||
if (read_32bitBE(data_size - 0x10, sf) == 0x74494D45) /* "tIME" */
|
||||
if (is_id32be(data_size - 0x10, sf, "tIME"))
|
||||
data_size -= 0x10; /* (ignore, 2 ints in YYYYMMDD hhmmss00) */
|
||||
|
||||
/* some files have a mrkr section with multiple loop regions added at the end (variable size) */
|
||||
|
|
@ -1016,10 +1046,12 @@ VGMSTREAM* init_vgmstream_ngc_dsp_iadp(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
/* .adp: actual extension, .iadp: header id */
|
||||
if (!check_extensions(sf, "adp,iadp"))
|
||||
if (!is_id32be(0x00,sf, "iadp"))
|
||||
goto fail;
|
||||
if (read_32bitBE(0x00,sf) != 0x69616470) /* "iadp" */
|
||||
|
||||
/* .adp: actual extension
|
||||
* .iadp: header id */
|
||||
if (!check_extensions(sf, "adp,iadp"))
|
||||
goto fail;
|
||||
|
||||
dspm.channels = read_32bitBE(0x04,sf);
|
||||
|
|
@ -1068,11 +1100,13 @@ VGMSTREAM* init_vgmstream_dsp_switch_audio(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
/* .switch_audio: possibly UE4 class name rather than extension, .dsp: assumed */
|
||||
/* .switch_audio: possibly UE4 class name rather than extension
|
||||
* .dsp: assumed */
|
||||
if (!check_extensions(sf, "switch_audio,dsp"))
|
||||
goto fail;
|
||||
|
||||
/* manual double header test */
|
||||
//todo improve to read after first header
|
||||
if (read_32bitLE(0x00, sf) == read_32bitLE(get_streamfile_size(sf) / 2, sf))
|
||||
dspm.channels = 2;
|
||||
else
|
||||
|
|
@ -1096,13 +1130,14 @@ VGMSTREAM* init_vgmstream_dsp_sps_n1(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (read_u32be(0x00,sf) != 0x08000000) /* file type (see other N1 SPS) */
|
||||
goto fail;
|
||||
|
||||
/* .vag: Penny-Punching Princess (Switch)
|
||||
* .nlsd: Ys VIII (Switch) */
|
||||
if (!check_extensions(sf, "vag,nlsd"))
|
||||
goto fail;
|
||||
if (read_32bitBE(0x00,sf) != 0x08000000) /* file type (see other N1 SPS) */
|
||||
goto fail;
|
||||
if ((uint16_t)read_16bitLE(0x08,sf) != read_32bitLE(0x24,sf)) /* header has various repeated values */
|
||||
if (read_u16le(0x08,sf) != read_u32le(0x24,sf)) /* header has various repeated values */
|
||||
goto fail;
|
||||
|
||||
dspm.channels = 1;
|
||||
|
|
@ -1133,7 +1168,7 @@ VGMSTREAM* init_vgmstream_dsp_itl_ch(STREAMFILE* sf) {
|
|||
|
||||
dspm.header_offset = 0x00;
|
||||
dspm.header_spacing = 0x60;
|
||||
dspm.start_offset = dspm.header_offset + dspm.header_spacing*dspm.channels;
|
||||
dspm.start_offset = dspm.header_offset + dspm.header_spacing * dspm.channels;
|
||||
dspm.interleave = 0x23C0;
|
||||
|
||||
dspm.fix_looping = 1;
|
||||
|
|
@ -1149,16 +1184,17 @@ VGMSTREAM* init_vgmstream_dsp_adpy(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (!check_extensions(sf, "adpcmx"))
|
||||
if (!is_id32be(0x00,sf, "ADPY"))
|
||||
goto fail;
|
||||
if (read_32bitBE(0x00,sf) != 0x41445059) /* "ADPY" */
|
||||
|
||||
if (!check_extensions(sf, "adpcmx"))
|
||||
goto fail;
|
||||
|
||||
/* 0x04(2): 1? */
|
||||
/* 0x08: some size? */
|
||||
/* 0x0c: null */
|
||||
|
||||
dspm.channels = read_16bitLE(0x06,sf);
|
||||
dspm.channels = read_u16le(0x06,sf);
|
||||
dspm.max_channels = 2;
|
||||
dspm.little_endian = 1;
|
||||
|
||||
|
|
@ -1178,9 +1214,10 @@ VGMSTREAM* init_vgmstream_dsp_adpx(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (!check_extensions(sf, "adpcmx"))
|
||||
if (!is_id32be(0x00,sf, "ADPX"))
|
||||
goto fail;
|
||||
if (read_32bitBE(0x00,sf) != 0x41445058) /* "ADPX" */
|
||||
|
||||
if (!check_extensions(sf, "adpcmx"))
|
||||
goto fail;
|
||||
|
||||
/* from 0x04 *6 are probably channel sizes, so max would be 6ch; this assumes 2ch */
|
||||
|
|
@ -1216,6 +1253,7 @@ VGMSTREAM* init_vgmstream_dsp_ds2(STREAMFILE* sf) {
|
|||
read_32bitBE(0x58,sf) == 0 &&
|
||||
read_32bitBE(0x5c,sf) != 0))
|
||||
goto fail;
|
||||
|
||||
file_size = get_streamfile_size(sf);
|
||||
channel_offset = read_32bitBE(0x5c,sf); /* absolute offset to 2nd channel */
|
||||
if (channel_offset < file_size / 2 || channel_offset > file_size) /* just to make sure */
|
||||
|
|
@ -1272,11 +1310,12 @@ VGMSTREAM* init_vgmstream_dsp_sqex(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (!check_extensions(sf, "wav,lwav"))
|
||||
goto fail;
|
||||
if (read_u32be(0x00,sf) != 0x00000000)
|
||||
goto fail;
|
||||
|
||||
if (!check_extensions(sf, "wav,lwav"))
|
||||
goto fail;
|
||||
|
||||
dspm.channels = read_u32le(0x04,sf);
|
||||
dspm.header_offset = read_u32le(0x08,sf);
|
||||
/* 0x0c: channel size */
|
||||
|
|
@ -1303,12 +1342,11 @@ VGMSTREAM* init_vgmstream_dsp_wiivoice(STREAMFILE* sf) {
|
|||
/* also see g1l.c for WiiBGM weirder variation */
|
||||
|
||||
/* checks */
|
||||
if (!is_id64be(0x00,sf, "WiiVoice"))
|
||||
goto fail;
|
||||
/* .dsp: assumed */
|
||||
if (!check_extensions(sf, "dsp"))
|
||||
goto fail;
|
||||
if (read_u32be(0x00,sf) != 0x57696956 && /* "WiiV" */
|
||||
read_u32be(0x04,sf) != 0x6F696365) /* "oice" */
|
||||
goto fail;
|
||||
|
||||
dspm.channels = 1;
|
||||
dspm.max_channels = 1;
|
||||
|
|
@ -1331,9 +1369,9 @@ VGMSTREAM* init_vgmstream_dsp_wiiadpcm(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (!check_extensions(sf, "adpcm"))
|
||||
if (!is_id64be(0x00,sf, "WIIADPCM"))
|
||||
goto fail;
|
||||
if (!is_id32be(0x00,sf, "WIIA") && !is_id32be(0x00,sf, "DPCM"))
|
||||
if (!check_extensions(sf, "adpcm"))
|
||||
goto fail;
|
||||
|
||||
dspm.interleave = read_u32be(0x08,sf); /* interleave offset */
|
||||
|
|
@ -1361,11 +1399,12 @@ VGMSTREAM* init_vgmstream_dsp_cwac(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (!is_id32be(0x00,sf, "CWAC"))
|
||||
goto fail;
|
||||
|
||||
/* .dsp: assumed */
|
||||
if (!check_extensions(sf, "dsp"))
|
||||
goto fail;
|
||||
if (!is_id32be(0x00,sf, "CWAC"))
|
||||
goto fail;
|
||||
|
||||
dspm.channels = read_u16be(0x04,sf);
|
||||
dspm.header_offset = read_u32be(0x08,sf);
|
||||
|
|
@ -1388,10 +1427,10 @@ VGMSTREAM* init_vgmstream_idsp_tose(STREAMFILE* sf) {
|
|||
uint32_t blocks;
|
||||
|
||||
/* checks */
|
||||
if (!check_extensions(sf, "idsp"))
|
||||
goto fail;
|
||||
if (read_u32be(0x00,sf) != 0)
|
||||
goto fail;
|
||||
if (!check_extensions(sf, "idsp"))
|
||||
goto fail;
|
||||
|
||||
dspm.max_channels = 4; /* mainly stereo */
|
||||
|
||||
|
|
@ -1419,11 +1458,12 @@ VGMSTREAM* init_vgmstream_dsp_kwa(STREAMFILE* sf) {
|
|||
dsp_meta dspm = {0};
|
||||
|
||||
/* checks */
|
||||
if (read_u32be(0x00,sf) != 3)
|
||||
goto fail;
|
||||
|
||||
/* .dsp: assumed */
|
||||
if (!check_extensions(sf, "kwa"))
|
||||
goto fail;
|
||||
if (read_u32be(0x00,sf) != 3)
|
||||
goto fail;
|
||||
|
||||
dspm.max_channels = 4;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -131,6 +131,9 @@ static int read_fmt(int big_endian, STREAMFILE* sf, off_t offset, riff_fmt_chunk
|
|||
}
|
||||
}
|
||||
|
||||
if (!fmt->channels)
|
||||
goto fail;
|
||||
|
||||
switch (fmt->codec) {
|
||||
case 0x00: /* Yamaha AICA ADPCM [Headhunter (DC), Bomber hehhe (DC), Rayman 2 (DC)] (unofficial) */
|
||||
if (fmt->bps != 4) goto fail;
|
||||
|
|
@ -142,17 +145,19 @@ static int read_fmt(int big_endian, STREAMFILE* sf, off_t offset, riff_fmt_chunk
|
|||
|
||||
case 0x01: /* PCM */
|
||||
switch (fmt->bps) {
|
||||
case 24: /* Omori (PC) */
|
||||
fmt->coding_type = coding_PCM24LE;
|
||||
break;
|
||||
case 16:
|
||||
fmt->coding_type = big_endian ? coding_PCM16BE : coding_PCM16LE;
|
||||
fmt->interleave = 0x02;
|
||||
break;
|
||||
case 8:
|
||||
fmt->coding_type = coding_PCM8_U;
|
||||
fmt->interleave = 0x01;
|
||||
break;
|
||||
default:
|
||||
goto fail;
|
||||
}
|
||||
fmt->interleave = fmt->block_size / fmt->channels;
|
||||
break;
|
||||
|
||||
case 0x02: /* MSADPCM */
|
||||
|
|
@ -354,8 +359,9 @@ VGMSTREAM* init_vgmstream_riff(STREAMFILE* sf) {
|
|||
* .mwv: Level-5 games [Dragon Quest VIII (PS2), Rogue Galaxy (PS2)]
|
||||
* .ima: Baja: Edge of Control (PS3/X360)
|
||||
* .nsa: Studio Ring games that uses NScripter [Hajimete no Otetsudai (PC)]
|
||||
* .pcm: Silent Hill Arcade (PC)
|
||||
*/
|
||||
if ( check_extensions(sf, "wav,lwav,xwav,da,dax,cd,med,snd,adx,adp,xss,xsew,adpcm,adw,wd,,sbv,wvx,str,at3,rws,aud,at9,saf,ima,nsa") ) {
|
||||
if ( check_extensions(sf, "wav,lwav,xwav,da,dax,cd,med,snd,adx,adp,xss,xsew,adpcm,adw,wd,,sbv,wvx,str,at3,rws,aud,at9,saf,ima,nsa,pcm") ) {
|
||||
;
|
||||
}
|
||||
else if ( check_extensions(sf, "mwv") ) {
|
||||
|
|
@ -666,12 +672,10 @@ VGMSTREAM* init_vgmstream_riff(STREAMFILE* sf) {
|
|||
|
||||
/* samples, codec init (after setting coding to ensure proper close on failure) */
|
||||
switch (fmt.coding_type) {
|
||||
case coding_PCM24LE:
|
||||
case coding_PCM16LE:
|
||||
vgmstream->num_samples = pcm_bytes_to_samples(data_size, fmt.channels, 16);
|
||||
break;
|
||||
|
||||
case coding_PCM8_U:
|
||||
vgmstream->num_samples = pcm_bytes_to_samples(data_size, vgmstream->channels, 8);
|
||||
vgmstream->num_samples = pcm_bytes_to_samples(data_size, fmt.channels, fmt.bps);
|
||||
break;
|
||||
|
||||
case coding_L5_555:
|
||||
|
|
@ -1068,10 +1072,8 @@ VGMSTREAM* init_vgmstream_rifx(STREAMFILE* sf) {
|
|||
/* init, samples */
|
||||
switch (fmt.coding_type) {
|
||||
case coding_PCM16BE:
|
||||
vgmstream->num_samples = pcm_bytes_to_samples(data_size, vgmstream->channels, 16);
|
||||
break;
|
||||
case coding_PCM8_U:
|
||||
vgmstream->num_samples = pcm_bytes_to_samples(data_size, vgmstream->channels, 8);
|
||||
vgmstream->num_samples = pcm_bytes_to_samples(data_size, vgmstream->channels, fmt.bps);
|
||||
break;
|
||||
default:
|
||||
goto fail;
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ VGMSTREAM* init_vgmstream_sqex_scd(STREAMFILE* sf) {
|
|||
|
||||
/** stream header **/
|
||||
stream_size = read_32bit(meta_offset+0x00,sf);
|
||||
channels = read_32bit(meta_offset+0x04,sf);
|
||||
channels = read_32bit(meta_offset+0x04,sf);
|
||||
sample_rate = read_32bit(meta_offset+0x08,sf);
|
||||
codec = read_32bit(meta_offset+0x0c,sf);
|
||||
|
||||
|
|
@ -270,6 +270,7 @@ VGMSTREAM* init_vgmstream_sqex_scd(STREAMFILE* sf) {
|
|||
}
|
||||
#endif
|
||||
case 0x0C: /* MS ADPCM [Final Fantasy XIV (PC) sfx] */
|
||||
case 0x17: /* MS ADPCM [Dragon Quest X (Switch)] (no diffs except frame size?) */
|
||||
vgmstream->coding_type = coding_MSADPCM;
|
||||
vgmstream->layout_type = layout_none;
|
||||
vgmstream->frame_size = read_16bit(extradata_offset + 0x0c, sf);
|
||||
|
|
|
|||
|
|
@ -15,8 +15,9 @@ typedef enum { PCM, IMA, VORBIS, DSP, XMA2, XWMA, AAC, HEVAG, ATRAC9, OPUSNX, OP
|
|||
typedef struct {
|
||||
int big_endian;
|
||||
size_t file_size;
|
||||
int truncated;
|
||||
int prefetch;
|
||||
int is_wem;
|
||||
int is_bnk;
|
||||
|
||||
/* chunks references */
|
||||
off_t fmt_offset;
|
||||
|
|
@ -57,10 +58,13 @@ typedef struct {
|
|||
static int parse_wwise(STREAMFILE* sf, wwise_header* ww);
|
||||
static int is_dsp_full_interleave(STREAMFILE* sf, wwise_header* ww, off_t coef_offset);
|
||||
|
||||
|
||||
|
||||
/* Wwise - Audiokinetic Wwise (WaveWorks Interactive Sound Engine) middleware */
|
||||
VGMSTREAM* init_vgmstream_wwise(STREAMFILE* sf) {
|
||||
return init_vgmstream_wwise_bnk(sf, NULL);
|
||||
}
|
||||
|
||||
/* used in .bnk */
|
||||
VGMSTREAM* init_vgmstream_wwise_bnk(STREAMFILE* sf, int* p_prefetch) {
|
||||
VGMSTREAM* vgmstream = NULL;
|
||||
wwise_header ww = {0};
|
||||
off_t start_offset;
|
||||
|
|
@ -83,9 +87,13 @@ VGMSTREAM* init_vgmstream_wwise(STREAMFILE* sf) {
|
|||
if (!check_extensions(sf,"wem,wav,lwav,ogg,logg,xma,bnk"))
|
||||
goto fail;
|
||||
|
||||
ww.is_bnk = (p_prefetch != NULL);
|
||||
if (!parse_wwise(sf, &ww))
|
||||
goto fail;
|
||||
|
||||
if (p_prefetch)
|
||||
*p_prefetch = ww.prefetch;
|
||||
|
||||
read_u32 = ww.big_endian ? read_u32be : read_u32le;
|
||||
read_s32 = ww.big_endian ? read_s32be : read_s32le;
|
||||
read_u16 = ww.big_endian ? read_u16be : read_u16le;
|
||||
|
|
@ -114,14 +122,14 @@ VGMSTREAM* init_vgmstream_wwise(STREAMFILE* sf) {
|
|||
vgmstream->layout_type = ww.channels > 1 ? layout_interleave : layout_none;
|
||||
vgmstream->interleave_block_size = 0x02;
|
||||
|
||||
if (ww.truncated) {
|
||||
if (ww.prefetch) {
|
||||
ww.data_size = ww.file_size - ww.data_offset;
|
||||
}
|
||||
|
||||
vgmstream->num_samples = pcm_bytes_to_samples(ww.data_size, ww.channels, ww.bits_per_sample);
|
||||
|
||||
/* truncated .bnk RIFFs that only have header and no data is possible [Metal Gear Solid V (PC)] */
|
||||
if (ww.truncated && !vgmstream->num_samples)
|
||||
/* prefetch .bnk RIFFs that only have header and no data is possible [Metal Gear Solid V (PC)] */
|
||||
if (ww.prefetch && !vgmstream->num_samples)
|
||||
vgmstream->num_samples = 1; /* force something to avoid broken subsongs */
|
||||
break;
|
||||
|
||||
|
|
@ -147,7 +155,7 @@ VGMSTREAM* init_vgmstream_wwise(STREAMFILE* sf) {
|
|||
vgmstream->interleave_block_size = 0;
|
||||
}
|
||||
|
||||
if (ww.truncated) {
|
||||
if (ww.prefetch) {
|
||||
ww.data_size = ww.file_size - ww.data_offset;
|
||||
}
|
||||
|
||||
|
|
@ -299,7 +307,7 @@ VGMSTREAM* init_vgmstream_wwise(STREAMFILE* sf) {
|
|||
start_offset += audio_offset;
|
||||
|
||||
/* Vorbis is VBR so this is very approximate percent, meh */
|
||||
if (ww.truncated) {
|
||||
if (ww.prefetch) {
|
||||
vgmstream->num_samples = (int32_t)(vgmstream->num_samples *
|
||||
(double)(ww.file_size - start_offset) / (double)ww.data_size);
|
||||
}
|
||||
|
|
@ -333,7 +341,7 @@ VGMSTREAM* init_vgmstream_wwise(STREAMFILE* sf) {
|
|||
goto fail;
|
||||
}
|
||||
|
||||
if (ww.truncated) {
|
||||
if (ww.prefetch) {
|
||||
ww.data_size = ww.file_size - ww.data_offset;
|
||||
vgmstream->num_samples = dsp_bytes_to_samples(ww.data_size, ww.channels);
|
||||
}
|
||||
|
|
@ -381,7 +389,7 @@ VGMSTREAM* init_vgmstream_wwise(STREAMFILE* sf) {
|
|||
xma_fix_raw_samples(vgmstream, sf, ww.data_offset, ww.data_size, ww.xma2_offset ? ww.xma2_offset : ww.fmt_offset, 1,0);
|
||||
|
||||
/* XMA is VBR so this is very approximate percent, meh */
|
||||
if (ww.truncated) {
|
||||
if (ww.prefetch) {
|
||||
vgmstream->num_samples = (int32_t)(vgmstream->num_samples *
|
||||
(double)(ww.file_size - start_offset) / (double)ww.data_size);
|
||||
//todo data size, call function
|
||||
|
|
@ -449,7 +457,7 @@ VGMSTREAM* init_vgmstream_wwise(STREAMFILE* sf) {
|
|||
}
|
||||
|
||||
/* OPUS is VBR so this is very approximate percent, meh */
|
||||
if (ww.truncated) {
|
||||
if (ww.prefetch) {
|
||||
vgmstream->num_samples = (int32_t)(vgmstream->num_samples *
|
||||
(double)(ww.file_size - start_offset) / (double)ww.data_size);
|
||||
ww.data_size = ww.file_size - start_offset;
|
||||
|
|
@ -471,7 +479,7 @@ VGMSTREAM* init_vgmstream_wwise(STREAMFILE* sf) {
|
|||
/* 0x20: full samples (without encoder delay) */
|
||||
|
||||
/* OPUS is VBR so this is very approximate percent, meh */
|
||||
if (ww.truncated) {
|
||||
if (ww.prefetch) {
|
||||
vgmstream->num_samples = (int32_t)(vgmstream->num_samples *
|
||||
(double)(ww.file_size - start_offset) / (double)ww.data_size);
|
||||
ww.data_size = ww.file_size - start_offset;
|
||||
|
|
@ -532,7 +540,7 @@ VGMSTREAM* init_vgmstream_wwise(STREAMFILE* sf) {
|
|||
goto fail;
|
||||
|
||||
/* OPUS is VBR so this is very approximate percent, meh */
|
||||
if (ww.truncated) {
|
||||
if (ww.prefetch) {
|
||||
vgmstream->num_samples = (int32_t)(vgmstream->num_samples *
|
||||
(double)(ww.file_size - start_offset) / (double)ww.data_size);
|
||||
ww.data_size = ww.file_size - start_offset;
|
||||
|
|
@ -641,7 +649,7 @@ VGMSTREAM* init_vgmstream_wwise(STREAMFILE* sf) {
|
|||
vgmstream->interleave_block_size = ww.block_size / ww.channels;
|
||||
//vgmstream->codec_endian = ww.big_endian; //?
|
||||
|
||||
if (ww.truncated) {
|
||||
if (ww.prefetch) {
|
||||
ww.data_size = ww.file_size - ww.data_offset;
|
||||
}
|
||||
|
||||
|
|
@ -665,20 +673,20 @@ fail:
|
|||
static int is_dsp_full_interleave(STREAMFILE* sf, wwise_header* ww, off_t coef_offset) {
|
||||
/* older (only?) Wwise use full interleave for memory (in .bnk) files, but
|
||||
* detection from the .wem side is problematic [Punch Out!! (Wii)]
|
||||
* - truncated point to streams = normal
|
||||
* - prefetch point to streams = normal
|
||||
* - .bnk would be memory banks = full
|
||||
* - otherwise small-ish sizes, stereo, with initial predictors for the
|
||||
* second channel matching half size = full
|
||||
* some files aren't detectable like this though, when predictors are 0
|
||||
* (but since memory wem aren't that used this shouldn't be too common) */
|
||||
|
||||
if (ww->truncated)
|
||||
if (ww->prefetch)
|
||||
return 0;
|
||||
|
||||
if (ww->channels == 1)
|
||||
return 0;
|
||||
|
||||
if (check_extensions(sf,"bnk"))
|
||||
if (ww->is_bnk)
|
||||
return 1;
|
||||
|
||||
if (ww->data_size > 0x30000)
|
||||
|
|
@ -910,9 +918,9 @@ static int parse_wwise(STREAMFILE* sf, wwise_header* ww) {
|
|||
|
||||
if (ww->codec == PCM || ww->codec == IMA || ww->codec == VORBIS || ww->codec == DSP || ww->codec == XMA2 ||
|
||||
ww->codec == OPUSNX || ww->codec == OPUS || ww->codec == OPUSWW || ww->codec == PTADPCM) {
|
||||
ww->truncated = 1; /* only seen those, probably all exist (XWMA, AAC, HEVAG, ATRAC9?) */
|
||||
ww->prefetch = 1; /* only seen those, probably all exist (XWMA, AAC, HEVAG, ATRAC9?) */
|
||||
} else {
|
||||
vgm_logi("WWISE: wrong expected size, maybe truncated (report)\n");
|
||||
vgm_logi("WWISE: wrong expected size, maybe prefetch (report)\n");
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
|
@ -921,7 +929,7 @@ static int parse_wwise(STREAMFILE* sf, wwise_header* ww) {
|
|||
/* Cyberpunk 2077 has some mutant .wem, with proper Wwise header and PCMEX but data is standard OPUS.
|
||||
* From init bank and CAkSound's sources, those may be piped through their plugins. They come in
|
||||
* .opuspak (no names), have wrong riff/data sizes and only seem used for sfx (other audio is Vorbis). */
|
||||
if (ww->format == 0xFFFE && ww->truncated) {
|
||||
if (ww->format == 0xFFFE && ww->prefetch) {
|
||||
if (read_u32be(ww->data_offset + 0x00, sf) == 0x4F676753) {
|
||||
ww->codec = OPUSCPR;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue