.seg support for Xbox ADPCM as well as existing ADPCM

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

readme.txt

@@ -86,7 +86,6 @@ PS2/PSX ADPCM:
 - .rws
 - .rxw
 - .snd
-- .seg
 - .sfs
 - .sl3
 - .smpl (w/ bad flags)
@@ -223,6 +222,7 @@ multi:
 - .rsd (PSX ADPCM, 16 bit PCM, GC DSP ADPCM, Xbox IMA ADPCM, Radical ADPCM)
 - .rrds (NDS IMA ADPCM)
 - .sad (GC DSP ADPCM, NDS IMA ADPCM, Procyon Studios NDS ADPCM)
+- .seg (Xbox IMA ADPCM, PS2 ADPCM)
 - .sng, .asf, .str, .eam (EA/XA ADPCM or PSX ADPCM)
 - .strm (NDS IMA ADPCM, 8/16 bit PCM)
 - .ss7 (EACS IMA ADPCM, IMA ADPCM)

src/Makefile

@@ -165,7 +165,7 @@ META_OBJS=meta/adx_header.o \
     meta/bgw.o \
     meta/ps2_ass.o \
     meta/ngc_waa_wac_wad_wam.o \
-    meta/ps2_seg.o \
+    meta/seg.o \
     meta/str_asr.o \
     meta/zwdsp.o \
     meta/gca.o \

src/libvgmstream.vcproj

@@ -738,10 +738,6 @@
 					RelativePath=".\meta\ps2_rxw.c"
 					>
 				</File>
-				<File
-					RelativePath=".\meta\ps2_seg.c"
-					>
-				</File>
 				<File
 					RelativePath=".\meta\ps2_sfs.c"
 					>
@@ -946,6 +942,10 @@
 					RelativePath=".\meta\se_scd.c"
 					>
 				</File>
+				<File
+					RelativePath=".\meta\seg.c"
+					>
+				</File>
 				<File
 					RelativePath=".\meta\sfl.c"
 					>

src/meta/Makefile.unix.am

@@ -113,7 +113,7 @@ libmeta_la_SOURCES += naomi_spsd.c
 libmeta_la_SOURCES += bgw.c
 libmeta_la_SOURCES += ps2_ass.c
 libmeta_la_SOURCES += ngc_waa_wac_wad_wam.c
-libmeta_la_SOURCES += ps2_seg.c
+libmeta_la_SOURCES += seg.c
 libmeta_la_SOURCES += str_asr.c
 libmeta_la_SOURCES += zwdsp.c
 libmeta_la_SOURCES += gca.c

src/meta/meta.h

