zwdsp added

git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@484 51a99a44-fe44-0410-b1ba-c3e57ba2b86b

src/Makefile

@@ -147,7 +147,8 @@ META_OBJS=meta/adx_header.o \
     meta/ps2_ass.o \
     meta/ngc_waa_wac_wad_wam.o \
     meta/ps2_seg.o \
-    meta/str_asr.o
+    meta/str_asr.o \
+    meta/zwdsp.o
 
 OBJECTS=vgmstream.o streamfile.o util.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS)
 

src/libvgmstream.vcproj

@@ -661,6 +661,10 @@
 					RelativePath=".\meta\xwb.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\zwdsp.c"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter

src/meta/Makefile.unix.am

@@ -116,4 +116,5 @@ libmeta_la_SOURCES += ps2_ass.c
 libmeta_la_SOURCES += ngc_waa_wac_wad_wam.c
 libmeta_la_SOURCES += ps2_seg.c
 libmeta_la_SOURCES += str_asr.c
+libmeta_la_SOURCES += zwdsp.c
 EXTRA_DIST = meta.h

src/meta/meta.h

@@ -281,4 +281,6 @@ VGMSTREAM * init_vgmstream_nds_strm_ffta2(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_str_asr(STREAMFILE * streamFile);
 
+VGMSTREAM * init_vgmstream_zwdsp(STREAMFILE * streamFile);
+
 #endif

src/meta/zwdsp.c

@@ -0,0 +1,86 @@
+#include "meta.h"
+#include "../util.h"
+
+/* ZWDSP (hcs' custom DSP files from Zack & Wiki) */
+VGMSTREAM * init_vgmstream_zwdsp(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+    char filename[260];
+    off_t start_offset;
+
+    int loop_flag;
+	int channel_count;
+
+    /* check extension, case insensitive */
+    streamFile->get_name(streamFile,filename,sizeof(filename));
+    if (strcasecmp("zwdsp",filename_extension(filename))) goto fail;
+
+    /* check header */
+    if (read_32bitBE(0x00,streamFile) != 0x00000000) /* 0x0 */
+        goto fail;
+
+	/* Retrieve the loop flag, some files have 0x0 and some 0x02 as "no loop" */
+
+	switch (read_32bitBE(0x10, streamFile)) {
+		case 0:
+		case 2:
+			loop_flag = 0;
+		break;
+	}
+
+	channel_count = read_32bitBE(0x1C,streamFile);
+    
+	/* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+	/* fill in the vital statistics */
+    start_offset = 0x90;
+	vgmstream->channels = channel_count;
+    vgmstream->sample_rate = read_32bitBE(0x08,streamFile);
+    vgmstream->coding_type = coding_NGC_DSP;
+    vgmstream->num_samples = read_32bitBE(0x18,streamFile)*14/8/channel_count;
+    if (loop_flag) {
+        vgmstream->loop_start_sample = read_32bitBE(0x10,streamFile)*14/8/channel_count;
+        vgmstream->loop_end_sample = read_32bitBE(0x14,streamFile)*14/8/channel_count;
+    }
+
+
+		vgmstream->layout_type = layout_none;
+    	vgmstream->meta_type = meta_ZWDSP;
+
+
+    if (vgmstream->coding_type == coding_NGC_DSP) {
+        int i;
+        for (i=0;i<16;i++) {
+            vgmstream->ch[0].adpcm_coef[i] = read_16bitBE(0x20+i*2,streamFile);
+        }
+        if (vgmstream->channels == 2) {
+            for (i=0;i<16;i++) {
+                vgmstream->ch[1].adpcm_coef[i] = read_16bitBE(0x60+i*2,streamFile);
+            }
+        }
+    }
+
+    /* open the file for reading */
+    {
+        int i;
+        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+
+                ((get_streamfile_size(streamFile)-start_offset)/2)*i;
+
+        }
+    }
+
+    return vgmstream;
+
+    /* clean up anything we may have opened */
+fail:
+    if (vgmstream) close_vgmstream(vgmstream);
+    return NULL;
+}

src/vgmstream.c

@@ -157,6 +157,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
 	init_vgmstream_ps2_seg,
 	init_vgmstream_nds_strm_ffta2,
 	init_vgmstream_str_asr,
+	init_vgmstream_zwdsp,
 };
 
 #define INIT_VGMSTREAM_FCNS (sizeof(init_vgmstream_fcns)/sizeof(init_vgmstream_fcns[0]))
@@ -1815,6 +1816,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
             break;
 		case meta_STR_ASR:
             snprintf(temp,TEMPSIZE,"Donkey Kong Jet Race KNON/WII Header");
+            break;
+		case meta_ZWDSP:
+            snprintf(temp,TEMPSIZE,"Zack and Wiki custom DSP Header");
             break;
         default:
             snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET");

src/vgmstream.h

@@ -266,6 +266,7 @@ typedef enum {
 	meta_PS2_SEG,			/* Eragon */
 	meta_NDS_STRM_FFTA2,	/* Final Fantasy Tactics A2 */
 	meta_STR_ASR,			/* Donkey Kong Jet Race */
+	meta_ZWDSP,				/* Zack and Wiki */
 
 	meta_XBOX_WAVM,			/* XBOX WAVM File */
 	meta_XBOX_RIFF,			/* XBOX RIFF/WAVE File */

winamp/in_vgmstream.c

@@ -201,6 +201,7 @@ char * extension_list[] = {
 	"wam\0WAM Audio File (*.WAM)\0",
 	"seg\0SEG Audio File (*.SEG)\0",
 	"asr\0ASR Audio File (*.ASR)\0",
+	"zwdsp\0ZWDSP Audio File (*.ZWDSP)\0",
 };
 
 void about(HWND hwndParent) {