Add some new metadata formats (rws,hgC1,xss,sl3,aus) from Ronny Elfert (manakoAT), add him to the license, change license file to COPYING

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

COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Adam Gashlin & Fastelbja
+Copyright (c) 2008 Adam Gashlin, Fastelbja, Ronny Elfert
 
 Portions Copyright (c) 1998, Justin Frankel/Nullsoft Inc.
 Portions Copyright (C) 2006 Nullsoft, Inc.

Makefile

@@ -11,7 +11,7 @@ sourceball:
 	rm -rf vgmstream-`./version.sh`
 
 mingwbin: mingw_test mingw_winamp
-	zip -j "vgmstream-`./version.sh`-test.zip" readme.txt LICENSE test/test.exe winamp/in_vgmstream.dll 
+	zip -j "vgmstream-`./version.sh`-test.zip" readme.txt COPYING test/test.exe winamp/in_vgmstream.dll 
 
 mingw_test:
 	$(MAKE) -C test -f Makefile.mingw test.exe

readme.txt

@@ -104,6 +104,11 @@ File types supported by this version of vgmstream:
 - .wav (8/16 bit PCM)
 - .pos (8/16 bit PCM)
 - .nwa (16 bit PCM)
+- .xss (16 bit PCM)
+- .sl3 (PS2 ADPCM)
+- .hgc1 (PS2 ADPCM)
+- .aus (PS2 ADPCM)
+- .rws (PS2 ADPCM)
 
 Enjoy!
 -hcs

src/Makefile

@@ -70,7 +70,12 @@ META_OBJS=meta/adx_header.o \
     meta/svs.o \
     meta/riff.o \
     meta/pos.o \
-    meta/nwa.o
+    meta/nwa.o \
+    meta/ps2_rws.o \
+    meta/ps2_hgc1.o \
+    meta/xss.o \
+    meta/ps2_sl3.o \
+    meta/ps2_aus.o
 
 OBJECTS=vgmstream.o streamfile.o util.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS)
 

src/libvgmstream.vcproj

@@ -378,6 +378,26 @@
 					RelativePath=".\meta\nwa.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\ps2_rws.c"
+					>
+				</File>
+				<File
+					RelativePath=".\meta\ps2_hgc1.c"
+					>
+				</File>
+				<File
+					RelativePath=".\meta\xss.c"
+					>
+				</File>
+				<File
+					RelativePath=".\meta\ps2_sl3.c"
+					>
+				</File>
+				<File
+					RelativePath=".\meta\ps2_aus.c"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter

src/meta/Makefile.unix.am

@@ -4,6 +4,6 @@ AM_CFLAGS = -Wall @CFLAGS@ -I$(top_builddir) -I$(top_srcdir)
 AM_MAKEFLAGS=-f Makefile.unix
 
 libmeta_la_LDFLAGS = 
-libmeta_la_SOURCES = Cstr.c adx_header.c afc_header.c agsc.c ast.c brstm.c ea_header.c gcsw.c halpst.c nds_strm.c ngc_adpdtk.c ngc_caf.c ngc_dsp_std.c ps2_ads.c ps2_exst.c ps2_ild.c ps2_int.c ps2_mib.c ps2_mic.c ps2_npsf.c ps2_pnb.c ps2_rxw.c ps2_str.c ps2_svag.c ps2_vag.c ps2_vpk.c psx_cdxa.c raw.c rs03.c rsf.c rwsd.c psx_gms.c xbox_xwav.c xbox_wavm.c genh.c ogg_vorbis_file.c ps2_bmdx.c aifc.c str_snds.c ws_aud.c ahx.c ivb.c svs.c riff.c pos.c nwa.c
+libmeta_la_SOURCES = Cstr.c adx_header.c afc_header.c agsc.c ast.c brstm.c ea_header.c gcsw.c halpst.c nds_strm.c ngc_adpdtk.c ngc_caf.c ngc_dsp_std.c ps2_ads.c ps2_exst.c ps2_ild.c ps2_int.c ps2_mib.c ps2_mic.c ps2_npsf.c ps2_pnb.c ps2_rxw.c ps2_str.c ps2_svag.c ps2_vag.c ps2_vpk.c psx_cdxa.c raw.c rs03.c rsf.c rwsd.c psx_gms.c xbox_xwav.c xbox_wavm.c genh.c ogg_vorbis_file.c ps2_bmdx.c aifc.c str_snds.c ws_aud.c ahx.c ivb.c svs.c riff.c pos.c nwa.c ps2_rws.c ps2_hgc1.c xss.c ps2_sl3.c ps2_aus.c
 
 EXTRA_DIST = meta.h

