diff --git a/src/formats.c b/src/formats.c index 5da7f61b..574a6ae6 100644 --- a/src/formats.c +++ b/src/formats.c @@ -92,6 +92,7 @@ static const char* extension_list[] = { "ckd", "cnk", "cps", + "cvs", "cxs", "da", diff --git a/src/meta/ps2_mib.c b/src/meta/ps2_mib.c index 3e4fff1f..a3e0dd6e 100644 --- a/src/meta/ps2_mib.c +++ b/src/meta/ps2_mib.c @@ -74,7 +74,8 @@ VGMSTREAM * init_vgmstream_ps2_mib(STREAMFILE *streamFile) { /* check extension, case insensitive */ streamFile->get_name(streamFile,filename,sizeof(filename)); - if (strcasecmp("mib",filename_extension(filename)) && + if (strcasecmp("cvs",filename_extension(filename)) && + strcasecmp("mib",filename_extension(filename)) && strcasecmp("mi4",filename_extension(filename)) && strcasecmp("vb",filename_extension(filename)) && strcasecmp("xag",filename_extension(filename))) goto fail; @@ -268,7 +269,8 @@ VGMSTREAM * init_vgmstream_ps2_mib(STREAMFILE *streamFile) { vgmstream->sample_rate = 44100; } - if(!strcasecmp("vb",filename_extension(filename))) + if (!strcasecmp("cvs", filename_extension(filename)) || + !strcasecmp("vb",filename_extension(filename))) { vgmstream->layout_type = layout_none; vgmstream->interleave_block_size=0; diff --git a/src/meta/ps2_xa2_rrp.c b/src/meta/ps2_xa2_rrp.c index 2eff2f3a..64091d17 100644 --- a/src/meta/ps2_xa2_rrp.c +++ b/src/meta/ps2_xa2_rrp.c @@ -15,7 +15,7 @@ VGMSTREAM * init_vgmstream_ps2_xa2_rrp(STREAMFILE *streamFile) { if (strcasecmp("xa2",filename_extension(filename))) goto fail; /* check header */ - if (read_32bitBE(0xC,streamFile) != 0x00000000) + if (read_32bitBE(0x50,streamFile) != 0x00000000) goto fail; loop_flag = 0; @@ -32,6 +32,9 @@ VGMSTREAM * init_vgmstream_ps2_xa2_rrp(STREAMFILE *streamFile) { vgmstream->coding_type = coding_PSX; vgmstream->num_samples = (get_streamfile_size(streamFile)-0x800)*28/16/channel_count; vgmstream->layout_type = layout_interleave; + if (channel_count > 2) + vgmstream->interleave_block_size = 0x400; + else vgmstream->interleave_block_size = 0x1000; vgmstream->meta_type = meta_PS2_XA2_RRP;