Move wsi to its own file, since it's not very standard

src/layout/blocked_wsi.c

@@ -6,6 +6,7 @@ void block_update_wsi(off_t block_offset, VGMSTREAM * vgmstream) {
     STREAMFILE* streamFile = vgmstream->ch[0].streamfile;
     int i;
     off_t channel_block_size;
+    //int is_first_offset =
 
 
     /* assume that all channels have the same size for this block */
@@ -18,4 +19,14 @@ void block_update_wsi(off_t block_offset, VGMSTREAM * vgmstream) {
     for (i = 0; i < vgmstream->channels; i++) {
         vgmstream->ch[i].offset = block_offset + channel_block_size*i + 0x10;
     }
+
+    /* first block has DSP header, remove */
+    if (block_offset == vgmstream->ch[0].channel_start_offset) {
+        int i;
+
+        vgmstream->current_block_size -= 0x60;
+        for (i = 0; i < vgmstream->channels; i++) {
+            vgmstream->ch[i].offset += 0x60;
+        }
+    }
 }

src/libvgmstream.vcproj

@@ -1442,10 +1442,14 @@
 					RelativePath=".\meta\wpd.c"
 					>
 				</File>
-				<File
+                <File
-					RelativePath=".\meta\ws_aud.c"
+                    RelativePath=".\meta\ws_aud.c"
-					>
+                    >
-				</File>
+                </File>
+                <File
+                    RelativePath=".\meta\wsi.c"
+                    >
+                </File>
                 <File
                     RelativePath=".\meta\wv6.c"
                     >

src/libvgmstream.vcxproj

@@ -437,6 +437,7 @@
     <ClCompile Include="meta\wii_sng.c" />
     <ClCompile Include="meta\wii_sts.c" />
     <ClCompile Include="meta\ws_aud.c" />
+    <ClCompile Include="meta\wsi.c" />
     <ClCompile Include="meta\wv6.c" />
     <ClCompile Include="meta\wvs.c" />
     <ClCompile Include="meta\wwise.c" />

src/libvgmstream.vcxproj.filters

@@ -883,6 +883,9 @@
     <ClCompile Include="meta\ws_aud.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\wsi.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="meta\wv6.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>

src/meta/ngc_dsp_std.c

@@ -93,9 +93,9 @@ static int dsp_load_header_endian(struct dsp_header* ch_header, int channels, ST
 fail:
     return 0;
 }
-static int dsp_load_header(struct dsp_header* ch_header, int channels, STREAMFILE *streamFile, off_t offset, size_t spacing) {
+//static int dsp_load_header(struct dsp_header* ch_header, int channels, STREAMFILE *streamFile, off_t offset, size_t spacing) {
-    return dsp_load_header_endian(ch_header, channels, streamFile, offset, spacing, 1);
+//    return dsp_load_header_endian(ch_header, channels, streamFile, offset, spacing, 1);
-}
+//}
 //static int dsp_load_header_le(struct dsp_header* ch_header, int channels, STREAMFILE *streamFile, off_t offset, size_t spacing) {
 //    return dsp_load_header_endian(ch_header, channels, streamFile, offset, spacing, 0);
 //}
@@ -715,107 +715,6 @@ fail:
     return NULL;
 }
 
