added sadb

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

src/meta/meta.h

@@ -85,4 +85,6 @@ VGMSTREAM * init_vgmstream_genh(STREAMFILE *streamFile);
 VGMSTREAM * init_vgmstream_ogg_vorbis(STREAMFILE *streamFile);
 #endif
 
+VGMSTREAM * init_vgmstream_sadb(STREAMFILE *streamFile);
+
 #endif

src/meta/ngc_dsp_std.c

@@ -594,3 +594,107 @@ fail:
     return NULL;
 }
 
+/* sadb - .SAD files, two standard DSP headers */
+VGMSTREAM * init_vgmstream_sadb(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+    char filename[260];
+
+    off_t start_offset;
+    off_t interleave;
+
+    struct dsp_header ch0_header,ch1_header;
+    int i;
+
+    /* check extension, case insensitive */
+    streamFile->get_name(streamFile,filename,sizeof(filename));
+    if (strcasecmp("sad",filename_extension(filename))) goto fail;
+
+    if (read_dsp_header(&ch0_header, 0x80, streamFile)) goto fail;
+    if (read_dsp_header(&ch1_header, 0xe0, streamFile)) goto fail;
+
+    start_offset = read_32bitBE(0x48,streamFile);
+    interleave = 16;
+
+    /* check initial predictor/scale */
+    if (ch0_header.initial_ps != (uint8_t)read_8bit(start_offset,streamFile))
+        goto fail;
+    if (ch1_header.initial_ps != (uint8_t)read_8bit(start_offset+interleave,streamFile))
+        goto fail;
+
+    /* check type==0 and gain==0 */
+    if (ch0_header.format || ch0_header.gain ||
+        ch1_header.format || ch1_header.gain)
+        goto fail;
+
+    /* check for agreement */
+    if (
+            ch0_header.sample_count != ch1_header.sample_count ||
+            ch0_header.nibble_count != ch1_header.nibble_count ||
+            ch0_header.sample_rate != ch1_header.sample_rate ||
+            ch0_header.loop_flag != ch1_header.loop_flag ||
+            ch0_header.loop_start_offset != ch1_header.loop_start_offset ||
+            ch0_header.loop_end_offset != ch1_header.loop_end_offset
+       ) goto fail;
+
+    if (ch0_header.loop_flag) {
+        off_t loop_off;
+        /* check loop predictor/scale */
+        loop_off = ch0_header.loop_start_offset/16*8;
+        loop_off = (loop_off/interleave*interleave*2) + (loop_off%interleave);
+        if (ch0_header.loop_ps != (uint8_t)read_8bit(start_offset+loop_off,streamFile))
+            goto fail;
+        if (ch1_header.loop_ps != (uint8_t)read_8bit(start_offset+loop_off+interleave,streamFile))
+            goto fail;
+    }
+
+    /* build the VGMSTREAM */
+
+    vgmstream = allocate_vgmstream(2,ch0_header.loop_flag);
+    if (!vgmstream) goto fail;
+
+    /* fill in the vital statistics */
+    vgmstream->num_samples = ch0_header.sample_count;
+    vgmstream->sample_rate = ch0_header.sample_rate;
+
+    /* TODO: adjust for interleave? */
+    vgmstream->loop_start_sample = dsp_nibbles_to_samples(
+            ch0_header.loop_start_offset);
+    vgmstream->loop_end_sample =  dsp_nibbles_to_samples(
+            ch0_header.loop_end_offset)+1;
+
+    vgmstream->coding_type = coding_NGC_DSP;
+    vgmstream->layout_type = layout_interleave;
+    vgmstream->interleave_block_size = interleave;
+    vgmstream->meta_type = meta_DSP_SADB;
+
+    /* coeffs */
+    for (i=0;i<16;i++) {
+        vgmstream->ch[0].adpcm_coef[i] = ch0_header.coef[i];
+        vgmstream->ch[1].adpcm_coef[i] = ch1_header.coef[i];
+    }
+    
+    /* initial history */
+    /* always 0 that I've ever seen, but for completeness... */
+    vgmstream->ch[0].adpcm_history1_16 = ch0_header.initial_hist1;
+    vgmstream->ch[0].adpcm_history2_16 = ch0_header.initial_hist2;
+    vgmstream->ch[1].adpcm_history1_16 = ch1_header.initial_hist1;
+    vgmstream->ch[1].adpcm_history2_16 = ch1_header.initial_hist2;
+
+    vgmstream->ch[0].streamfile = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
+    vgmstream->ch[1].streamfile = vgmstream->ch[0].streamfile;
+
+    if (!vgmstream->ch[0].streamfile) goto fail;
+    /* open the file for reading */
+    for (i=0;i<2;i++) {
+        vgmstream->ch[i].channel_start_offset=
+            vgmstream->ch[i].offset=start_offset+i*interleave;
+    }
+
+    return vgmstream;
+
+fail:
+    /* clean up anything we may have opened */
+    if (vgmstream) close_vgmstream(vgmstream);
+    return NULL;
+}
+

src/vgmstream.c

@@ -58,6 +58,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
 #ifdef VGM_USE_VORBIS
     init_vgmstream_ogg_vorbis,
 #endif
+    init_vgmstream_sadb,
 };
 
 #define INIT_VGMSTREAM_FCNS (sizeof(init_vgmstream_fcns)/sizeof(init_vgmstream_fcns[0]))
@@ -862,6 +863,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
             snprintf(temp,TEMPSIZE,"Ogg Vorbis");
             break;
 #endif
+        case meta_DSP_SADB:
+            snprintf(temp,TEMPSIZE,"sadb header");
+            break;
         default:
             snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET");
     }

src/vgmstream.h

@@ -75,7 +75,8 @@ typedef enum {
     meta_DSP_JETTERS,       /* Bomberman Jetters .dsp */
     meta_DSP_MSS,
     meta_DSP_GCM,
-	meta_DSP_STR,			/* Conan .str files */
+    meta_DSP_STR,			/* Conan .str files */
+    meta_DSP_SADB,          /* .sad */
 
     /* Nintendo */
     meta_STRM,              /* STRM */