kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated VGMStream to r1050-3677-g76566c8d

CQTexperiment
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

@ -395,6 +395,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
/* D4DJ Groovy Mix (Android) [music_* files, per-song later mixed with subkey] */ /* D4DJ Groovy Mix (Android) [music_* files, per-song later mixed with subkey] */

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;
} }

199
Frameworks/vgmstream/vgmstream/src/meta/vag.c
View File

@ -2,16 +2,16 @@
#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 */
@ -21,18 +21,17 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
* .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(streamFile); file_size = get_streamfile_size(sf);
/* version used to create the file: /* versions 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)
@ -40,23 +39,23 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
* - 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);
/* 0x08-0c: reserved */ vag_id = read_u32be(0x00,sf);
channel_size = read_32bitBE(0x0c,streamFile); version = read_u32be(0x04,sf);
sample_rate = read_32bitBE(0x10,streamFile); reserved = read_u32be(0x08,sf);
channel_size = read_u32be(0x0c,sf);
sample_rate = read_u32be(0x10,sf);
/* 0x14-20 reserved */ /* 0x14-20 reserved */
/* 0x20-30: name (optional) */ /* 0x20-30: name (optional) */
/* 0x30: data start (first 0x10 usually 0s to init SPU) */ /* 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 */
channel_count = 1; channels = 1;
interleave = 0; interleave = 0;
loop_flag = 0; loop_flag = 0;
break; break;
@ -64,7 +63,7 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
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 */
channel_count = 2; channels = 2;
interleave = 0x800; interleave = 0x800;
loop_flag = 0; loop_flag = 0;
break; break;
@ -72,8 +71,8 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
case 0x56414769: /* "VAGi" (interleaved) */ case 0x56414769: /* "VAGi" (interleaved) */
meta_type = meta_PS2_VAGi; meta_type = meta_PS2_VAGi;
start_offset = 0x800; start_offset = 0x800;
channel_count = 2; channels = 2;
interleave = read_32bitLE(0x08,streamFile); interleave = read_u32le(0x08,sf);
loop_flag = 0; loop_flag = 0;
break; break;
@ -81,12 +80,12 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
meta_type = meta_PS2_pGAV; meta_type = meta_PS2_pGAV;
start_offset = 0x30; start_offset = 0x30;
if (read_32bitBE(0x20,streamFile) == 0x53746572) { /* "Ster" */ if (is_id32be(0x20,sf, "Ster")) {
channel_count = 2; channels = 2;
if (read_32bitLE(0x2000,streamFile) == 0x56414770) /* "pGAV" */ if (is_id32be(0x2000,sf, "pGAV"))
interleave = 0x2000; /* Jak 3 interleave, includes header */ interleave = 0x2000; /* Jak 3 interleave, includes header */
else if (read_32bitLE(0x1000,streamFile) == 0x56414770) /* "pGAV" */ else if (is_id32be(0x1000,sf, "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 */
@ -94,12 +93,12 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
interleave_first_skip = start_offset; interleave_first_skip = start_offset;
} }
else { else {
channel_count = 1; channels = 1;
interleave = 0; interleave = 0;
} }
channel_size = read_32bitLE(0x0C,streamFile) / channel_count; channel_size = read_u32le(0x0C,sf) / channels;
sample_rate = read_32bitLE(0x10,streamFile); sample_rate = read_s32le(0x10,sf);
//todo adjust channel_size, includes part of header? //todo adjust channel_size, includes part of header?
loop_flag = 0; loop_flag = 0;
break; break;
@ -107,52 +106,52 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
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(streamFile,"vig")) { if (check_extensions(sf,"vig")) {
/* MX vs. ATV Untamed (PS2) */ /* MX vs. ATV Untamed (PS2) */
start_offset = 0x800 - 0x20; start_offset = 0x800 - 0x20;
channel_count = 2; channels = 2;
interleave = 0x10; interleave = 0x10;
loop_flag = 0; loop_flag = 0;
} }
else if (check_extensions(streamFile,"swag")) { /* also "VAGp" at (file_size / channels) */ else if (check_extensions(sf,"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 */
channel_count = 2; channels = 2;
interleave = file_size / channel_count; interleave = file_size / channels;
channel_size = read_32bitLE(0x0c,streamFile); channel_size = read_u32le(0x0c,sf);
sample_rate = read_32bitLE(0x10,streamFile); sample_rate = read_s32le(0x10,sf);
loop_flag = ps_find_loop_offsets(streamFile, start_offset, channel_size*channel_count, channel_count, interleave, &loop_start_sample, &loop_end_sample); loop_flag = ps_find_loop_offsets(sf, start_offset, channel_size*channels, channels, interleave, &loop_start_sample, &loop_end_sample);
} }
else if (read_32bitBE(0x6000,streamFile) == 0x56414770) { /* "VAGp" */ else if (is_id32be(0x6000,sf, "VAGp")) {
/* The Simpsons Wrestling (PS1) */ /* The Simpsons Wrestling (PS1) */
start_offset = 0x30; start_offset = 0x30;
channel_count = 2; channels = 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 (read_32bitBE(0x1000,streamFile) == 0x56414770) { /* "VAGp" */ else if (is_id32be(0x1000,sf, "VAGp")) {
/* Shikigami no Shiro (PS2) */ /* Shikigami no Shiro (PS2) */
start_offset = 0x30; start_offset = 0x30;
channel_count = 2; channels = 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(streamFile, start_offset, channel_size*channel_count, channel_count, interleave, &loop_start_sample, &loop_end_sample); loop_flag = ps_find_loop_offsets(sf, start_offset, channel_size*channels, channels, 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;
channel_count = 1; channels = 1;
interleave = 0; interleave = 0;
channel_size = read_32bitLE(0x0C,streamFile) / channel_count; channel_size = read_u32le(0x0C,sf) / channels;
sample_rate = read_32bitLE(0x10,streamFile); sample_rate = read_s32le(0x10,sf);
loop_flag = 0; loop_flag = 0;
} }
else if (version == 0x00020001 || version == 0x00030000) { else if (version == 0x00020001 || version == 0x00030000) {
@ -162,62 +161,61 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
/* 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_32bitBE(0x18,streamFile) == 0 if (read_u32be(0x18,sf) == 0
&& (read_32bitBE(0x1c,streamFile) & 0xFFFF00FF) == 0 && (read_u32be(0x1c,sf) & 0xFFFF00FF) == 0
&& read_8bit(0x1e,streamFile) < 16) { && read_u8(0x1e,sf) < 16) {
channel_count = read_8bit(0x1e,streamFile); channels = read_u8(0x1e,sf);
if (channel_count == 0) if (channels == 0)
channel_count = 1; /* ex. early games [Lumines (Vita)] */ channels = 1; /* ex. early games [Lumines (Vita)] */
} }
else { else {
channel_count = 1; channels = 1;
} }
channel_size = channel_size / channel_count; channel_size = channel_size / channels;
loop_flag = ps_find_loop_offsets(streamFile, start_offset, channel_size*channel_count, channel_count, interleave, &loop_start_sample, &loop_end_sample); loop_flag = ps_find_loop_offsets(sf, start_offset, channel_size*channels, channels, interleave, &loop_start_sample, &loop_end_sample);
} }
else if (version == 0x00000004 && channel_size == file_size - 0x60 && read_32bitBE(0x1c, streamFile) != 0) { /* also .vas */ else if (version == 0x00000004 && channel_size == file_size - 0x60 && read_u32be(0x1c, sf) != 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_32bitBE(0x14,streamFile); loop_start_sample = read_s32be(0x14,sf);
loop_end_sample = read_32bitBE(0x18,streamFile); loop_end_sample = read_s32be(0x18,sf);
loop_flag = (loop_end_sample > 0); /* maybe at 0x1d */ loop_flag = (loop_end_sample > 0); /* maybe at 0x1d */
channel_count = read_8bit(0x1e,streamFile); channels = read_u8(0x1e,sf);
/* 0x1f: possibly volume */ /* 0x1f: possibly volume */
channel_size = channel_size / channel_count; channel_size = channel_size / channels;
/* 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 (read_32bitBE(0x30,streamFile) == 0x53544552 /* "STEREOVAG2K " */ else if (version == 0x00000020 && is_id32be(0x30,sf, "STER") && is_id32be(0x34,sf, "EOVA") && is_id32be(0x38,sf, "G2K\0")) {
&& read_32bitBE(0x34,streamFile) == 0x454F5641
&& read_32bitBE(0x38,streamFile) == 0x47324B00) {
/* The Simpsons Skateboarding (PS2) */ /* The Simpsons Skateboarding (PS2) */
start_offset = 0x800; start_offset = 0x800;
channel_count = 2; channels = 2;
interleave = 0x800; interleave = 0x800;
loop_flag = 0; loop_flag = 0;
} }
else if (version == 0x00000002 && read_32bitBE(0x24, streamFile) == 0x56414778) { /* "VAGx" */ else if (version == 0x00000002 && is_id32be(0x24, sf, "VAGx")) {
/* Need for Speed: Hot Pursuit 2 (PS2) */ /* Need for Speed: Hot Pursuit 2 (PS2) */
start_offset = 0x30; start_offset = 0x30;
channel_count = read_32bitBE(0x2c, streamFile); channels = read_u32be(0x2c, sf);
channel_size = channel_size / channel_count; channel_size = channel_size / channels;
loop_flag = 0; loop_flag = 0;
if (file_size % 0x10 != 0) goto fail; if (file_size % 0x10 != 0)
goto fail;
/* detect interleave using end markers */ /* detect interleave using end markers */
interleave = 0; interleave = 0;
if (channel_count > 1) { if (channels > 1) {
off_t offset = file_size; off_t offset = file_size;
off_t end_off = 0; off_t end_off = 0;
uint8_t flag; uint8_t flag;
while (offset > start_offset) { while (offset > start_offset) {
offset -= 0x10; offset -= 0x10;
flag = read_8bit(offset + 0x01, streamFile); flag = read_u8(offset + 0x01, sf);
if (flag == 0x01) { if (flag == 0x01) {
if (!end_off) { if (!end_off) {
end_off = offset; end_off = offset;
@ -231,28 +229,44 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
if (!interleave) goto fail; if (!interleave) goto fail;
} }
} }
else if (version == 0x00000020 && channel_size == file_size - 0x800 && read_32bitBE(0x08, streamFile) == 0x01) { else if (version == 0x00000020 && channel_size == file_size - 0x800 && read_u32be(0x08, sf) == 0x01) {
/* Garfield: Saving Arlene (PS2) */ /* Garfield: Saving Arlene (PS2) */
start_offset = 0x800; start_offset = 0x800;
channel_count = 2; channels = 2;
interleave = 0x400; interleave = 0x400;
loop_flag = 0; loop_flag = 0;
channel_size -= ps_find_padding(streamFile, start_offset, channel_size, channel_count, interleave, 0); channel_size -= ps_find_padding(sf, start_offset, channel_size, channels, interleave, 0);
channel_size = channel_size / channel_count; channel_size = channel_size / channels;
}
else if (version == 0x00000020 && reserved == 0x01010101) {
/* Gift (PS2) */
start_offset = 0x800;
channels = 2; /* mono VAGs in this game are standard, without reserved value */
interleave = 0x2000;
if (read_u32be(0x4800,sf) == 0x00000000) /* one file has bigger interleave, detectable with ch2's null frame */
interleave = 0x4000;
channel_size = channel_size / channels;
has_interleave_last = 1;
/* all files do full loops */
loop_flag = 1;
loop_start_sample = 0;
loop_end_sample = ps_bytes_to_samples(channel_size,1);
} }
else { else {
/* standard PS1/PS2/PS3 .vag [Ecco the Dolphin (PS2), Legasista (PS3)] */ /* standard PS1/PS2/PS3 .vag [Ecco the Dolphin (PS2), Legasista (PS3)] */
start_offset = 0x30; start_offset = 0x30;
interleave = 0; interleave = 0;
channel_count = 1; channels = 1;
if (version == 0x20 /* hack for repeating full loops that aren't too small */ if (version == 0x20 /* hack for repeating full loops that aren't too small */
&& ps_bytes_to_samples(channel_size, 1) > 20 * sample_rate) { && ps_bytes_to_samples(channel_size, 1) > 20 * sample_rate) {
loop_flag = ps_find_loop_offsets_full(streamFile, start_offset, channel_size*channel_count, channel_count, interleave, &loop_start_sample, &loop_end_sample); loop_flag = ps_find_loop_offsets_full(sf, start_offset, channel_size*channels, channels, interleave, &loop_start_sample, &loop_end_sample);
} }
else { else {
loop_flag = ps_find_loop_offsets(streamFile, start_offset, channel_size*channel_count, channel_count, interleave, &loop_start_sample, &loop_end_sample); loop_flag = ps_find_loop_offsets(sf, start_offset, channel_size*channels, channels, interleave, &loop_start_sample, &loop_end_sample);
} }
allow_dual_stereo = 1; /* often found with external L/R files */ allow_dual_stereo = 1; /* often found with external L/R files */
} }
@ -264,7 +278,7 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
/* build the VGMSTREAM */ /* build the VGMSTREAM */
vgmstream = allocate_vgmstream(channel_count,loop_flag); vgmstream = allocate_vgmstream(channels, loop_flag);
if (!vgmstream) goto fail; if (!vgmstream) goto fail;
vgmstream->meta_type = meta_type; vgmstream->meta_type = meta_type;
@ -277,15 +291,16 @@ VGMSTREAM * init_vgmstream_vag(STREAMFILE *streamFile) {
vgmstream->coding_type = coding_PSX; vgmstream->coding_type = coding_PSX;
if (version == 0x00020001 || version == 0x00030000) if (version == 0x00020001 || version == 0x00030000)
vgmstream->coding_type = coding_HEVAG; vgmstream->coding_type = coding_HEVAG;
vgmstream->layout_type = (channel_count == 1) ? layout_none : layout_interleave; vgmstream->layout_type = (channels == 1) ? layout_none : layout_interleave;
vgmstream->interleave_block_size = interleave; vgmstream->interleave_block_size = interleave;
vgmstream->interleave_first_block_size = interleave_first; vgmstream->interleave_first_block_size = interleave_first;
vgmstream->interleave_first_skip = interleave_first_skip; vgmstream->interleave_first_skip = interleave_first_skip;
if (has_interleave_last && channels > 1 && interleave)
vgmstream->interleave_last_block_size = channel_size % interleave;
read_string(vgmstream->stream_name,0x10+1, 0x20,sf); /* always, can be null */
read_string(vgmstream->stream_name,0x10+1, 0x20,streamFile); /* always, can be null */ if (!vgmstream_open_stream(vgmstream, sf, start_offset))
if ( !vgmstream_open_stream(vgmstream, streamFile, start_offset) )
goto fail; goto fail;
return vgmstream; return vgmstream;
@ -295,7 +310,7 @@ fail:
} }
/* AAAp - Acclaim Austin Audio VAG header [The Red Star (PS2)] */ /* AAAp - Acclaim Austin Audio VAG header [The Red Star (PS2)] */
VGMSTREAM* init_vgmstream_vag_aaap(STREAMFILE* streamFile) { VGMSTREAM* init_vgmstream_vag_aaap(STREAMFILE* sf) {
VGMSTREAM* vgmstream = NULL; VGMSTREAM* vgmstream = NULL;
off_t vag_offset, start_offset; off_t vag_offset, start_offset;
uint32_t channel_size, sample_rate; uint32_t channel_size, sample_rate;
@ -305,28 +320,28 @@ VGMSTREAM* init_vgmstream_vag_aaap(STREAMFILE* streamFile) {
/* checks */ /* checks */
/* .vag - assumed, we don't know the original filenames */ /* .vag - assumed, we don't know the original filenames */
if (!check_extensions(streamFile, "vag")) if (!check_extensions(sf, "vag"))
goto fail; goto fail;
if (read_u32be(0x00, streamFile) != 0x41414170) /* "AAAp" */ if (read_u32be(0x00, sf) != 0x41414170) /* "AAAp" */
goto fail; goto fail;
interleave = read_u16le(0x04, streamFile); interleave = read_u16le(0x04, sf);
channels = read_u16le(0x06, streamFile); channels = read_u16le(0x06, sf);
vag_offset = 0x08; vag_offset = 0x08;
/* file has VAGp header for each channel */ /* file has VAGp header for each channel */
for (i = 0; i < channels; i++) { for (i = 0; i < channels; i++) {
if (read_u32be(vag_offset + i * 0x30, streamFile) != 0x56414770) /* "VAGp" */ if (read_u32be(vag_offset + i * 0x30, sf) != 0x56414770) /* "VAGp" */
goto fail; goto fail;
} }
/* check version */ /* check version */
if (read_u32be(vag_offset + 0x04, streamFile) != 0x00000020) if (read_u32be(vag_offset + 0x04, sf) != 0x00000020)
goto fail; goto fail;
channel_size = read_u32be(vag_offset + 0x0c, streamFile); channel_size = read_u32be(vag_offset + 0x0c, sf);
sample_rate = read_u32be(vag_offset + 0x10, streamFile); sample_rate = read_u32be(vag_offset + 0x10, sf);
start_offset = vag_offset + channels * 0x30; start_offset = vag_offset + channels * 0x30;
loop_flag = 0; loop_flag = 0;
@ -341,7 +356,7 @@ VGMSTREAM* init_vgmstream_vag_aaap(STREAMFILE* streamFile) {
vgmstream->layout_type = layout_interleave; vgmstream->layout_type = layout_interleave;
vgmstream->interleave_block_size = interleave; vgmstream->interleave_block_size = interleave;
if (!vgmstream_open_stream(vgmstream, streamFile, start_offset)) if (!vgmstream_open_stream(vgmstream, sf, start_offset))
goto fail; goto fail;
return vgmstream; return vgmstream;

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;