Add .vas container [Jikkyou Powerful Pro Yakyuu games (PS2)]

src/formats.c

@@ -883,7 +883,7 @@ static const meta_info meta_info_list[] = {
         {meta_SCD_PCM,              "Lunar: Eternal Blue .PCM header"},
         {meta_PS2_PCM,              "Konami KCEJ East .PCM header"},
         {meta_PS2_RKV,              "Legacy of Kain - Blood Omen 2 RKV PS2 header"},
-        {meta_PS2_VAS,              "Pro Baseball Spirits 5 VAS Header"},
+        {meta_PS2_VAS,              "Konami .VAS header"},
         {meta_PS2_TEC,              "assumed TECMO badflagged stream by .tec extension"},
         {meta_PS2_ENTH,             ".enth Header"},
         {meta_SDT,                  "High Voltage .sdt header"},

src/meta/meta.h

@@ -239,6 +239,7 @@ VGMSTREAM * init_vgmstream_ps2_pcm(STREAMFILE * streamFile);
 VGMSTREAM * init_vgmstream_ps2_rkv(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_ps2_vas(STREAMFILE * streamFile);
+VGMSTREAM * init_vgmstream_ps2_vas_container(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_ps2_tec(STREAMFILE * streamFile);
 

src/meta/ps2_vas.c

@@ -1,66 +1,122 @@
 #include "meta.h"
-#include "../util.h"
+#include "../coding/coding.h"
 
-/* VAS (from Pro Baseball Spirits 5) */
+
+/* .VAS - from Konami Jikkyou Powerful Pro Yakyuu games */
 VGMSTREAM * init_vgmstream_ps2_vas(STREAMFILE *streamFile) {
     VGMSTREAM * vgmstream = NULL;
-    char filename[PATH_LIMIT];
     off_t start_offset;
-	int loop_flag;
+    int loop_flag, channel_count;
-	int channel_count;
 
-    /* check extension, case insensitive */
-    streamFile->get_name(streamFile,filename,sizeof(filename));
-    if (strcasecmp("vas",filename_extension(filename))) goto fail;
 
-    /* check header */
+    /* checks */
-#if 0
+    if (!check_extensions(streamFile, "vas"))
-    if (read_32bitBE(0x00,streamFile) != 0x00000000) /* 0x0 */
+        goto fail;
+    if (read_32bitLE(0x00,streamFile) + 0x800 != get_streamfile_size(streamFile))
        goto fail;
-#endif
 
-    loop_flag = (read_32bitLE(0x10,streamFile)!=0);
+    loop_flag = (read_32bitLE(0x10,streamFile) != 0);
     channel_count = 2;
-    
+    start_offset = 0x800;
-	/* build the VGMSTREAM */
+
+    /* header is too simple so test a bit */
+    if (!ps_check_format(streamFile, start_offset, 0x1000))
+        goto fail;
+
+
+    /* build the VGMSTREAM */
     vgmstream = allocate_vgmstream(channel_count,loop_flag);
     if (!vgmstream) goto fail;
 
-	/* fill in the vital statistics */
+    vgmstream->meta_type = meta_PS2_VAS;
-    start_offset = 0x800;
-	vgmstream->channels = channel_count;
     vgmstream->sample_rate = read_32bitLE(0x04,streamFile);
-    vgmstream->coding_type = coding_PSX;
-    vgmstream->num_samples = read_32bitLE(0x00,streamFile)*28/16/channel_count;
-    if (loop_flag) {
-        vgmstream->loop_start_sample = read_32bitLE(0x14,streamFile)*28/16/channel_count;
-        vgmstream->loop_end_sample = read_32bitLE(0x00,streamFile)*28/16/channel_count;
-    }
 
+    vgmstream->coding_type = coding_PSX;
     vgmstream->layout_type = layout_interleave;
     vgmstream->interleave_block_size = 0x200;
-    vgmstream->meta_type = meta_PS2_VAS;
 
-    /* open the file for reading */
+    vgmstream->num_samples = ps_bytes_to_samples(read_32bitLE(0x00,streamFile), channel_count);
-    {
+    vgmstream->loop_start_sample = ps_bytes_to_samples(read_32bitLE(0x14,streamFile), channel_count);
-        int i;
+    vgmstream->loop_end_sample = vgmstream->num_samples;
-        STREAMFILE * file;
-        file = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
-        if (!file) goto fail;
-        for (i=0;i<channel_count;i++) {
-            vgmstream->ch[i].streamfile = file;
-
-            vgmstream->ch[i].channel_start_offset=
-                vgmstream->ch[i].offset=start_offset+
-                vgmstream->interleave_block_size*i;
-
-        }
-    }
 
+    if (!vgmstream_open_stream(vgmstream,streamFile,start_offset))
+        goto fail;
     return vgmstream;
 
-    /* clean up anything we may have opened */
 fail:
-    if (vgmstream) close_vgmstream(vgmstream);
+    close_vgmstream(vgmstream);
+    return NULL;
+}
+
+
+/* .VAS in containers */
+VGMSTREAM * init_vgmstream_ps2_vas_container(STREAMFILE *streamFile) {
+    VGMSTREAM *vgmstream = NULL;
+    STREAMFILE *temp_streamFile = NULL;
+    off_t subfile_offset = 0;
+    size_t subfile_size = 0;
+    int total_subsongs, target_subsong = streamFile->stream_index;
+    int has_table;
+
+
+    /* checks */
+    if (!check_extensions(streamFile, "vas"))
+        goto fail;
+
+    if (read_32bitBE(0x00, streamFile) != 0xAB8A5A00) /* fixed value */
+        goto fail;
+    if (read_32bitLE(0x04, streamFile)*0x800 + 0x800 != get_streamfile_size(streamFile)) /* just in case */
+        goto fail;
+
+    /* offset table, 0x98 has table size */
+    has_table = read_32bitLE(0x94, streamFile);
+
+
+    total_subsongs = read_32bitLE(0x08, streamFile); /* also at 0x10 */
+    if (target_subsong == 0) target_subsong = 1;
+    if (target_subsong < 0 || target_subsong > total_subsongs || total_subsongs < 1) goto fail;
+
+
+    if (has_table) {
+        off_t header_offset = 0x800 + 0x10*(target_subsong-1);
+
+        /* some values are repeats found in the file sub-header */
+        subfile_offset = read_32bitLE(header_offset + 0x00,streamFile) * 0x800;
+        subfile_size   = read_32bitLE(header_offset + 0x08,streamFile) + 0x800;
+    }
+    else {
+        /* a bunch of files */
+        off_t offset = 0x800;
+        int i;
+
+        for (i = 0; i < total_subsongs; i++) {
+            size_t size = read_32bitLE(offset, streamFile) + 0x800;
+
+            if (i + 1 == target_subsong) {
+                subfile_offset = offset;
+                subfile_size = size;
+                break;
+            }
+
+            offset += size;
+        }
+        if (i == total_subsongs)
+            goto fail;
+    }
+
+    temp_streamFile = setup_subfile_streamfile(streamFile, subfile_offset,subfile_size, NULL);
+    if (!temp_streamFile) goto fail;
+
+    vgmstream = init_vgmstream_ps2_vas(temp_streamFile);
+    if (!vgmstream) goto fail;
+
+    vgmstream->num_streams = total_subsongs;
+
+    close_streamfile(temp_streamFile);
+    return vgmstream;
+
+fail:
+    close_streamfile(temp_streamFile);
+    close_vgmstream(vgmstream);
     return NULL;
 }

src/vgmstream.c

@@ -118,6 +118,7 @@ VGMSTREAM * (*init_vgmstream_functions[])(STREAMFILE *streamFile) = {
     init_vgmstream_ps2_pcm,
     init_vgmstream_ps2_rkv,
     init_vgmstream_ps2_vas,
+    init_vgmstream_ps2_vas_container,
     init_vgmstream_ps2_tec,
     init_vgmstream_ps2_enth,
     init_vgmstream_sdt,