.bh2pcm added

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

src/Makefile

@@ -123,7 +123,8 @@ META_OBJS=meta/adx_header.o \
     meta/xbox_stma.o \
     meta/de2.o \
     meta/dc_str.o \
-    meta/xbox_xmu.o
+    meta/xbox_xmu.o \
+    meta/ngc_bh2pcm.o
 		
 OBJECTS=vgmstream.o streamfile.o util.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS)
 

src/libvgmstream.vcproj

@@ -312,6 +312,10 @@
 					RelativePath=".\meta\ngc_adpdtk.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\ngc_bh2pcm.c"
+					>
+				</File>
 				<File
 					RelativePath=".\meta\ngc_caf.c"
 					>

src/meta/Makefile.unix.am

@@ -94,5 +94,6 @@ libmeta_la_SOURCES += xbox_ims.c
 libmeta_la_SOURCES += de2.c
 libmeta_la_SOURCES += dc_str.c
 libmeta_la_SOURCES += xbox_xmu.c
+libmeta_la_SOURCES += ngc_bh2pcm.c.c
 
 EXTRA_DIST = meta.h

src/meta/dc_str.c

@@ -18,7 +18,7 @@ VGMSTREAM * init_vgmstream_dc_str(STREAMFILE *streamFile) {
     if (read_32bitBE(0xD5,streamFile) != 0x53656761) /* "Sega" */
         goto fail;
 
-    loop_flag = 0; /* (read_32bitBE(0x14,streamFile)!=0xFFFFFFFF); */
+    loop_flag = (read_32bitBE(0x00,streamFile)!=0x00000000);
     channel_count = read_32bitLE(0x18,streamFile);
     
 	/* build the VGMSTREAM */
@@ -30,16 +30,15 @@ VGMSTREAM * init_vgmstream_dc_str(STREAMFILE *streamFile) {
     start_offset = 0x800;
     vgmstream->sample_rate = read_32bitLE(0x04,streamFile);
     vgmstream->coding_type = coding_AICA;
-
+	vgmstream->interleave_block_size = read_32bitLE(0x0C,streamFile);
-    vgmstream->num_samples = read_32bitLE(0x14,streamFile);
+    vgmstream->num_samples = (read_32bitLE(0x1C,streamFile))*2*vgmstream->interleave_block_size;
     
 	if (loop_flag) {
-        vgmstream->loop_start_sample = 0; /* read_32bitBE(0x14,streamFile); */
+        vgmstream->loop_start_sample = 0; /* (read_32bitLE(0x18,streamFile))*2*vgmstream->interleave_block_size; */
-        vgmstream->loop_end_sample = read_32bitLE(0x14,streamFile);
+        vgmstream->loop_end_sample = (read_32bitLE(0x1C,streamFile))*2*vgmstream->interleave_block_size;
     }
 
     vgmstream->layout_type = layout_interleave;
-    vgmstream->interleave_block_size = read_32bitLE(0x0C,streamFile);
     vgmstream->meta_type = meta_DC_STR;
     
 

src/meta/meta.h

@@ -207,4 +207,6 @@ VGMSTREAM * init_vgmstream_xbox_xmu(STREAMFILE *streamFile);
 
 VGMSTREAM * init_vgmstream_xbox_xvas(STREAMFILE *streamFile);
 
+VGMSTREAM * init_vgmstream_ngc_bh2pcm(STREAMFILE *streamFile);
+
 #endif

src/meta/ngc_bh2pcm.c

@@ -0,0 +1,93 @@
+#include "meta.h"
+#include "../util.h"
+
+/* BH2PCM (from Bio Hazard 2) */
+VGMSTREAM * init_vgmstream_ngc_bh2pcm(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+    char filename[260];
+    off_t start_offset;
+		
+	int channel_count=2;
+	int format_detect;
+    int loop_flag;
+
+
+    /* check extension, case insensitive */
+    streamFile->get_name(streamFile,filename,sizeof(filename));
+    if (strcasecmp("bh2pcm",filename_extension(filename))) goto fail;
+
+#if 0
+    /* check header */
+    if (read_32bitBE(0x00,streamFile) != 0x53565300) /* "SVS\0" */
+        goto fail;
+#endif
+
+    loop_flag = 0; /* (read_32bitLE(0x08,streamFile)!=0); */
+	/* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+	/* fill in the vital statistics */
+    
+
+	format_detect=read_32bitLE(0x00,streamFile);
+	switch (format_detect) {
+	case 1:
+	start_offset = 0x20;
+	channel_count = 2;
+	vgmstream->channels = channel_count;
+    vgmstream->sample_rate = 32000;
+    vgmstream->num_samples = read_32bitLE(0x04,streamFile)/2;
+    vgmstream->layout_type = layout_interleave;
+    vgmstream->interleave_block_size = read_32bitLE(0x04,streamFile);
+    if (loop_flag) {
+        vgmstream->loop_start_sample = 0; /* read_32bitLE(0x10,streamFile)/2; */
+        vgmstream->loop_end_sample = read_32bitLE(0x14,streamFile);
+    }
+
+break;
+	case 0:
+	start_offset = 0x20;
+	channel_count = 1;
+	vgmstream->channels = channel_count;
+    vgmstream->sample_rate = 32000;
+    vgmstream->num_samples = read_32bitLE(0x0C,streamFile);
+    vgmstream->layout_type = layout_none;
+    if (loop_flag) {
+        vgmstream->loop_start_sample = read_32bitLE(0x08,streamFile);
+        vgmstream->loop_end_sample = read_32bitLE(0x0C,streamFile);
+    }
+break;
+	default:
+		goto fail;
+	}
+
+	vgmstream->coding_type = coding_PCM16BE;
+	vgmstream->meta_type = meta_NGC_BH2PCM;
+
+
+
+
+    /* 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/vgmstream.c

@@ -112,12 +112,14 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
 	init_vgmstream_ngc_swd,
 	init_vgmstream_ngc_vjdsp,
 	init_vgmstream_xbox_wvs,
+	init_vgmstream_dc_str,
 	init_vgmstream_xbox_stma,
 	init_vgmstream_xbox_matx,
     init_vgmstream_de2,
     init_vgmstream_dc_str,
 	init_vgmstream_xbox_xmu,
 	init_vgmstream_xbox_xvas,
+	init_vgmstream_ngc_bh2pcm,
 };
 
 #define INIT_VGMSTREAM_FCNS (sizeof(init_vgmstream_fcns)/sizeof(init_vgmstream_fcns[0]))

src/vgmstream.h

@@ -227,6 +227,7 @@ typedef enum {
 	meta_NGC_SWD,			/* Conflict - Desert Storm 1 & 2 */
 	meta_NGC_VJDSP,			/* Viewtiful Joe */
 	meta_DC_STR,			/* Evil Dead */
+	meta_NGC_BH2PCM,			/* Bio hazard 2 */
 
 	meta_XBOX_WAVM,			/* XBOX WAVM File */
 	meta_XBOX_RIFF,			/* XBOX RIFF/WAVE File */