@@ -307,7 +307,7 @@ VGMSTREAM * init_vgmstream_ps2_ass(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_waa_wac_wad_wam(STREAMFILE * streamFile);
 
-VGMSTREAM * init_vgmstream_ps2_seg(STREAMFILE * streamFile);
+VGMSTREAM * init_vgmstream_seg(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_nds_strm_ffta2(STREAMFILE * streamFile);
 

src/meta/seg.c

@@ -2,12 +2,13 @@
 #include "../util.h"
 
 /* SEG (found in Eragon) */
-VGMSTREAM * init_vgmstream_ps2_seg(STREAMFILE *streamFile) {
+VGMSTREAM * init_vgmstream_seg(STREAMFILE *streamFile) {
     VGMSTREAM * vgmstream = NULL;
     char filename[260];
     off_t start_offset;
 	int loop_flag;
 	int channel_count;
+    coding_t coding;
 
     /* check extension, case insensitive */
     streamFile->get_name(streamFile,filename,sizeof(filename));
@@ -15,9 +16,17 @@ VGMSTREAM * init_vgmstream_ps2_seg(STREAMFILE *streamFile) {
 
 
     /* check header */
-    if (read_32bitBE(0x00,streamFile) != 0x73656700 &&  /* "seg\0" */
-		read_32bitBE(0x04,streamFile) != 0x70733200)	/* "ps2\0" */
-	goto fail;
+    if (read_32bitBE(0x00,streamFile) != 0x73656700)    /* "seg\0" */
+        goto fail;
+    if (read_32bitBE(0x04,streamFile) == 0x70733200)    /* "ps2\0" */
+    {
+        coding = coding_PSX;
+    }
+    else if (read_32bitBE(0x04,streamFile) == 0x78627800)   /* "xbx\0" */
+    {
+        coding = coding_XBOX;
+    }
+    else goto fail;
 
     loop_flag = 0;
     channel_count = read_32bitLE(0x24,streamFile);
@@ -30,21 +39,34 @@ VGMSTREAM * init_vgmstream_ps2_seg(STREAMFILE *streamFile) {
     start_offset = 0x4000;
 	vgmstream->channels = channel_count;
     vgmstream->sample_rate = read_32bitLE(0x18,streamFile);
-    vgmstream->coding_type = coding_PSX;
-    vgmstream->num_samples = (read_32bitLE(0x0C,streamFile)-start_offset)*28/16/channel_count;
+    vgmstream->coding_type = coding;
+
     if (loop_flag) {
         vgmstream->loop_start_sample = 0;
         vgmstream->loop_end_sample = read_32bitLE(0x1C,streamFile);
     }
 
-	if (channel_count == 1) {
-		vgmstream->layout_type = layout_none;
-	} else if (channel_count == 2) {
-		vgmstream->layout_type = layout_interleave;
-		vgmstream->interleave_block_size = 0x2000;
-	}
-    
-    vgmstream->meta_type = meta_PS2_SEG;
+    vgmstream->interleave_block_size = 0;
+
+    if (coding_PSX == coding)
+    {
+        vgmstream->num_samples = (read_32bitLE(0x0C,streamFile)-start_offset)*28/16/channel_count;
+        vgmstream->meta_type = meta_PS2_SEG;
+
+	    if (channel_count == 1) {
+		    vgmstream->layout_type = layout_none;
+	    } else if (channel_count == 2) {
+		    vgmstream->layout_type = layout_interleave;
+		    vgmstream->interleave_block_size = 0x2000;
+	    }
+    }
+    else if (coding_XBOX == coding)
+    {
+        vgmstream->num_samples = (read_32bitLE(0x0C,streamFile)-start_offset)/36/channel_count*64;
+        vgmstream->meta_type = meta_XBOX_SEG;
+        vgmstream->layout_type = layout_none;
+    }
+    else goto fail;
 
     /* open the file for reading */
     {

src/vgmstream.c

@@ -174,7 +174,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
     init_vgmstream_spw,
     init_vgmstream_ps2_ass,
     init_vgmstream_waa_wac_wad_wam,
-    init_vgmstream_ps2_seg,
+    init_vgmstream_seg,
     init_vgmstream_nds_strm_ffta2,
     init_vgmstream_str_asr,
     init_vgmstream_zwdsp,
@@ -2434,6 +2434,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
         case meta_PS2_SEG:
             snprintf(temp,TEMPSIZE,"SEG (PS2) Header");
             break;
+        case meta_XBOX_SEG:
+            snprintf(temp,TEMPSIZE,"SEG (XBOX) Header");
+            break;
         case meta_NDS_STRM_FFTA2:
             snprintf(temp,TEMPSIZE,"Final Fantasy Tactics A2 RIFF Header");
             break;

src/vgmstream.h

@@ -353,6 +353,7 @@ typedef enum {
 
     meta_PS2_ASS,			/* ASS */
     meta_PS2_SEG,			/* Eragon */
+    meta_XBOX_SEG,
     meta_NDS_STRM_FFTA2,	/* Final Fantasy Tactics A2 */
     meta_STR_ASR,			/* Donkey Kong Jet Race */
     meta_ZWDSP,				/* Zack and Wiki */