Merge pull request #432 from bxaimc/master

Add preliminary BWAV support [Super Mario Maker 2 (Switch)]

src/formats.c

@@ -101,6 +101,7 @@ static const char* extension_list[] = {
     "brstmspm",
     "btsnd",
     "bvg",
+    "bwav",
 
     "caf",
     "capdsp",
@@ -1189,6 +1190,7 @@ static const meta_info meta_info_list[] = {
         {meta_MSF_KONAMI,           "Konami MSF header"},
         {meta_XWMA_KONAMI,          "Konami XWMA header"},
         {meta_9TAV,                 "Konami 9TAV header"},
+        {meta_BWAV,                 "Nintendo BWAV header"},
 
 };
 

src/libvgmstream.vcxproj

@@ -154,6 +154,7 @@
     <ClCompile Include="meta\bcstm.c" />
     <ClCompile Include="meta\bfstm.c" />
     <ClCompile Include="meta\bfwav.c" />
+    <ClCompile Include="meta\bwav.c" />
     <ClCompile Include="meta\excitebots.c" />
     <ClCompile Include="meta\ezw.c" />
     <ClCompile Include="meta\ffmpeg.c" />

src/libvgmstream.vcxproj.filters

@@ -1585,5 +1585,8 @@
     <ClCompile Include="meta\ps2_va3.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\bwav.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

src/meta/bwav.c

@@ -0,0 +1,49 @@
+#include "meta.h"
+#include "../coding/coding.h"
+
+/* BWAV - NintendoWare(?) [Super Mario Maker 2 (Switch)] */
+VGMSTREAM * init_vgmstream_bwav(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+    off_t start_offset;
+    int channel_count, loop_flag;
+    size_t interleave = 0;
+    int32_t coef_start_offset, coef_spacing;
+
+    /* checks */
+    if (!check_extensions(streamFile, "bwav"))
+        goto fail;
+
+    /* BWAV header */
+    if (read_32bitBE(0x00, streamFile) != 0x42574156) /* "BWAV" */
+        goto fail;
+
+    channel_count = read_16bitLE(0x0E, streamFile);
+    start_offset = read_32bitLE(0x40, streamFile);
+    loop_flag = read_32bitLE(0x4C, streamFile);
+
+    /* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count, loop_flag);
+    if (!vgmstream) goto fail;
+
+    vgmstream->sample_rate = read_32bitLE(0x14, streamFile);
+    vgmstream->num_samples = read_32bitLE(0x18, streamFile);
+    vgmstream->loop_start_sample = read_32bitLE(0x50, streamFile);
+    vgmstream->loop_end_sample = read_32bitLE(0x4C, streamFile);
+    vgmstream->meta_type = meta_BWAV;
+    vgmstream->layout_type = (channel_count == 1) ? layout_none : layout_interleave;
+    vgmstream->interleave_block_size = read_32bitLE(0x8C, streamFile) - start_offset;
+    vgmstream->coding_type = coding_NGC_DSP;
+    
+    coef_start_offset = 0x20;
+    coef_spacing = 0x4C;
+    dsp_read_coefs_le(vgmstream, streamFile, coef_start_offset, coef_spacing);
+
+
+    if (!vgmstream_open_stream(vgmstream,streamFile,start_offset))
+        goto fail;
+    return vgmstream;
+
+fail:
+    close_vgmstream(vgmstream);
+    return NULL;
+}

src/meta/meta.h

@@ -854,4 +854,6 @@ VGMSTREAM * init_vgmstream_9tav(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_fsb5_fev_bank(STREAMFILE * streamFile);
 
+VGMSTREAM * init_vgmstream_bwav(STREAMFILE * streamFile);
+
 #endif /*_META_H*/

src/vgmstream.c

@@ -480,6 +480,7 @@ VGMSTREAM * (*init_vgmstream_functions[])(STREAMFILE *streamFile) = {
     init_vgmstream_xwma_konami,
     init_vgmstream_9tav,
     init_vgmstream_fsb5_fev_bank,
+    init_vgmstream_bwav,
 
     /* lowest priority metas (should go after all metas, and TXTH should go before raw formats) */
     init_vgmstream_txth,            /* proper parsers should supersede TXTH, once added */

src/vgmstream.h

@@ -730,6 +730,7 @@ typedef enum {
     meta_MSF_KONAMI,
     meta_XWMA_KONAMI,
     meta_9TAV,
+    meta_BWAV,
 
 } meta_t;