Added RSD6OOGV support for Scarface: The World is Yours (PC)

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

src/Makefile

@@ -288,7 +288,8 @@ META_OBJS=meta/adx_header.o \
     meta/ps2_mss.o \
     meta/ps2_hsf.o \
     meta/ps3_ivag.o \
-    meta/ps2_2pfs.o
+    meta/ps2_2pfs.o \
+    meta/rsd6oogv.o
 
 OBJECTS=vgmstream.o streamfile.o util.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS)
 

src/meta/meta.h

@@ -612,4 +612,6 @@ VGMSTREAM * init_vgmstream_ps3_ivag(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_ps2_2pfs(STREAMFILE* streamFile);
 
+VGMSTREAM * init_vgmstream_rsd6oogv(STREAMFILE* streamFile);
+
 #endif

src/meta/rsd.c

@@ -960,6 +960,72 @@ fail:
     if (vgmstream) close_vgmstream(vgmstream);
     return NULL;
 }
+
+/* RSD6OGG */
+VGMSTREAM * init_vgmstream_rsd6oogv(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("rsd",filename_extension(filename))) goto fail;
+
+    /* check header */
+    if (read_32bitBE(0x0,streamFile) != 0x52534436) /* RSD6 */
+		goto fail;
+	if (read_32bitBE(0x4,streamFile) != 0x4F4F4756)	/* OOGV */
+        goto fail;
+
+  	#ifdef VGM_USE_VORBIS
+    {
+        vgm_vorbis_info_t inf;
+        VGMSTREAM * result = NULL;
+
+        memset(&inf, 0, sizeof(inf));
+        inf.layout_type = layout_ogg_vorbis;
+        inf.meta_type = meta_RSD6OOGV;
+
+        start_offset = 0x800;
+		result = init_vgmstream_ogg_vorbis_callbacks(streamFile, filename, NULL, start_offset, &inf);
+
+        if (result != NULL) {
+            return result;
+        }
+	   }
+#endif
+
+	/* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+	/* fill in the vital statistics */
+	vgmstream->channels = read_32bitLE(0x8,streamFile);
+    vgmstream->sample_rate = read_32bitLE(0x10,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;
+
+        }
+    }
+    
+	return vgmstream;
+
+fail:
+    /* clean up anything we may have opened */
+    if (vgmstream) close_vgmstream(vgmstream);
+    return NULL;
+}
+
 /* RSD6XADP */
 VGMSTREAM * init_vgmstream_rsd6xadp(STREAMFILE *streamFile) {
     VGMSTREAM * vgmstream = NULL;

src/vgmstream.c

@@ -319,6 +319,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
 	init_vgmstream_ps3_ivag,
 	init_vgmstream_ps2_2pfs,
     init_vgmstream_xnbm,
+	init_vgmstream_rsd6oogv,
 };
 
 #define INIT_VGMSTREAM_FCNS (sizeof(init_vgmstream_fcns)/sizeof(init_vgmstream_fcns[0]))
@@ -2936,6 +2937,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
             break;
 		case meta_PS2_2PFS:
             snprintf(temp,TEMPSIZE,"PS2 '2PFS' Header");
+            break;
+		case meta_RSD6OOGV:
+            snprintf(temp,TEMPSIZE,"RSD6/OOGV Header");
             break;
 		default:
            snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET");

src/vgmstream.h

@@ -348,12 +348,13 @@ typedef enum {
     meta_RSD3PCMB,			/* RSD3PCMB */
     meta_RSD4PCMB,			/* RSD4PCMB */
     meta_RSD4PCM,			  /* RSD4PCM */
-	  meta_RSD4RADP,			/* RSD4RADP */
+	meta_RSD4RADP,			/* RSD4RADP */
     meta_RSD4VAG,			  /* RSD4VAG */
     meta_RSD6VAG,			  /* RSD6VAG */
     meta_RSD6WADP,			/* RSD6WADP */
     meta_RSD6XADP,			/* RSD6XADP */
     meta_RSD6RADP,			/* RSD6RADP */
+	meta_RSD6OOGV,          /* RSD6OOGV */
 
     meta_PS2_ASS,			/* ASS */
     meta_PS2_SEG,			/* Eragon */