msvp (ps2) added

ssm (ngc) added

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

src/Makefile

@@ -153,7 +153,9 @@ META_OBJS=meta/adx_header.o \
     meta/ish_isd.o \
     meta/spt_spd.o \
     meta/ydsp.o \
-	meta/gsp_gsb.o
+    meta/gsp_gsb.o \
+    meta/ngc_ssm.o \
+    meta/msvp.o
 
 OBJECTS=vgmstream.o streamfile.o util.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS)
 

src/libvgmstream.vcproj

@@ -307,6 +307,10 @@
 					RelativePath=".\meta\kraw.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\msvp.c"
+					>
+				</File>
 				<File
 					RelativePath=".\meta\mus_acm.c"
 					>
@@ -369,6 +373,10 @@
 					RelativePath=".\meta\ngc_pdt.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\ngc_ssm.c"
+					>
+				</File>
 				<File
 					RelativePath=".\meta\ngc_tydsp.c"
 					>

src/meta/Makefile.unix.am

@@ -122,4 +122,6 @@ libmeta_la_SOURCES += ish_isd.c
 libmeta_la_SOURCES += spt_spd.c
 libmeta_la_SOURCES += ydsp.c
 libmeta_la_SOURCES += gsp_gsb.c
+libmeta_la_SOURCES += msvp.c
+libmeta_la_SOURCES += ngc_ssm.c
 EXTRA_DIST = meta.h

src/meta/meta.h

