Add RSD4RADP support from The Simpsons Hit & Run (GC)

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

src/libvgmstream.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="libvgmstream"
 	ProjectGUID="{54A6AD11-5369-4895-A06F-E255ABB99B11}"
 	RootNamespace="libvgmstream"

src/meta/meta.h

@@ -275,6 +275,8 @@ VGMSTREAM * init_vgmstream_rsd4pcmb(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_rsd4pcm(STREAMFILE * streamFile);
 
+VGMSTREAM * init_vgmstream_rsd4radp(STREAMFILE * streamFile);
+
 VGMSTREAM * init_vgmstream_rsd4vag(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_rsd6vag(STREAMFILE * streamFile);

src/meta/rsd.c

@@ -696,7 +696,127 @@ fail:
     return NULL;
 }
 
+/* RSD4RADP */
+VGMSTREAM * init_vgmstream_rsd4radp(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) != 0x52534434) /* RSD4 */
+		goto fail;
+	if (read_32bitBE(0x4,streamFile) != 0x52414450)	/* RADP */
+        goto fail;
+
+    loop_flag = 0;
+    channel_count = read_32bitLE(0x8,streamFile);
+    
+	/* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+	/* fill in the vital statistics */
+  start_offset = 0x800;
+	vgmstream->channels = channel_count;
+    vgmstream->sample_rate = read_32bitLE(0x10,streamFile);
+    vgmstream->coding_type = coding_RAD_IMA;
+    vgmstream->num_samples = (get_streamfile_size(streamFile)-start_offset)/0x14/channel_count*32;
+    if (loop_flag) {
+        vgmstream->loop_start_sample = loop_flag;
+        vgmstream->loop_end_sample = (get_streamfile_size(streamFile)-start_offset)*28/16/channel_count;
+    }
+    vgmstream->layout_type = layout_none;
+    vgmstream->interleave_block_size = 0x14*channel_count;
+    vgmstream->meta_type = meta_RSD4RADP;
+
+    /* 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].offset=vgmstream->ch[i].channel_start_offset=start_offset;
+        }
+    }
+    
+	return vgmstream;
+
+fail:
+    /* clean up anything we may have opened */
+    if (vgmstream) close_vgmstream(vgmstream);
+    return NULL;
+}
+
+/* RSD6RADP */
+VGMSTREAM * init_vgmstream_rsd6radp(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) != 0x52414450)	/* RADP */
+        goto fail;
+
+    loop_flag = 0;
+    channel_count = read_32bitLE(0x8,streamFile);
+    
+	/* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+	/* fill in the vital statistics */
+  start_offset = 0x800;
+	vgmstream->channels = channel_count;
+    vgmstream->sample_rate = read_32bitLE(0x10,streamFile);
+    vgmstream->coding_type = coding_RAD_IMA;
+    vgmstream->num_samples = (get_streamfile_size(streamFile)-start_offset)/0x14/channel_count*32;
+    if (loop_flag) {
+        vgmstream->loop_start_sample = loop_flag;
+        vgmstream->loop_end_sample = (get_streamfile_size(streamFile)-start_offset)*28/16/channel_count;
+    }
+    vgmstream->layout_type = layout_none;
+    vgmstream->interleave_block_size = 0x14*channel_count;
+    vgmstream->meta_type = meta_RSD6RADP;
+
+    /* 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].offset=vgmstream->ch[i].channel_start_offset=start_offset;
+        }
+    }
+    
+	return vgmstream;
+
+fail:
+    /* clean up anything we may have opened */
+    if (vgmstream) close_vgmstream(vgmstream);
+    return NULL;
+}
 
 /* RSD6VAG */
 VGMSTREAM * init_vgmstream_rsd6vag(STREAMFILE *streamFile) {
@@ -909,68 +1029,6 @@ fail:
     return NULL;
 }
 
-/* RSD6RADP */
-VGMSTREAM * init_vgmstream_rsd6radp(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) != 0x52414450)	/* RADP */
-        goto fail;
-
-    loop_flag = 0;
-    channel_count = read_32bitLE(0x8,streamFile);
-    
-	/* build the VGMSTREAM */
-    vgmstream = allocate_vgmstream(channel_count,loop_flag);
-    if (!vgmstream) goto fail;
-
-	/* fill in the vital statistics */
-  start_offset = 0x800;
-	vgmstream->channels = channel_count;
-    vgmstream->sample_rate = read_32bitLE(0x10,streamFile);
-    vgmstream->coding_type = coding_RAD_IMA;
-    vgmstream->num_samples = (get_streamfile_size(streamFile)-start_offset)/0x14/channel_count*32;
-    if (loop_flag) {
-        vgmstream->loop_start_sample = loop_flag;
-        vgmstream->loop_end_sample = (get_streamfile_size(streamFile)-start_offset)*28/16/channel_count;
-    }
-    vgmstream->layout_type = layout_none;
-    vgmstream->interleave_block_size = 0x14*channel_count;
-    vgmstream->meta_type = meta_RSD6RADP;
-
-    /* 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].offset=vgmstream->ch[i].channel_start_offset=start_offset;
-        }
-    }
-    
-	return vgmstream;
-
-fail:
-    /* clean up anything we may have opened */
-    if (vgmstream) close_vgmstream(vgmstream);
-    return NULL;
-}
-
-
 #if 0 
 /* RSD6XMA */
 VGMSTREAM * init_vgmstream_rsd6xma(STREAMFILE *streamFile) {

src/vgmstream.c

@@ -161,6 +161,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
 	init_vgmstream_rsd3pcmb,
     init_vgmstream_rsd4pcmb,
     init_vgmstream_rsd4pcm,
+	init_vgmstream_rsd4radp,
     init_vgmstream_rsd4vag,
     init_vgmstream_rsd6vag,
     init_vgmstream_rsd6wadp,
@@ -2122,6 +2123,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
             break;
         case meta_RSD4PCM:
             snprintf(temp,TEMPSIZE,"RSD4/PCM Header");
+            break;
+		case meta_RSD4RADP:
+            snprintf(temp,TEMPSIZE,"RSD4/RADP Header");
             break;
         case meta_RSD4VAG:
             snprintf(temp,TEMPSIZE,"RSD4/VAG Header");

src/vgmstream.h

@@ -312,6 +312,7 @@ typedef enum {
     meta_RSD3PCMB,			/* RSD3PCMB */
     meta_RSD4PCMB,			/* RSD4PCMB */
     meta_RSD4PCM,			/* RSD4PCM */
+	meta_RSD4RADP,			/* RSD4RADP */
     meta_RSD4VAG,			/* RSD4VAG */
     meta_RSD6VAG,			/* RSD6VAG */
     meta_RSD6WADP,			/* RSD6WADP */