-#define WSI_MAX_CHANNELS 2
-/* .wsi - blocked dsp [Alone in the Dark (Wii)] */
-VGMSTREAM * init_vgmstream_wsi(STREAMFILE *streamFile) {
-    VGMSTREAM * vgmstream = NULL;
-    off_t start_offset, header_offset;
-    size_t header_spacing;
-    struct dsp_header ch_header[WSI_MAX_CHANNELS];
-    int channel_count;
-
-    /* checks */
-    if (!check_extensions(streamFile, "wsi"))
-        goto fail;
-
-    /* I don't know if this is actually the channel count, or a block type
-     * for the first block. Won't know until I see a mono .wsi */
-    channel_count = read_32bitBE(0x04,streamFile);
-    if (channel_count != 2) goto fail;
-
-    /* check for consistent block headers */
-    {
-        off_t block_offset;
-        off_t block_size_has_been;
-        int i;
-       
-        block_offset = read_32bitBE(0x00,streamFile);
-        if (block_offset < 0x08) goto fail;
-
-        block_size_has_been = block_offset;
-
-        /* check 4 blocks, to get an idea */
-        for (i = 0; i < 4*channel_count; i++) {
-            off_t block_size = read_32bitBE(block_offset,streamFile);
-
-            if (block_size < 0x10)
-                goto fail; /* expect at least the block header */
-            if (i%channel_count+1 != read_32bitBE(block_offset+0x08,streamFile))
-                goto fail; /* expect the channel numbers to alternate */
-
-            if (i%channel_count==0)
-                block_size_has_been = block_size;
-            else if (block_size != block_size_has_been)
-                goto fail; /* expect every block in a set of channels to have the same size */
-
-            block_offset += block_size;
-        }
-    }
-
-    start_offset = read_32bitBE(0x00, streamFile);
-    header_offset = start_offset + 0x10;
-    header_spacing = read_32bitBE(start_offset,streamFile);
-
-    /* read dsp */
-    if (!dsp_load_header(ch_header, channel_count, streamFile,header_offset,header_spacing)) goto fail;
-    if (!check_dsp_format(ch_header, channel_count)) goto fail;
-    if (!check_dsp_samples(ch_header, channel_count)) goto fail;
-    //if (!check_dsp_initial_ps(ch_header, channel_count, streamFile,start_offset,interleave)) goto fail;
-    //if (!check_dsp_loop_ps(ch_header, channel_count, streamFile,start_offset,interleave)) goto fail;
-
-
-    /* build the VGMSTREAM */
-    vgmstream = allocate_vgmstream(channel_count,ch_header[0].loop_flag);
-    if (!vgmstream) goto fail;
-
-    vgmstream->sample_rate = ch_header[0].sample_rate;
-
-    vgmstream->num_samples = ch_header[0].sample_count / 14 * 14; /* remove incomplete last frame */
-    vgmstream->loop_start_sample = dsp_nibbles_to_samples(ch_header[0].loop_start_offset);
-    vgmstream->loop_end_sample =  dsp_nibbles_to_samples(ch_header[0].loop_end_offset)+1;
-    if (vgmstream->loop_end_sample > vgmstream->num_samples) /* don't know why, but it does happen*/
-        vgmstream->loop_end_sample = vgmstream->num_samples;
-
-    vgmstream->meta_type = meta_DSP_WSI;
-    vgmstream->coding_type = coding_NGC_DSP;
-    vgmstream->layout_type = layout_blocked_wsi;
-
-    setup_vgmstream_dsp(vgmstream, ch_header);
-
-
-    if (!vgmstream_open_stream(vgmstream,streamFile,start_offset))
-        goto fail;
-
-    block_update_wsi(start_offset,vgmstream);
-
-    /* first block has DSP header */
-    {
-        int i;
-
-        vgmstream->current_block_size -= 0x60;
-        for (i = 0; i < vgmstream->channels; i++) {
-            vgmstream->ch[i].offset += 0x60;
-        }
-    }
-
-    return vgmstream;
-
-fail:
-    close_vgmstream(vgmstream);
-    return NULL;
-}
-
-
 /* SWD - PSF chunks + interleaved dsps [Conflict: Desert Storm 1 & 2] */
 VGMSTREAM * init_vgmstream_ngc_swd(STREAMFILE *streamFile) {
     dsp_meta dspm = {0};

src/meta/wsi.c

@@ -0,0 +1,83 @@
+#include "meta.h"
+#include "../coding/coding.h"
+
+
+/* .wsi - blocked dsp [Alone in the Dark (Wii)] */
+VGMSTREAM * init_vgmstream_wsi(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+    off_t start_offset, header_offset;
+    size_t header_spacing;
+    int loop_flag, channel_count;
+
+
+    /* checks */
+    if (!check_extensions(streamFile, "wsi"))
+        goto fail;
+
+    channel_count = read_32bitBE(0x04,streamFile);
+    if (channel_count != 2) goto fail; /* assumed */
+
+    /* check for consistent block headers */
+    {
+        off_t block_offset;
+        off_t block_size_has_been;
+        int i;
+
+        block_offset = read_32bitBE(0x00,streamFile);
+        if (block_offset < 0x08) goto fail;
+
+        block_size_has_been = block_offset;
+
+        /* check 4 blocks, to get an idea */
+        for (i = 0; i < 4*channel_count; i++) {
+            off_t block_size = read_32bitBE(block_offset,streamFile);
+
+            if (block_size < 0x10)
+                goto fail; /* expect at least the block header */
+            if (i%channel_count+1 != read_32bitBE(block_offset+0x08,streamFile))
+                goto fail; /* expect the channel numbers to alternate */
+
+            if (i%channel_count==0)
+                block_size_has_been = block_size;
+            else if (block_size != block_size_has_been)
+                goto fail; /* expect every block in a set of channels to have the same size */
+
+            block_offset += block_size;
+        }
+    }
+
+    start_offset = read_32bitBE(0x00, streamFile);
+    header_offset = start_offset + 0x10;
+    header_spacing = read_32bitBE(start_offset,streamFile);
+
+    /* contains standard DSP header, but since it's blocked validations (start/loop ps, etc)
+     * will fail, so no point to handle as standard DSP */
+    loop_flag = read_16bitBE(header_offset+0x0c,streamFile);
+
+
+    /* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+    vgmstream->meta_type = meta_DSP_WSI;
+    vgmstream->sample_rate = read_32bitBE(header_offset+0x08,streamFile);
+
+    vgmstream->num_samples = read_32bitBE(header_offset+0x00,streamFile) / 14 * 14; /* remove incomplete last frame */
+    vgmstream->loop_start_sample = dsp_nibbles_to_samples(read_32bitBE(header_offset+0x10,streamFile));
+    vgmstream->loop_end_sample =  dsp_nibbles_to_samples(read_32bitBE(header_offset+0x14,streamFile))+1;
+    if (vgmstream->loop_end_sample > vgmstream->num_samples) /* ? */
+        vgmstream->loop_end_sample = vgmstream->num_samples;
+
+    vgmstream->coding_type = coding_NGC_DSP;
+    vgmstream->layout_type = layout_blocked_wsi;
+    dsp_read_coefs_be(vgmstream, streamFile, header_offset+0x1c, header_spacing);
+    dsp_read_hist_be(vgmstream, streamFile, header_offset+0x40, header_spacing);
+
+    if (!vgmstream_open_stream(vgmstream,streamFile,start_offset))
+        goto fail;
+    return vgmstream;
+
+fail:
+    close_vgmstream(vgmstream);
+    return NULL;
+}