chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Updated VGMStream to r1050-3677-g76566c8d

Browse source
This commit is contained in:
Christopher Snowhill 2021-04-19 12:13:03 -07:00
parent 4ea289ba27
commit edb8b7422d
6 changed files with 396 additions and 360 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Frameworks/vgmstream/vgmstream/src/meta/adx_keys.h
View file

@ -240,9 +240,15 @@ static const adxkey_info adxkey9_list[] = {
/* Detective Conan Runner / Case Closed Runner (Android) */ /* Detective Conan Runner / Case Closed Runner (Android) */
{0x0613,0x0e3d,0x6dff, NULL,1175268187653273344}, // 104f643098e3f700 {0x0613,0x0e3d,0x6dff, NULL,1175268187653273344}, // 104f643098e3f700
/* Persona 5 Royal (PS4) */ /* Persona 5 Royal (PS4) (asia?) **verified */
{0x0000,0x1c85,0x7043, NULL,29915170}, // 0000000001C87822 {0x0000,0x1c85,0x7043, NULL,29915170}, // 0000000001C87822
/* Persona 5 Royal (PS4) (japan?) **not verified */
{0x0000,0x0000,0x0000, NULL,10882899}, // 0000000000A60F53
/* Persona 5 Royal (PS4) (us/eu?) **not verified */
{0x0000,0x0000,0x0000, NULL,22759300}, // 00000000015B4784
/* Assault Lily Last Bullet (Android) */ /* Assault Lily Last Bullet (Android) */
{0x0000,0x0000,0x0000, NULL,6349046567469313}, // 00168E6C99510101 (+ AWB subkeys) {0x0000,0x0000,0x0000, NULL,6349046567469313}, // 00168E6C99510101 (+ AWB subkeys)

3
Frameworks/vgmstream/vgmstream/src/meta/hca_keys.h
View file

@ -394,6 +394,9 @@ static const hcakey_info hcakey_list[] = {
/* Fantasia Re: Build (Android) */ /* Fantasia Re: Build (Android) */
{8430978314079461325}, // 7500DA1B7FBA5FCD {8430978314079461325}, // 7500DA1B7FBA5FCD
/* SaGa Frontier Remastered */
{5935495141785029458}, // 525F1D6244274B52
/* D4DJ Groovy Mix (Android) [base files] */ /* D4DJ Groovy Mix (Android) [base files] */
{393410674916959300}, // 0575ACECA945A444 {393410674916959300}, // 0575ACECA945A444

2
Frameworks/vgmstream/vgmstream/src/meta/txth.c
View file

@ -691,7 +691,7 @@ static STREAMFILE* open_txth(STREAMFILE* sf) {
/* try "(path/)(.sub.ext).txth" */ /* try "(path/)(.sub.ext).txth" */
get_streamfile_basename(sf,basename,PATH_LIMIT); get_streamfile_basename(sf,basename,PATH_LIMIT);
subext = filename_extension(basename); subext = filename_extension(basename);
if (subext != NULL) { if (subext != NULL && subext[0] != '\0') {
get_streamfile_path(sf,filename,PATH_LIMIT); get_streamfile_path(sf,filename,PATH_LIMIT);
get_streamfile_ext(sf,fileext,PATH_LIMIT); get_streamfile_ext(sf,fileext,PATH_LIMIT);
strcat(filename,"."); strcat(filename,".");

22
Frameworks/vgmstream/vgmstream/src/meta/txtp.c
View file

@ -245,9 +245,13 @@ fail:
return 0; return 0;
} }
static int is_silent(txtp_entry* entry) { static int is_silent(const char* fn) {
/* should also contain "." in the filename for commands with seconds ("1.0") to work */ /* should also contain "." in the filename for commands with seconds ("1.0") to work */
return entry->filename[0] == '?'; return fn[0] == '?';
}
static int is_absolute(const char* fn) {
return fn[0] == '/' || fn[0] == '\\' || fn[1] == ':';
} }
/* open all entries and apply settings to resulting VGMSTREAMs */ /* open all entries and apply settings to resulting VGMSTREAMs */
@ -268,17 +272,23 @@ static int parse_entries(txtp_header* txtp, STREAMFILE* sf) {
/* open all entry files first as they'll be modified by modes */ /* open all entry files first as they'll be modified by modes */
for (i = 0; i < txtp->vgmstream_count; i++) { for (i = 0; i < txtp->vgmstream_count; i++) {
STREAMFILE* temp_sf = NULL; STREAMFILE* temp_sf = NULL;
const char* filename = txtp->entry[i].filename;
/* silent entry ignore */ /* silent entry ignore */
if (is_silent(&txtp->entry[i])) { if (is_silent(filename)) {
txtp->entry[i].silent = 1; txtp->entry[i].silent = 1;
has_silents = 1; has_silents = 1;
continue; continue;
} }
temp_sf = open_streamfile_by_filename(sf, txtp->entry[i].filename); /* absolute paths are detected for convenience, but since it's hard to unify all OSs
* and plugins, they aren't "officially" supported nor documented, thus may or may not work */
if (is_absolute(filename))
temp_sf = open_streamfile(sf, filename); /* from path as is */
else
temp_sf = open_streamfile_by_filename(sf, filename); /* from current path */
if (!temp_sf) { if (!temp_sf) {
VGM_LOG("TXTP: cannot open streamfile for %s\n", txtp->entry[i].filename); VGM_LOG("TXTP: cannot open streamfile for %s\n", filename);
goto fail; goto fail;
} }
temp_sf->stream_index = txtp->entry[i].subsong; temp_sf->stream_index = txtp->entry[i].subsong;
@ -286,7 +296,7 @@ static int parse_entries(txtp_header* txtp, STREAMFILE* sf) {
txtp->vgmstream[i] = init_vgmstream_from_STREAMFILE(temp_sf); txtp->vgmstream[i] = init_vgmstream_from_STREAMFILE(temp_sf);
close_streamfile(temp_sf); close_streamfile(temp_sf);
if (!txtp->vgmstream[i]) { if (!txtp->vgmstream[i]) {
VGM_LOG("TXTP: cannot open vgmstream for %s#%i\n", txtp->entry[i].filename, txtp->entry[i].subsong); VGM_LOG("TXTP: cannot open vgmstream for %s#%i\n", filename, txtp->entry[i].subsong);
goto fail; goto fail;
} }

717
Frameworks/vgmstream/vgmstream/src/meta/vag.c
View file

@ -1,351 +1,366 @@
#include "meta.h" #include "meta.h"
#include "../coding/coding.h" #include "../coding/coding.h"
/* VAGp - Sony SDK format, created by various tools */ /* VAGp - Sony SDK format, created by various official tools */
VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) { VGMSTREAM* init_vgmstream_vag(STREAMFILE* sf) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM* vgmstream = NULL;
off_t start_offset; off_t start_offset;
size_t file_size, channel_size, interleave, interleave_first = 0, interleave_first_skip = 0; size_t file_size, channel_size, interleave, interleave_first = 0, interleave_first_skip = 0;
meta_t meta_type; meta_t meta_type;
int channel_count = 0, loop_flag, sample_rate; int channels = 0, loop_flag, sample_rate;
uint32_t vag_id, version; uint32_t vag_id, version, reserved;
int32_t loop_start_sample = 0, loop_end_sample = 0; int32_t loop_start_sample = 0, loop_end_sample = 0;
int allow_dual_stereo = 0; int allow_dual_stereo = 0, has_interleave_last = 0;
/* checks */ /* checks */
/* .vag: standard /* .vag: standard
* .swag: Frantix (PSP) * .swag: Frantix (PSP)
* .str: Ben10 Galactic Racing * .str: Ben10 Galactic Racing
* .vig: MX vs. ATV Untamed (PS2) * .vig: MX vs. ATV Untamed (PS2)
* .l/r: Crash Nitro Kart (PS2), Gradius V (PS2) * .l/r: Crash Nitro Kart (PS2), Gradius V (PS2)
* .vas: Kingdom Hearts II (PS2) */ * .vas: Kingdom Hearts II (PS2) */
if ( !check_extensions(streamFile,"vag,swag,str,vig,l,r,vas") ) if ( !check_extensions(sf,"vag,swag,str,vig,l,r,vas") )
goto fail; goto fail;
/* check VAG Header */ if (((read_u32be(0x00,sf) & 0xFFFFFF00) != 0x56414700) && /* "VAG" */
if (((read_32bitBE(0x00,streamFile) & 0xFFFFFF00) != 0x56414700) && /* "VAG" */ ((read_u32le(0x00,sf) & 0xFFFFFF00) != 0x56414700))
((read_32bitLE(0x00,streamFile) & 0xFFFFFF00) != 0x56414700)) goto fail;
goto fail;
file_size = get_streamfile_size(sf);
file_size = get_streamfile_size(streamFile);
/* versions used to create the file:
/* version used to create the file: * - 00000000 = v1.8 PC
* - 00000000 = v1.8 PC, * - 00000002 = v1.3 Mac (used?)
* - 00000002 = v1.3 Mac (used?) * - 00000003 = v1.6+ Mac
* - 00000003 = v1.6+ Mac * - 00000020 = v2.0 PC (most common)
* - 00000020 = v2.0 PC (most common) * - 00000004 = ? (later games)
* - 00000004 = ? (later games) * - 00000006 = ? (vagconv)
* - 00000006 = ? (vagconv) * - 00020001 = v2.1 (vagconv2)
* - 00020001 = v2.1 (vagconv2) * - 00030000 = v3.0 (vagconv2) */
* - 00030000 = v3.0 (vagconv2) */
version = (uint32_t)read_32bitBE(0x04,streamFile); vag_id = read_u32be(0x00,sf);
/* 0x08-0c: reserved */ version = read_u32be(0x04,sf);
channel_size = read_32bitBE(0x0c,streamFile); reserved = read_u32be(0x08,sf);
sample_rate = read_32bitBE(0x10,streamFile); channel_size = read_u32be(0x0c,sf);
/* 0x14-20 reserved */ sample_rate = read_u32be(0x10,sf);
/* 0x20-30: name (optional) */ /* 0x14-20 reserved */
/* 0x30: data start (first 0x10 usually 0s to init SPU) */ /* 0x20-30: name (optional) */
/* 0x30: data start (first 0x10 usually 0s to init SPU) */
/* check variation */ /* check variation */
vag_id = read_32bitBE(0x00,streamFile); switch(vag_id) {
switch(vag_id) {
case 0x56414731: /* "VAG1" (1 channel) [Metal Gear Solid 3 (PS2)] */
case 0x56414731: /* "VAG1" (1 channel) [Metal Gear Solid 3 (PS2)] */ meta_type = meta_PS2_VAG1;
meta_type = meta_PS2_VAG1; start_offset = 0x40; /* 0x30 is extra data in VAG1 */
start_offset = 0x40; /* 0x30 is extra data in VAG1 */ channels = 1;
channel_count = 1; interleave = 0;
interleave = 0; loop_flag = 0;
loop_flag = 0; break;
break;
case 0x56414732: /* "VAG2" (2 channels) [Metal Gear Solid 3 (PS2)] */
case 0x56414732: /* "VAG2" (2 channels) [Metal Gear Solid 3 (PS2)] */ meta_type = meta_PS2_VAG2;
meta_type = meta_PS2_VAG2; start_offset = 0x40; /* 0x30 is extra data in VAG2 */
start_offset = 0x40; /* 0x30 is extra data in VAG2 */ channels = 2;
channel_count = 2; interleave = 0x800;
interleave = 0x800; loop_flag = 0;
loop_flag = 0; break;
break;
case 0x56414769: /* "VAGi" (interleaved) */
case 0x56414769: /* "VAGi" (interleaved) */ meta_type = meta_PS2_VAGi;
meta_type = meta_PS2_VAGi; start_offset = 0x800;
start_offset = 0x800; channels = 2;
channel_count = 2; interleave = read_u32le(0x08,sf);
interleave = read_32bitLE(0x08,streamFile); loop_flag = 0;
loop_flag = 0; break;
break;
case 0x70474156: /* pGAV (little endian / stereo) [Jak 3 (PS2), Jak X (PS2)] */
case 0x70474156: /* pGAV (little endian / stereo) [Jak 3 (PS2), Jak X (PS2)] */ meta_type = meta_PS2_pGAV;
meta_type = meta_PS2_pGAV; start_offset = 0x30;
start_offset = 0x30;
if (is_id32be(0x20,sf, "Ster")) {
if (read_32bitBE(0x20,streamFile) == 0x53746572) { /* "Ster" */ channels = 2;
channel_count = 2;
if (is_id32be(0x2000,sf, "pGAV"))
if (read_32bitLE(0x2000,streamFile) == 0x56414770) /* "pGAV" */ interleave = 0x2000; /* Jak 3 interleave, includes header */
interleave = 0x2000; /* Jak 3 interleave, includes header */ else if (is_id32be(0x1000,sf, "pGAV"))
else if (read_32bitLE(0x1000,streamFile) == 0x56414770) /* "pGAV" */ interleave = 0x1000; /* Jak X interleave, includes header */
interleave = 0x1000; /* Jak X interleave, includes header */ else
else interleave = 0x2000; /* Jak 3 interleave in rare files, no header */
interleave = 0x2000; /* Jak 3 interleave in rare files, no header */ interleave_first = interleave - start_offset; /* interleave includes header */
interleave_first = interleave - start_offset; /* interleave includes header */ interleave_first_skip = start_offset;
interleave_first_skip = start_offset; }
} else {
else { channels = 1;
channel_count = 1; interleave = 0;
interleave = 0; }
}
channel_size = read_u32le(0x0C,sf) / channels;
channel_size = read_32bitLE(0x0C,streamFile) / channel_count; sample_rate = read_s32le(0x10,sf);
sample_rate = read_32bitLE(0x10,streamFile); //todo adjust channel_size, includes part of header?
//todo adjust channel_size, includes part of header? loop_flag = 0;
loop_flag = 0; break;
break;
case 0x56414770: /* "VAGp" (standard and variations) */
case 0x56414770: /* "VAGp" (standard and variations) */ meta_type = meta_PS2_VAGp;
meta_type = meta_PS2_VAGp;
if (check_extensions(sf,"vig")) {
if (check_extensions(streamFile,"vig")) { /* MX vs. ATV Untamed (PS2) */
/* MX vs. ATV Untamed (PS2) */ start_offset = 0x800 - 0x20;
start_offset = 0x800 - 0x20; channels = 2;
channel_count = 2; interleave = 0x10;
interleave = 0x10; loop_flag = 0;
loop_flag = 0; }
} else if (check_extensions(sf,"swag")) { /* also "VAGp" at (file_size / channels) */
else if (check_extensions(streamFile,"swag")) { /* also "VAGp" at (file_size / channels) */ /* Frantix (PSP) */
/* Frantix (PSP) */ start_offset = 0x40; /* channel_size ignores empty frame */
start_offset = 0x40; /* channel_size ignores empty frame */ channels = 2;
channel_count = 2; interleave = file_size / channels;
interleave = file_size / channel_count;
channel_size = read_u32le(0x0c,sf);
channel_size = read_32bitLE(0x0c,streamFile); sample_rate = read_s32le(0x10,sf);
sample_rate = read_32bitLE(0x10,streamFile);
loop_flag = ps_find_loop_offsets(sf, start_offset, channel_size*channels, channels, interleave, &loop_start_sample, &loop_end_sample);
loop_flag = ps_find_loop_offsets(streamFile, start_offset, channel_size*channel_count, channel_count, interleave, &loop_start_sample, &loop_end_sample); }
} else if (is_id32be(0x6000,sf, "VAGp")) {
else if (read_32bitBE(0x6000,streamFile) == 0x56414770) { /* "VAGp" */ /* The Simpsons Wrestling (PS1) */
/* The Simpsons Wrestling (PS1) */ start_offset = 0x30;
start_offset = 0x30; channels = 2;
channel_count = 2; interleave = 0x6000;
interleave = 0x6000; interleave_first = interleave - start_offset; /* includes header */
interleave_first = interleave - start_offset; /* includes header */ interleave_first_skip = start_offset;
interleave_first_skip = start_offset;
loop_flag = 0;
loop_flag = 0; }
} else if (is_id32be(0x1000,sf, "VAGp")) {
else if (read_32bitBE(0x1000,streamFile) == 0x56414770) { /* "VAGp" */ /* Shikigami no Shiro (PS2) */
/* Shikigami no Shiro (PS2) */ start_offset = 0x30;
start_offset = 0x30; channels = 2;
channel_count = 2; interleave = 0x1000;
interleave = 0x1000; interleave_first = interleave - start_offset; /* includes header */
interleave_first = interleave - start_offset; /* includes header */ interleave_first_skip = start_offset;
interleave_first_skip = start_offset;
loop_flag = ps_find_loop_offsets(sf, start_offset, channel_size*channels, channels, interleave, &loop_start_sample, &loop_end_sample);
loop_flag = ps_find_loop_offsets(streamFile, start_offset, channel_size*channel_count, channel_count, interleave, &loop_start_sample, &loop_end_sample); }
} else if (version == 0x40000000) {
else if (version == 0x40000000) { /* Killzone (PS2) */
/* Killzone (PS2) */ start_offset = 0x30;
start_offset = 0x30; channels = 1;
channel_count = 1; interleave = 0;
interleave = 0;
channel_size = read_u32le(0x0C,sf) / channels;
channel_size = read_32bitLE(0x0C,streamFile) / channel_count; sample_rate = read_s32le(0x10,sf);
sample_rate = read_32bitLE(0x10,streamFile); loop_flag = 0;
loop_flag = 0; }
} else if (version == 0x00020001 || version == 0x00030000) {
else if (version == 0x00020001 || version == 0x00030000) { /* standard Vita/PS4 .vag [Chronovolt (Vita), Grand Kingdom (PS4)] */
/* standard Vita/PS4 .vag [Chronovolt (Vita), Grand Kingdom (PS4)] */ start_offset = 0x30;
start_offset = 0x30; interleave = 0x10;
interleave = 0x10;
/* channels are at 0x1e, except Ukiyo no Roushi (Vita), which has
/* channels are at 0x1e, except Ukiyo no Roushi (Vita), which has * loop start/end frame (but also uses PS-ADPCM flags) */
* loop start/end frame (but also uses PS-ADPCM flags) */ if (read_u32be(0x18,sf) == 0
if (read_32bitBE(0x18,streamFile) == 0 && (read_u32be(0x1c,sf) & 0xFFFF00FF) == 0
&& (read_32bitBE(0x1c,streamFile) & 0xFFFF00FF) == 0 && read_u8(0x1e,sf) < 16) {
&& read_8bit(0x1e,streamFile) < 16) { channels = read_u8(0x1e,sf);
channel_count = read_8bit(0x1e,streamFile); if (channels == 0)
if (channel_count == 0) channels = 1; /* ex. early games [Lumines (Vita)] */
channel_count = 1; /* ex. early games [Lumines (Vita)] */ }
} else {
else { channels = 1;
channel_count = 1; }
}
channel_size = channel_size / channels;
channel_size = channel_size / channel_count; loop_flag = ps_find_loop_offsets(sf, start_offset, channel_size*channels, channels, interleave, &loop_start_sample, &loop_end_sample);
loop_flag = ps_find_loop_offsets(streamFile, start_offset, channel_size*channel_count, channel_count, interleave, &loop_start_sample, &loop_end_sample); }
} else if (version == 0x00000004 && channel_size == file_size - 0x60 && read_u32be(0x1c, sf) != 0) { /* also .vas */
else if (version == 0x00000004 && channel_size == file_size - 0x60 && read_32bitBE(0x1c, streamFile) != 0) { /* also .vas */ /* Kingdom Hearts II (PS2) */
/* Kingdom Hearts II (PS2) */ start_offset = 0x60;
start_offset = 0x60; interleave = 0x10;
interleave = 0x10;
loop_start_sample = read_s32be(0x14,sf);
loop_start_sample = read_32bitBE(0x14,streamFile); loop_end_sample = read_s32be(0x18,sf);
loop_end_sample = read_32bitBE(0x18,streamFile); loop_flag = (loop_end_sample > 0); /* maybe at 0x1d */
loop_flag = (loop_end_sample > 0); /* maybe at 0x1d */ channels = read_u8(0x1e,sf);
channel_count = read_8bit(0x1e,streamFile); /* 0x1f: possibly volume */
/* 0x1f: possibly volume */ channel_size = channel_size / channels;
channel_size = channel_size / channel_count; /* mono files also have channel/volume, but start at 0x30 and are probably named .vag */
/* mono files also have channel/volume, but start at 0x30 and are probably named .vag */ }
} else if (version == 0x00000020 && is_id32be(0x30,sf, "STER") && is_id32be(0x34,sf, "EOVA") && is_id32be(0x38,sf, "G2K\0")) {
else if (read_32bitBE(0x30,streamFile) == 0x53544552 /* "STEREOVAG2K " */ /* The Simpsons Skateboarding (PS2) */
&& read_32bitBE(0x34,streamFile) == 0x454F5641 start_offset = 0x800;
&& read_32bitBE(0x38,streamFile) == 0x47324B00) { channels = 2;
/* The Simpsons Skateboarding (PS2) */ interleave = 0x800;
start_offset = 0x800; loop_flag = 0;
channel_count = 2; }
interleave = 0x800; else if (version == 0x00000002 && is_id32be(0x24, sf, "VAGx")) {
loop_flag = 0; /* Need for Speed: Hot Pursuit 2 (PS2) */
} start_offset = 0x30;
else if (version == 0x00000002 && read_32bitBE(0x24, streamFile) == 0x56414778) { /* "VAGx" */ channels = read_u32be(0x2c, sf);
/* Need for Speed: Hot Pursuit 2 (PS2) */ channel_size = channel_size / channels;
start_offset = 0x30; loop_flag = 0;
channel_count = read_32bitBE(0x2c, streamFile);
channel_size = channel_size / channel_count; if (file_size % 0x10 != 0)
loop_flag = 0; goto fail;
if (file_size % 0x10 != 0) goto fail; /* detect interleave using end markers */
interleave = 0;
/* detect interleave using end markers */
interleave = 0; if (channels > 1) {
off_t offset = file_size;
if (channel_count > 1) { off_t end_off = 0;
off_t offset = file_size; uint8_t flag;
off_t end_off = 0;
uint8_t flag; while (offset > start_offset) {
offset -= 0x10;
while (offset > start_offset) { flag = read_u8(offset + 0x01, sf);
offset -= 0x10; if (flag == 0x01) {
flag = read_8bit(offset + 0x01, streamFile); if (!end_off) {
if (flag == 0x01) { end_off = offset;
if (!end_off) { } else {
end_off = offset; interleave = end_off - offset;
} else { break;
interleave = end_off - offset; }
break; }
} }
}
} if (!interleave) goto fail;
}
if (!interleave) goto fail; }
} else if (version == 0x00000020 && channel_size == file_size - 0x800 && read_u32be(0x08, sf) == 0x01) {
} /* Garfield: Saving Arlene (PS2) */
else if (version == 0x00000020 && channel_size == file_size - 0x800 && read_32bitBE(0x08, streamFile) == 0x01) { start_offset = 0x800;
/* Garfield: Saving Arlene (PS2) */ channels = 2;
start_offset = 0x800; interleave = 0x400;
channel_count = 2; loop_flag = 0;
interleave = 0x400;
loop_flag = 0; channel_size -= ps_find_padding(sf, start_offset, channel_size, channels, interleave, 0);
channel_size = channel_size / channels;
channel_size -= ps_find_padding(streamFile, start_offset, channel_size, channel_count, interleave, 0); }
channel_size = channel_size / channel_count; else if (version == 0x00000020 && reserved == 0x01010101) {
} /* Gift (PS2) */
else { start_offset = 0x800;
/* standard PS1/PS2/PS3 .vag [Ecco the Dolphin (PS2), Legasista (PS3)] */ channels = 2; /* mono VAGs in this game are standard, without reserved value */
start_offset = 0x30; interleave = 0x2000;
interleave = 0; if (read_u32be(0x4800,sf) == 0x00000000) /* one file has bigger interleave, detectable with ch2's null frame */
interleave = 0x4000;
channel_count = 1;
if (version == 0x20 /* hack for repeating full loops that aren't too small */ channel_size = channel_size / channels;
&& ps_bytes_to_samples(channel_size, 1) > 20 * sample_rate) { has_interleave_last = 1;
loop_flag = ps_find_loop_offsets_full(streamFile, start_offset, channel_size*channel_count, channel_count, interleave, &loop_start_sample, &loop_end_sample);
} /* all files do full loops */
else { loop_flag = 1;
loop_flag = ps_find_loop_offsets(streamFile, start_offset, channel_size*channel_count, channel_count, interleave, &loop_start_sample, &loop_end_sample); loop_start_sample = 0;
} loop_end_sample = ps_bytes_to_samples(channel_size,1);
allow_dual_stereo = 1; /* often found with external L/R files */ }
} else {
break; /* standard PS1/PS2/PS3 .vag [Ecco the Dolphin (PS2), Legasista (PS3)] */
start_offset = 0x30;
default: interleave = 0;
goto fail;
} channels = 1;
if (version == 0x20 /* hack for repeating full loops that aren't too small */
&& ps_bytes_to_samples(channel_size, 1) > 20 * sample_rate) {
/* build the VGMSTREAM */ loop_flag = ps_find_loop_offsets_full(sf, start_offset, channel_size*channels, channels, interleave, &loop_start_sample, &loop_end_sample);
vgmstream = allocate_vgmstream(channel_count,loop_flag); }
if (!vgmstream) goto fail; else {
loop_flag = ps_find_loop_offsets(sf, start_offset, channel_size*channels, channels, interleave, &loop_start_sample, &loop_end_sample);
vgmstream->meta_type = meta_type; }
vgmstream->allow_dual_stereo = allow_dual_stereo; allow_dual_stereo = 1; /* often found with external L/R files */
}
vgmstream->sample_rate = sample_rate; break;
vgmstream->num_samples = ps_bytes_to_samples(channel_size,1);
vgmstream->loop_start_sample = loop_start_sample; default:
vgmstream->loop_end_sample = loop_end_sample; goto fail;
vgmstream->coding_type = coding_PSX; }
if (version == 0x00020001 || version == 0x00030000)
vgmstream->coding_type = coding_HEVAG;
vgmstream->layout_type = (channel_count == 1) ? layout_none : layout_interleave; /* build the VGMSTREAM */
vgmstream->interleave_block_size = interleave; vgmstream = allocate_vgmstream(channels, loop_flag);
vgmstream->interleave_first_block_size = interleave_first; if (!vgmstream) goto fail;
vgmstream->interleave_first_skip = interleave_first_skip;
vgmstream->meta_type = meta_type;
vgmstream->allow_dual_stereo = allow_dual_stereo;
read_string(vgmstream->stream_name,0x10+1, 0x20,streamFile); /* always, can be null */
vgmstream->sample_rate = sample_rate;
if ( !vgmstream_open_stream(vgmstream, streamFile, start_offset) ) vgmstream->num_samples = ps_bytes_to_samples(channel_size,1);
goto fail; vgmstream->loop_start_sample = loop_start_sample;
return vgmstream; vgmstream->loop_end_sample = loop_end_sample;
vgmstream->coding_type = coding_PSX;
fail: if (version == 0x00020001 || version == 0x00030000)
close_vgmstream(vgmstream); vgmstream->coding_type = coding_HEVAG;
return NULL; vgmstream->layout_type = (channels == 1) ? layout_none : layout_interleave;
} vgmstream->interleave_block_size = interleave;
vgmstream->interleave_first_block_size = interleave_first;
/* AAAp - Acclaim Austin Audio VAG header [The Red Star (PS2)] */ vgmstream->interleave_first_skip = interleave_first_skip;
VGMSTREAM* init_vgmstream_vag_aaap(STREAMFILE* streamFile) { if (has_interleave_last && channels > 1 && interleave)
VGMSTREAM* vgmstream = NULL; vgmstream->interleave_last_block_size = channel_size % interleave;
off_t vag_offset, start_offset;
uint32_t channel_size, sample_rate; read_string(vgmstream->stream_name,0x10+1, 0x20,sf); /* always, can be null */
uint16_t interleave, channels;
uint32_t i; if (!vgmstream_open_stream(vgmstream, sf, start_offset))
int loop_flag; goto fail;
return vgmstream;
/* checks */
/* .vag - assumed, we don't know the original filenames */ fail:
if (!check_extensions(streamFile, "vag")) close_vgmstream(vgmstream);
goto fail; return NULL;
}
if (read_u32be(0x00, streamFile) != 0x41414170) /* "AAAp" */
goto fail; /* AAAp - Acclaim Austin Audio VAG header [The Red Star (PS2)] */
VGMSTREAM* init_vgmstream_vag_aaap(STREAMFILE* sf) {
interleave = read_u16le(0x04, streamFile); VGMSTREAM* vgmstream = NULL;
channels = read_u16le(0x06, streamFile); off_t vag_offset, start_offset;
vag_offset = 0x08; uint32_t channel_size, sample_rate;
uint16_t interleave, channels;
/* file has VAGp header for each channel */ uint32_t i;
for (i = 0; i < channels; i++) { int loop_flag;
if (read_u32be(vag_offset + i * 0x30, streamFile) != 0x56414770) /* "VAGp" */
goto fail; /* checks */
} /* .vag - assumed, we don't know the original filenames */
if (!check_extensions(sf, "vag"))
/* check version */ goto fail;
if (read_u32be(vag_offset + 0x04, streamFile) != 0x00000020)
goto fail; if (read_u32be(0x00, sf) != 0x41414170) /* "AAAp" */
goto fail;
channel_size = read_u32be(vag_offset + 0x0c, streamFile);
sample_rate = read_u32be(vag_offset + 0x10, streamFile); interleave = read_u16le(0x04, sf);
start_offset = vag_offset + channels * 0x30; channels = read_u16le(0x06, sf);
loop_flag = 0; vag_offset = 0x08;
/* build the VGMSTREAM */ /* file has VAGp header for each channel */
vgmstream = allocate_vgmstream(channels, loop_flag); for (i = 0; i < channels; i++) {
if (!vgmstream) goto fail; if (read_u32be(vag_offset + i * 0x30, sf) != 0x56414770) /* "VAGp" */
goto fail;
vgmstream->meta_type = meta_PS2_VAGp_AAAP; }
vgmstream->sample_rate = sample_rate;
vgmstream->num_samples = ps_bytes_to_samples(channel_size, 1); /* check version */
vgmstream->coding_type = coding_PSX; if (read_u32be(vag_offset + 0x04, sf) != 0x00000020)
vgmstream->layout_type = layout_interleave; goto fail;
vgmstream->interleave_block_size = interleave;
channel_size = read_u32be(vag_offset + 0x0c, sf);
if (!vgmstream_open_stream(vgmstream, streamFile, start_offset)) sample_rate = read_u32be(vag_offset + 0x10, sf);
goto fail; start_offset = vag_offset + channels * 0x30;
return vgmstream; loop_flag = 0;
fail: /* build the VGMSTREAM */
close_vgmstream(vgmstream); vgmstream = allocate_vgmstream(channels, loop_flag);
return NULL; if (!vgmstream) goto fail;
}
vgmstream->meta_type = meta_PS2_VAGp_AAAP;
vgmstream->sample_rate = sample_rate;
vgmstream->num_samples = ps_bytes_to_samples(channel_size, 1);
vgmstream->coding_type = coding_PSX;
vgmstream->layout_type = layout_interleave;
vgmstream->interleave_block_size = interleave;
if (!vgmstream_open_stream(vgmstream, sf, start_offset))
goto fail;
return vgmstream;
fail:
close_vgmstream(vgmstream);
return NULL;
}

4
Frameworks/vgmstream/vgmstream/src/vgmstream.c
View file

@ -1351,9 +1351,11 @@ static uint32_t hash_sf(STREAMFILE* sf) {
get_streamfile_name(sf, path, sizeof(path)); get_streamfile_name(sf, path, sizeof(path));
/* our favorite garbo hash a.k.a FNV-1 32b */ /* our favorite garbo hash a.k.a FNV-1 32b */
for (i = 0; i < strlen(path); i++) { i = 0;
while (path[i] != '\0') {
char c = tolower(path[i]); char c = tolower(path[i]);
hash = (hash * 16777619) ^ (uint8_t)c; hash = (hash * 16777619) ^ (uint8_t)c;
i++;
} }
return hash; return hash;