Tweak PDT header (cleanup)

src/formats.c

@@ -846,7 +846,7 @@ static const meta_info meta_info_list[] = {
         {meta_PS2_SMPL,             "Homura SMPL header"},
         {meta_PS2_MSA,              "Psyvariar -Complete Edition- MSA header"},
         {meta_PC_SMP,               "Ghostbusters .smp Header"},
-        {meta_NGC_PDT,              "PDT DSP header"},
+        {meta_NGC_PDT,              "Hudson .PDT header"},
         {meta_NGC_RKV,              "Legacy of Kain - Blood Omen 2 RKV GC header"},
         {meta_DSP_DDSP,             ".DDSP header"},
         {meta_P3D,                  "Radical P3D header"},

src/meta/meta.h

@@ -285,7 +285,7 @@ VGMSTREAM * init_vgmstream_psx_fag(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_ps2_mihb(STREAMFILE * streamFile);
 
-VGMSTREAM * init_vgmstream_ngc_pdt(STREAMFILE * streamFile);
+VGMSTREAM * init_vgmstream_ngc_pdt_split(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_wii_mus(STREAMFILE * streamFile);
 

src/meta/ngc_pdt.c

@@ -1,101 +1,69 @@
 #include "meta.h"
-#include "../util.h"
+#include "../coding/coding.h"
 
-/* PDT - Custom Generated File (Mario Party) */
+/* PDT - custom fake header for split (PDTExt) .ptd [Mario Party (GC)] */
-VGMSTREAM * init_vgmstream_ngc_pdt(STREAMFILE *streamFile) {
+VGMSTREAM * init_vgmstream_ngc_pdt_split(STREAMFILE *streamFile) {
     VGMSTREAM * vgmstream = NULL;
-    char filename[PATH_LIMIT];
-    int loop_flag;
-    int channel_count;
     off_t start_offset;
-    int second_channel_start = -1;
+    int loop_flag, channel_count;
-    
-    /* check extension, case insensitive */
-    streamFile->get_name(streamFile,filename,sizeof(filename));
-    if (strcasecmp("pdt",filename_extension(filename))) goto fail;
 
-    /* check header */
+
-    if (read_32bitBE(0x00,streamFile) != 0x50445420) /* "PDT " */
+    /* checks */
-        goto fail;
+    if (!check_extensions(streamFile, "pdt"))
-    if (read_32bitBE(0x04,streamFile) != 0x44535020) /* "DSP " */
-        goto fail;
-    if (read_32bitBE(0x08,streamFile) != 0x48454144) /* "HEAD " */
-        goto fail;
-    if (read_16bitBE(0x0C,streamFile) != 0x4552) /* "ER " */
         goto fail;
 
-    loop_flag = (read_32bitBE(0x1C,streamFile)!=2);
+    /* 0x10 fake header + chunks of the original header / data pasted together */
+    if (read_32bitBE(0x00,streamFile) != 0x50445420 && /* "PDT " */
+        read_32bitBE(0x04,streamFile) != 0x44535020 && /* "DSP " */
+        read_32bitBE(0x08,streamFile) != 0x48454144 && /* "HEAD " */
+        read_16bitBE(0x0C,streamFile) != 0x4552)       /* "ER " */
+        goto fail;
+
+    start_offset = 0x800;
     channel_count = (uint16_t)(read_16bitLE(0x0E,streamFile));
+    loop_flag = (read_32bitBE(0x1C,streamFile) != 2);
 
-	  /* build the VGMSTREAM */
+
+    /* 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_32bitBE(0x14,streamFile);
-    vgmstream->coding_type = coding_NGC_DSP;
 
-    if (channel_count == 1)
+    if (channel_count == 1) {
-    {
+        vgmstream->num_samples = read_32bitBE(0x18,streamFile)*14/8/channel_count/2;
-      vgmstream->num_samples = read_32bitBE(0x18,streamFile)*14/8/channel_count/2;
         if (loop_flag) {
             vgmstream->loop_start_sample = read_32bitBE(0x1C,streamFile)*14/8/channel_count/2;
             vgmstream->loop_end_sample = read_32bitBE(0x18,streamFile)*14/8/channel_count/2;
         }
     }
-    else if (channel_count == 2)
+    else if (channel_count == 2) {
-    {
+        vgmstream->num_samples = read_32bitBE(0x18,streamFile)*14/8/channel_count;
-      vgmstream->num_samples = read_32bitBE(0x18,streamFile)*14/8/channel_count;
         if (loop_flag) {
             vgmstream->loop_start_sample = read_32bitBE(0x1C,streamFile)*14/8/channel_count;
             vgmstream->loop_end_sample = read_32bitBE(0x18,streamFile)*14/8/channel_count;
         }
-        second_channel_start = (get_streamfile_size(streamFile)+start_offset)/2;
     }
-    else
+    else {
-    {
+        goto fail;
-      goto fail;
     }
 
-    vgmstream->layout_type = layout_none;
     vgmstream->meta_type = meta_NGC_PDT;
+    vgmstream->coding_type = coding_NGC_DSP;
+    vgmstream->layout_type = layout_none;
+    dsp_read_coefs_be(vgmstream, streamFile, 0x50, 0x20);
 
-    if (vgmstream->coding_type == coding_NGC_DSP) {
+    if (!vgmstream_open_stream(vgmstream,streamFile,start_offset))
-        int i;
+        goto fail;
-        for (i=0;i<16;i++) {
-            vgmstream->ch[0].adpcm_coef[i] = read_16bitBE(0x50+i*2,streamFile);
-        }
-        if (vgmstream->channels == 2) {
-            for (i=0;i<16;i++) {
-                vgmstream->ch[1].adpcm_coef[i] = read_16bitBE(0x70+i*2,streamFile);
-            }
-        }
-    }
 
-    /* open the file for reading */
+    if (channel_count == 2) {
-    {
+        vgmstream->ch[1].channel_start_offset =
-        int i;
+                vgmstream->ch[1].offset = ((get_streamfile_size(streamFile)+start_offset) / channel_count);
-        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[0].channel_start_offset=start_offset;
-            if (channel_count == 2) {
-                if (second_channel_start == -1) goto fail;
-                vgmstream->ch[1].channel_start_offset=second_channel_start;
-            }
-        vgmstream->ch[i].offset = vgmstream->ch[i].channel_start_offset;
-        }
     }
 
     return vgmstream;
 
-    /* clean up anything we may have opened */
 fail:
-    if (vgmstream) close_vgmstream(vgmstream);
+    close_vgmstream(vgmstream);
     return NULL;
 }

src/vgmstream.c

@@ -155,7 +155,7 @@ VGMSTREAM * (*init_vgmstream_functions[])(STREAMFILE *streamFile) = {
     init_vgmstream_ps2_ccc,
     init_vgmstream_psx_fag,
     init_vgmstream_ps2_mihb,
-    init_vgmstream_ngc_pdt,
+    init_vgmstream_ngc_pdt_split,
     init_vgmstream_wii_mus,
     init_vgmstream_dc_asd,
     init_vgmstream_naomi_spsd,