Merge pull request #143 from bxaimc/master

Add EZW for EZ2DJ (Arcade)

src/formats.c

@@ -105,6 +105,7 @@ static const char* extension_list[] = {
     "emff",
     "enth",
     "exa",
+	"ezw",
 
     "fag",
     "ffw",
@@ -906,6 +907,7 @@ static const meta_info meta_info_list[] = {
         {meta_PC_AST,               "Capcom AST (PC) header"},
         {meta_UBI_SB,               "Ubisoft SBx header"},
         {meta_NAAC,                 "Namco NAAC header"},
+        {meta_EZW,                  "EZ2DJ EZWAVE header"},
 
 #ifdef VGM_USE_VORBIS
         {meta_OGG_VORBIS,           "Ogg Vorbis"},

src/libvgmstream.vcproj

@@ -372,6 +372,10 @@
 					RelativePath=".\meta\excitebots.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\ezw.c"
+					>
+				</File>
 				<File
 					RelativePath=".\meta\ffmpeg.c"
 					>

src/libvgmstream.vcxproj

@@ -150,6 +150,7 @@
     <ClCompile Include="meta\bfstm.c" />
     <ClCompile Include="meta\bfwav.c" />
     <ClCompile Include="meta\excitebots.c" />
+    <ClCompile Include="meta\ezw.c" />
     <ClCompile Include="meta\ffmpeg.c" />
     <ClCompile Include="meta\g1l.c" />
     <ClCompile Include="meta\ios_psnd.c" />

src/libvgmstream.vcxproj.filters

@@ -1201,5 +1201,8 @@
     <ClCompile Include="meta\pc_ast.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\ezw.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

src/meta/ezw.c

@@ -0,0 +1,41 @@
+#include "meta.h"
+#include "../coding/coding.h"
+
+/* EZWAVE - EZ2DJ (Arcade) */
+VGMSTREAM * init_vgmstream_ezw(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+	off_t start_offset, data_size;
+    int loop_flag, channel_count;
+
+    /* check extension, case insensitive */
+    if ( !check_extensions(streamFile,"ezw"))
+        goto fail;
+
+
+    loop_flag = 0;
+	channel_count = read_8bit(0x0, streamFile);
+	data_size = read_32bitLE(0xE,streamFile);
+
+
+    /* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+
+	start_offset = 0x12;
+    vgmstream->sample_rate = read_32bitLE(0x2,streamFile);
+	vgmstream->coding_type = coding_PCM16LE;
+    vgmstream->num_samples = data_size/(channel_count*2);
+	vgmstream->layout_type = layout_interleave;
+	vgmstream->interleave_block_size = 0x2;
+    vgmstream->meta_type = meta_EZW;
+
+    /* open the file for reading */
+    if ( !vgmstream_open_stream(vgmstream, streamFile, start_offset) )
+        goto fail;
+    return vgmstream;
+
+fail:
+    close_vgmstream(vgmstream);
+    return NULL;
+}

src/meta/meta.h

@@ -691,4 +691,6 @@ VGMSTREAM * init_vgmstream_naac(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_ubi_sb(STREAMFILE * streamFile);
 
+VGMSTREAM * init_vgmstream_ezw(STREAMFILE * streamFile);
+
 #endif /*_META_H*/

src/vgmstream.c

@@ -365,6 +365,7 @@ VGMSTREAM * (*init_vgmstream_functions[])(STREAMFILE *streamFile) = {
     init_vgmstream_pc_ast,
     init_vgmstream_naac,
     init_vgmstream_ubi_sb,
+	init_vgmstream_ezw,
 
     init_vgmstream_txth,  /* should go at the end (lower priority) */
 #ifdef VGM_USE_FFMPEG

src/vgmstream.h

@@ -628,6 +628,7 @@ typedef enum {
     meta_PC_AST,            /* Dead Rising (PC) */
     meta_NAAC,              /* Namco AAC (3DS) */
     meta_UBI_SB,            /* Ubisoft banks */
+	meta_EZW,               /* EZ2DJ (Arcade) EZWAV */
 
 #ifdef VGM_USE_VORBIS
     meta_OGG_VORBIS,        /* Ogg Vorbis */