@@ -295,4 +295,8 @@ VGMSTREAM * init_vgmstream_ydsp(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_gsp_gsb(STREAMFILE * streamFile);
 
+VGMSTREAM * init_vgmstream_msvp(STREAMFILE * streamFile);
+
+VGMSTREAM * init_vgmstream_ngc_ssm(STREAMFILE * streamFile);
+
 #endif

src/meta/msvp.c

@@ -0,0 +1,73 @@
+#include "meta.h"
+#include "../util.h"
+
+/* MSV (from Pocap Hits) */
+VGMSTREAM * init_vgmstream_msvp(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+    char filename[260];
+    off_t start_offset;
+
+    int loop_flag = 0;
+	int channel_count;
+
+    /* check extension, case insensitive */
+    streamFile->get_name(streamFile,filename,sizeof(filename));
+    if (strcasecmp("msvp",filename_extension(filename))) goto fail;
+
+    /* check header */
+    if (read_32bitBE(0x00,streamFile) != 0x4D535670) /* "MSVp" */
+        goto fail;
+
+    loop_flag = 0;
+    channel_count = 1;
+    
+	/* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+	/* fill in the vital statistics */
+    start_offset = 0x30;
+	vgmstream->channels = channel_count;
+    vgmstream->sample_rate = read_32bitBE(0x10,streamFile);
+    vgmstream->coding_type = coding_PSX;
+    vgmstream->num_samples = (get_streamfile_size(streamFile)-start_offset)*28/16/channel_count;
+    if (loop_flag) {
+        vgmstream->loop_start_sample = loop_flag;
+        vgmstream->loop_end_sample = (read_32bitBE(0x0C,streamFile))*28/16/channel_count;
+    }
+
+
+/* Just to be sure that there comes a 2 channel file */
+	if (channel_count == 1) {
+		vgmstream->layout_type = layout_none;
+	} else if (channel_count == 2) {
+		vgmstream->layout_type = layout_interleave;
+		vgmstream->interleave_block_size = 0x10; /* Unknown for now */
+	}
+
+
+    vgmstream->meta_type = meta_MSVP;
+
+    /* 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+
+                vgmstream->interleave_block_size*i;
+
+        }
+    }
+
+    return vgmstream;
+
+    /* clean up anything we may have opened */
+fail:
+    if (vgmstream) close_vgmstream(vgmstream);
+    return NULL;
+}

src/meta/ngc_ssm.c

@@ -0,0 +1,97 @@
+#include "meta.h"
+#include "../util.h"
+
+/* SSM (Golden Gashbell Full Power GC) */
+VGMSTREAM * init_vgmstream_ngc_ssm(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+    char filename[260];
+    off_t start_offset;
+
+    int loop_flag;
+	int channel_count;
+	int coef1_start;
+	int coef2_start;
+	int second_channel_start;
+
+    streamFile->get_name(streamFile,filename,sizeof(filename));
+    	if (strcasecmp("ssm",filename_extension(filename)))
+    goto fail;
+
+    /* check header */
+#if 0
+    if (read_32bitBE(0x00,streamFile) != 0x0)
+	goto fail;
+#endif
+
+    loop_flag = (uint32_t)read_16bitBE(0x18,streamFile);
+    channel_count = read_32bitBE(0x10,streamFile);
+    
+	/* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+	/* fill in the vital statistics */
+    start_offset = read_32bitBE(0x0,streamFile);
+	vgmstream->channels = channel_count;
+    vgmstream->sample_rate = read_32bitBE(0x14,streamFile);
+    vgmstream->coding_type = coding_NGC_DSP;
+    vgmstream->num_samples = read_32bitBE(0x04,streamFile)*14/8/channel_count;
+    if (loop_flag) {
+        vgmstream->loop_start_sample = read_32bitBE(0x24,streamFile)*14/8/channel_count;
+        vgmstream->loop_end_sample = read_32bitBE(0x20,streamFile)*14/8/channel_count;
+    }
+		vgmstream->layout_type = layout_none;
+		vgmstream->meta_type = meta_NGC_SSM;
+
+		/* Retrieveing the coef tables and the start of the second channel*/
+		coef1_start = 0x28;
+		coef2_start = 0x68;
+		second_channel_start = (read_32bitBE(0x04,streamFile)/2)+start_offset;
+
+		{
+        int i;
+        for (i=0;i<16;i++)
+            vgmstream->ch[0].adpcm_coef[i] = read_16bitBE(coef1_start+i*2,streamFile);
+		if (channel_count == 2) {
+		for (i=0;i<16;i++)
+            vgmstream->ch[1].adpcm_coef[i] = read_16bitBE(coef2_start+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;
+
+	/* The first channel */
+    vgmstream->ch[0].channel_start_offset=
+        vgmstream->ch[0].offset=start_offset;
+
+	/* The second channel */
+    if (channel_count == 2) {
+        vgmstream->ch[1].streamfile = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
+
+        if (!vgmstream->ch[1].streamfile) goto fail;
+
+        vgmstream->ch[1].channel_start_offset=
+            vgmstream->ch[1].offset=second_channel_start;
+		}
+	}
+    
+}
+
+	return vgmstream;
+
+    /* clean up anything we may have opened */
+fail:
+    if (vgmstream) close_vgmstream(vgmstream);
+    return NULL;
+}
+
+
+

src/vgmstream.c

@@ -164,6 +164,8 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
 	init_vgmstream_ish_isd,
 	init_vgmstream_gsp_gsb,
 	init_vgmstream_ydsp,
+	init_vgmstream_msvp,
+	init_vgmstream_ngc_ssm,
 };
 
 #define INIT_VGMSTREAM_FCNS (sizeof(init_vgmstream_fcns)/sizeof(init_vgmstream_fcns[0]))
@@ -1852,6 +1854,12 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
             break;
 		case meta_YDSP:
             snprintf(temp,TEMPSIZE,"YDSP Header");
+            break;
+		case meta_MSVP:
+            snprintf(temp,TEMPSIZE,"MSVP Header");
+            break;
+		case meta_NGC_SSM:
+            snprintf(temp,TEMPSIZE,"SSM DSP Header");
             break;
         default:
             snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET");

src/vgmstream.h

@@ -252,6 +252,8 @@ typedef enum {
 	meta_IDSP2,				/* Chronicles of Narnia */
 	meta_WAA_WAC_WAD_WAM,	/* Beyond Good & Evil */
 	meta_GCA,				/* Metal Slug Anthology */
+	meta_MSVP,				/* Popcap Hits */
+	meta_NGC_SSM,			/* Golden Gashbell Full Power */
 
 	meta_NGC_YMF,			/* WWE WrestleMania X8 */
     meta_SADL,              /* .sad */

winamp/in_vgmstream.c

@@ -207,6 +207,8 @@ char * extension_list[] = {
 	"isd\0ISD Audio File (*.ISD)\0",
 	"ydsp\0YDSP Audio File (*.YDSP)\0",
 	"gsb\0GSB Audio File (*.GSB)\0",
+	"msvp\0MSVP Audio File (*.MSVP)\0",
+	"ssm\0SSM Audio File (*.SSM)\0",
 };
 
 void about(HWND hwndParent) {