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

cleanup: simplify VAG meta description

Browse Source
This commit is contained in:
bnnm 2023-06-25 11:32:11 +02:00
parent bb7176463b
commit 97bf6bf5fe
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/formats.c
View File

@ -1007,10 +1007,9 @@ static const meta_info meta_info_list[] = {
{meta_DSP_GCM, "Double DSP header stereo by .gcm extension"},
{meta_IDSP_TT, "Traveller's Tales IDSP header"},
{meta_RAW_PCM, "PC .raw raw header"},
{meta_PS2_VAGi, "Sony VAGi header"},
{meta_PS2_VAGp, "Sony VAGp header"},
{meta_PS2_pGAV, "Sony pGAV header"},
{meta_PS2_VAGp_AAAP, "Acclaim Austin AAAp VAG header"},
{meta_VAG, "Sony VAG header"},
{meta_VAG_custom, "Sony VAG header (custom)"},
{meta_AAAP, "Acclaim Austin AAAp header"},
{meta_SEB, "Game Arts .SEB header"},
{meta_STR_WAV, "Blitz Games .STR+WAV header"},
{meta_ILD, "Tose ILD header"},
@ -1220,8 +1219,6 @@ static const meta_info meta_info_list[] = {
{meta_EB_SFX, "Excitebots .sfx header"},
{meta_EB_SF0, "assumed Excitebots .sf0 by extension"},
{meta_MTAF, "Konami MTAF header"},
{meta_PS2_VAG1, "Konami VAG1 header"},
{meta_PS2_VAG2, "Konami VAG2 header"},
{meta_ALP, "High Voltage ALP header"},
{meta_WPD, "WPD 'DPW' header"},
{meta_MN_STR, "Mini Ninjas 'STR' header"},

20
src/meta/vag.c
View File

@ -54,7 +54,7 @@ VGMSTREAM* init_vgmstream_vag(STREAMFILE* sf) {
switch(vag_id) {
case 0x56414731: /* "VAG1" [Metal Gear Solid 3 (PS2), Cabela's African Safari (PSP), Shamu's Deep Sea Adventures (PS2)] */
meta_type = meta_PS2_VAG1; //TODO not always Konami (Sand Grain Studios)
meta_type = meta_VAG_custom; //TODO not always Konami (Sand Grain Studios)
start_offset = 0x40; /* 0x30 is extra data in VAG1 */
interleave = 0x10;
loop_flag = 0;
@ -66,7 +66,7 @@ VGMSTREAM* init_vgmstream_vag(STREAMFILE* sf) {
break;
case 0x56414732: /* "VAG2" (2 channels) [Metal Gear Solid 3 (PS2)] */
meta_type = meta_PS2_VAG2;
meta_type = meta_VAG_custom;
start_offset = 0x40; /* 0x30 is extra data in VAG2 */
channels = 2;
interleave = 0x800;
@ -74,7 +74,7 @@ VGMSTREAM* init_vgmstream_vag(STREAMFILE* sf) {
break;
case 0x56414769: /* "VAGi" (interleaved) */
meta_type = meta_PS2_VAGi;
meta_type = meta_VAG_custom;
start_offset = 0x800;
channels = 2;
interleave = read_u32le(0x08,sf);
@ -82,7 +82,7 @@ VGMSTREAM* init_vgmstream_vag(STREAMFILE* sf) {
break;
case 0x70474156: /* pGAV (little endian / stereo) [Jak 3 (PS2), Jak X (PS2)] */
meta_type = meta_PS2_pGAV;
meta_type = meta_VAG_custom;
start_offset = 0x30;
if (is_id32be(0x20,sf, "Ster")) {
@ -109,7 +109,7 @@ VGMSTREAM* init_vgmstream_vag(STREAMFILE* sf) {
break;
case 0x56414770: /* "VAGp" (standard and variations) */
meta_type = meta_PS2_VAGp;
meta_type = meta_VAG;
if (check_extensions(sf,"vig")) {
/* MX vs. ATV Untamed (PS2) */
@ -339,12 +339,12 @@ VGMSTREAM* init_vgmstream_vag_aaap(STREAMFILE* sf) {
int loop_flag;
/* checks */
if (!is_id32be(0x00, sf, "AAAp"))
return NULL;
/* .vag - assumed, we don't know the original filenames */
if (!check_extensions(sf, "vag"))
goto fail;
if (read_u32be(0x00, sf) != 0x41414170) /* "AAAp" */
goto fail;
return NULL;
interleave = read_u16le(0x04, sf);
channels = read_u16le(0x06, sf);
@ -369,7 +369,7 @@ VGMSTREAM* init_vgmstream_vag_aaap(STREAMFILE* sf) {
vgmstream = allocate_vgmstream(channels, loop_flag);
if (!vgmstream) goto fail;
vgmstream->meta_type = meta_PS2_VAGp_AAAP;
vgmstream->meta_type = meta_AAAP;
vgmstream->sample_rate = sample_rate;
vgmstream->num_samples = ps_bytes_to_samples(channel_size, 1);
vgmstream->coding_type = coding_PSX;

10
src/vgmstream_types.h
View File

@ -304,10 +304,9 @@ typedef enum {
meta_PS_HEADERLESS, /* headerless PS-ADPCM */
meta_MIB_MIH,
meta_PS2_MIC, /* KOEI MIC File */
meta_PS2_VAGi, /* VAGi Interleaved File */
meta_PS2_VAGp, /* VAGp Mono File */
meta_PS2_pGAV, /* VAGp with Little Endian Header */
meta_PS2_VAGp_AAAP, /* Acclaim Austin Audio VAG header */
meta_VAG,
meta_VAG_custom,
meta_AAAP,
meta_SEB,
meta_STR_WAV, /* Blitz Games STR+WAV files */
meta_ILD,
@ -507,8 +506,7 @@ typedef enum {
meta_EB_SFX, /* Excitebots .sfx */
meta_EB_SF0, /* Excitebots .sf0 */
meta_MTAF,
meta_PS2_VAG1, /* Metal Gear Solid 3 VAG1 */
meta_PS2_VAG2, /* Metal Gear Solid 3 VAG2 */
meta_VAG_custom,
meta_ALP,
meta_WPD, /* Shuffle! (PC) */
meta_MN_STR, /* Mini Ninjas (PC/PS3/WII) */