src/meta/meta.h

@@ -113,4 +113,14 @@ VGMSTREAM * init_vgmstream_pos(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_nwa(STREAMFILE * streamFile);
 
+VGMSTREAM * init_vgmstream_xss(STREAMFILE * streamFile);
+
+VGMSTREAM * init_vgmstream_sl3(STREAMFILE * streamFile);
+
+VGMSTREAM * init_vgmstream_hgc1(STREAMFILE * streamFile);
+
+VGMSTREAM * init_vgmstream_aus(STREAMFILE * streamFile);
+
+VGMSTREAM * init_vgmstream_rws(STREAMFILE * streamFile);
+
 #endif

src/meta/ps2_aus.c

@@ -0,0 +1,65 @@
+#include "meta.h"
+#include "../util.h"
+
+/* AUS (found in various Capcom games) */
+VGMSTREAM * init_vgmstream_aus(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("aus",filename_extension(filename))) goto fail;
+
+    /* check header */
+    if (read_32bitBE(0x00,streamFile) != 0x41555320) /* "AUS " */
+        goto fail;
+
+    loop_flag = (read_32bitLE(0x4,streamFile)!=0);
+    channel_count = 2;
+    
+	/* 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_PSX;
+    vgmstream->num_samples = read_32bitLE(0x08,streamFile);
+    if (loop_flag) {
+        vgmstream->loop_start_sample = read_32bitLE(0x4,streamFile);
+        vgmstream->loop_end_sample = read_32bitLE(0x08,streamFile);
+    }
+
+    vgmstream->layout_type = layout_interleave;
+    vgmstream->interleave_block_size = 0x800;
+    vgmstream->meta_type = meta_AUS;
+
+    /* 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/ps2_hgc1.c

@@ -0,0 +1,66 @@
+#include "meta.h"
+#include "../util.h"
+
+/* hgC1 (from Knights of the Temple 2) */
+/* probably Square Vag Stream */
+VGMSTREAM * init_vgmstream_hgc1(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("hgc1",filename_extension(filename))) goto fail;
+
+    /* check header */
+    if (read_32bitBE(0x00,streamFile) != 0x68674331) /* "hgC1" */
+        goto fail;
+
+    loop_flag = 0; /* (read_32bitLE(0x08,streamFile)!=0); */
+    channel_count = read_32bitLE(0x08,streamFile);
+    
+	/* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+	/* fill in the vital statistics */
+    start_offset = 0x40;
+	vgmstream->channels = channel_count;
+    vgmstream->sample_rate = read_32bitLE(0x10,streamFile);
+    vgmstream->coding_type = coding_PSX;
+    vgmstream->num_samples = (read_32bitLE(0x0C,streamFile)*32)/channel_count/16*28;
+    if (loop_flag) {
+        vgmstream->loop_start_sample = 0; /* (read_32bitLE(0x08,streamFile)-1)*28; */
+        vgmstream->loop_end_sample = (read_32bitLE(0x0C,streamFile)*32)/channel_count/16*28;
+    }
+
+    vgmstream->layout_type = layout_interleave;
+    vgmstream->interleave_block_size = 0x10;
+    vgmstream->meta_type = meta_HGC1;
+
+    /* 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/ps2_rws.c

@@ -0,0 +1,65 @@
+#include "meta.h"
+#include "../util.h"
+
+/* RWS (Silent Hill Origins, Ghost Rider, Max Payne 2) */
+VGMSTREAM * init_vgmstream_rws(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("rws",filename_extension(filename))) goto fail;
+
+    /* check header */
+    if (read_32bitBE(0x00,streamFile) != 0x0D080000)
+		goto fail;
+
+    loop_flag = 0;
+    channel_count = 2;
+    
+	/* 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 = 44100;
+    vgmstream->coding_type = coding_PSX;
+    vgmstream->num_samples = (read_32bitLE(0x04,streamFile)-0x800)*28/16/2;
+    if (loop_flag) {
+        vgmstream->loop_start_sample = 0;
+        vgmstream->loop_end_sample = read_32bitLE(0x4,streamFile)*28/16/2;
+    }
+
+    vgmstream->layout_type = layout_interleave;
+    vgmstream->interleave_block_size = read_32bitLE(0x4C,streamFile)/2;
+    vgmstream->meta_type = meta_RWS;
+
+    /* 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/ps2_sl3.c

@@ -0,0 +1,65 @@
+#include "meta.h"
+#include "../util.h"
+
+/* SL3 (from Test Drive Unlimited) */
+VGMSTREAM * init_vgmstream_sl3(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("sl3",filename_extension(filename))) goto fail;
+
+    /* check header */
+    if (read_32bitBE(0x00,streamFile) != 0x534C3300) /* "SL3\0" */
+        goto fail;
+
+    loop_flag = 0; /* (read_32bitLE(0x08,streamFile)!=0); */
+    channel_count = read_32bitLE(0x14,streamFile);
+    
+	/* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+	/* fill in the vital statistics */
+    start_offset = 0x8000;
+	vgmstream->channels = channel_count;
+    vgmstream->sample_rate = read_32bitLE(0x18,streamFile);
+    vgmstream->coding_type = coding_PSX;
+    vgmstream->num_samples = (get_streamfile_size(streamFile)-0x8000)*28/16/channel_count;
+    if (loop_flag) {
+        vgmstream->loop_start_sample = 0; /* (read_32bitLE(0x08,streamFile)-1)*28; */
+        vgmstream->loop_end_sample = read_32bitLE(0x1C,streamFile);
+    }
+
+    vgmstream->layout_type = layout_interleave;
+    vgmstream->interleave_block_size = read_32bitLE(0x20,streamFile);
+    vgmstream->meta_type = meta_SL3;
+
+    /* 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/xss.c

@@ -0,0 +1,68 @@
+#include "meta.h"
+#include "../util.h"
+
+/* XSS (found in Dino Crisis 3) */
+VGMSTREAM * init_vgmstream_xss(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("xss",filename_extension(filename))) goto fail;
+
+	/* check header */
+    if (read_32bitBE(0x04,streamFile) != 0x00F41200)
+		goto fail;
+	if (read_32bitBE(0x08,streamFile) != 0xE2344A00)
+		goto fail;
+		
+    loop_flag = (read_32bitLE(0x144,streamFile)!=0);
+    channel_count = read_16bitLE(0x14E,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(0x150,streamFile);
+    vgmstream->coding_type = coding_PCM16LE;
+    vgmstream->num_samples = (get_streamfile_size(streamFile)-0x800)/2/channel_count;
+    if (loop_flag) {
+        vgmstream->loop_start_sample = read_32bitLE(0x144,streamFile)/2/channel_count;
+        vgmstream->loop_end_sample = read_32bitLE(0x148,streamFile)/2/channel_count;
+    }
+
+    vgmstream->layout_type = layout_interleave;
+    vgmstream->interleave_block_size = 0x2;
+    vgmstream->meta_type = meta_XSS;
+
+    /* 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

@@ -67,11 +67,16 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
     init_vgmstream_ahx,
 #endif
     init_vgmstream_ivb,
-	init_vgmstream_amts,
+    init_vgmstream_amts,
     init_vgmstream_svs,
     init_vgmstream_riff,
     init_vgmstream_pos,
     init_vgmstream_nwa,
+    init_vgmstream_xss,
+    init_vgmstream_sl3,
+    init_vgmstream_hgc1,
+    init_vgmstream_aus,
+    init_vgmstream_rws,
 };
 
 #define INIT_VGMSTREAM_FCNS (sizeof(init_vgmstream_fcns)/sizeof(init_vgmstream_fcns[0]))
@@ -1124,6 +1129,18 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
         case meta_NWA_GAMEEXEINI:
             snprintf(temp,TEMPSIZE,"Visual Art's NWA header and Gameexe.ini for looping");
             break;
+        case meta_XSS:
+            snprintf(temp,TEMPSIZE,"Dino Crisis 3 XSS File");
+            break;
+        case meta_HGC1:
+            snprintf(temp,TEMPSIZE,"Knights of the Temple 2 hgC1 Header");
+            break;
+        case meta_AUS:
+            snprintf(temp,TEMPSIZE,"Capcom AUS Header");
+            break;
+        case meta_RWS:
+            snprintf(temp,TEMPSIZE,"RWS Header");
+            break;
         default:
             snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET");
     }

src/vgmstream.h

@@ -156,6 +156,11 @@ typedef enum {
     meta_PS2_BMDX,          /* Beatmania thing */
     meta_PS2_IVB,           /* Langrisser 3 IVB */
     meta_PS2_SVS,           /* Square SVS */
+    meta_XSS,				/* Dino Crisis 3 */
+    meta_SL3,				/* Test Drive Unlimited */
+    meta_HGC1,				/* Knights of the Temple 2 */
+    meta_AUS,				/* Variuos Capcom Games */
+    meta_RWS,				/* Variuos Konami Games */
 
 	meta_XBOX_WAVM,			/* XBOX WAVM File */
 	meta_XBOX_RIFF,			/* XBOX RIFF/WAVE File */

unbootstrap

@@ -1 +1 @@
-rm -rf configure AUTHORS depcomp ChangeLog config.guess ltmain.sh README config.sub autom4te.cache Makefile.unix.in INSTALL COPYING missing NEWS aclocal.m4 install-sh unix/config.h.in unix/main.loT unix/Makefile.unix.in src/Makefile.unix.in src/coding/Makefile.unix.in src/meta/Makefile.unix.in src/layout/Makefile.unix.in
+rm -rf configure AUTHORS depcomp ChangeLog config.guess ltmain.sh README config.sub autom4te.cache Makefile.unix.in INSTALL missing NEWS aclocal.m4 install-sh unix/config.h.in unix/main.loT unix/Makefile.unix.in src/Makefile.unix.in src/coding/Makefile.unix.in src/meta/Makefile.unix.in src/layout/Makefile.unix.in

unix/data.c

@@ -69,6 +69,11 @@ gchar *vgmstream_exts [] = {
   "svs",
   "pos",
   "nwa",
+  "xss",
+  "sl3",
+  "hgc1",
+  "aus",
+  "rws",
   /* terminator */
   NULL
 };

winamp/in_vgmstream.c

@@ -123,10 +123,15 @@ char * extension_list[] = {
     "aud\0AUD Audio File (*.AUD)\0",
     "ahx\0AHX Audio File (*.AHX)\0",
     "ivb\0IVB Audio File (*.IVB)\0",
-	"amts\0AMTS Audio File (*.AMTS)\0",
+    "amts\0AMTS Audio File (*.AMTS)\0",
     "svs\0SVS Audio File (*.SVS)\0",
     "pos\0POS Audio File (*.POS)\0",
     "nwa\0NWA Audio File (*.NWA)\0",
+    "xss\0XSS Audio File (*.XSS)\0",
+    "sl3\0SL3 Audio File (*.SL3)\0",
+    "hgc1\0HGC1 Audio File (*.HGC1)\0",
+    "aus\0AUS Audio File (*.AUS)\0",
+    "rws\0RWS Audio File (*.RWS)\0",
 };
 
 void about(HWND hwndParent) {