Add .psn extension, cleanup

src/formats.c

@@ -429,7 +429,7 @@ static const char* extension_list[] = {
     "psb",
     "psf",
     "psh", //fake extension for .vsv (to be removed)
-    "psnd",
+    "psn",
     "pwb",
 
     "r",
@@ -1220,7 +1220,7 @@ static const meta_info meta_info_list[] = {
         {meta_RAW_SNDS,             "PC .snds raw header"},
         {meta_PS2_WMUS,             "assumed The Warriors Sony ADPCM by .wmus extension"},
         {meta_HYPERSCAN_KVAG,       "Mattel Hyperscan KVAG"},
-        {meta_IOS_PSND,             "PSND Header"},
+        {meta_PSND,                 "Polarbit PSND header"},
         {meta_ADP_WILDFIRE,         "Wildfire ADP! header"},
         {meta_QD_ADP,               "Quantic Dream .ADP header"},
         {meta_EB_SFX,               "Excitebots .sfx header"},

src/meta/ios_psnd.c

@@ -1,76 +1,74 @@
-#include "meta.h"
+#include "meta.h"
-#include "../util.h"
+#include "../coding/coding.h"
-
+
-/* PSND (from Crash Bandicoot Nitro Kart 2 (iOS) */
+
-VGMSTREAM * init_vgmstream_ios_psnd(STREAMFILE *streamFile) {
+/* PSND - from Polarbit games [Crash Bandicoot Nitro Kart 3D/2 (iOS), Reckless Racing 2 (Android/iOS)] */
-    VGMSTREAM * vgmstream = NULL;
+VGMSTREAM* init_vgmstream_psnd(STREAMFILE* sf) {
-    char filename[PATH_LIMIT];
+    VGMSTREAM* vgmstream = NULL;
-    off_t start_offset;
+    uint32_t start_offset, data_size, type;
-
+    int loop_flag, channels, sample_rate;
-    int loop_flag;
+
-   int channel_count;
+
-
+    /* checks */
-    /* check extension, case insensitive */
+    if (!is_id32be(0x00,sf, "PSND"))
-    streamFile->get_name(streamFile,filename,sizeof(filename));
+        return NULL;
-    if (strcasecmp("psnd",filename_extension(filename))) goto fail;
+    /* .psn: actual extension in exes */
-
+    if (!check_extensions(sf, "psn"))
-    /* check header */
+        return NULL;
-    if (read_32bitBE(0x00,streamFile) != 0x50534E44) /* "PSND" */
+
-        goto fail;
+    data_size = read_u32le(0x04, sf); /* after this field */
-
+    type = read_u32le(0x08,sf);
-    if (read_16bitBE(0xC,streamFile)==0x2256){
+    sample_rate = read_u16le(0x0c,sf);
-		loop_flag = 1;
+
-	}
+    switch (type) {
-	else {
+        case 0x0030006: /* CBNK */
-		loop_flag = 0;
+            channels    = read_u8(0xE,sf);
-	}
+            if (read_u8(0x0f, sf) != 16) goto fail; /* bps */
-	channel_count = read_8bit(0xE,streamFile);
+            start_offset = 0x10;
-
+            
-   /* build the VGMSTREAM */
+            break;
-    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+        case 0x0000004: /* RR */
-    if (!vgmstream) goto fail;
+            channels = 1;
-
+            start_offset = 0x0e;
-   /* fill in the vital statistics */
+            break;
-    start_offset = 0x10;
+        default:
-    vgmstream->channels = channel_count;
+            goto fail;
-	
+    }
-	if (read_16bitBE(0xC,streamFile)==0x44AC){
+       
-		vgmstream->sample_rate = 44100;
+    data_size = data_size + 0x08 - start_offset;
-	}
+    loop_flag = 0; /* generally 22050hz music loops */
-	else {
+
-        vgmstream->sample_rate = read_16bitLE(0xC,streamFile);
+
-	}
+    /* build the VGMSTREAM */
-
+    vgmstream = allocate_vgmstream(channels, loop_flag);
-    vgmstream->coding_type = coding_PCM16LE;
+    if (!vgmstream) goto fail;
-    vgmstream->num_samples = (read_32bitLE(0x4,streamFile)-8)/4;
+
-	if (loop_flag) {
+    vgmstream->sample_rate = sample_rate;
-        vgmstream->loop_start_sample = 0;
+    switch (type) {
-       vgmstream->loop_end_sample = vgmstream->num_samples;
+        case 0x0030006:
-    }
+            vgmstream->coding_type = coding_PCM16LE;
-    vgmstream->layout_type = layout_interleave;
+            vgmstream->layout_type = layout_interleave;
-    vgmstream->interleave_block_size = 2;
+            vgmstream->interleave_block_size = 0x02;
-    vgmstream->meta_type = meta_IOS_PSND;
+            vgmstream->num_samples = pcm16_bytes_to_samples(data_size, channels);
-
+            break;
-    /* open the file for reading */
+        case 0x0000004:
-    {
+            vgmstream->coding_type = coding_DVI_IMA;
-        int i;
+            vgmstream->layout_type = layout_none;
-        STREAMFILE * file;
+            vgmstream->num_samples = ima_bytes_to_samples(data_size, channels);
-        file = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
+            break;
-        if (!file) goto fail;
+        default:
-        for (i=0;i<channel_count;i++) {
+            goto fail;
-            vgmstream->ch[i].streamfile = file;
+    }
-
+
-            vgmstream->ch[i].channel_start_offset=
+    vgmstream->loop_start_sample = 0;
-                vgmstream->ch[i].offset=start_offset+
+    vgmstream->loop_end_sample = vgmstream->num_samples;
-                vgmstream->interleave_block_size*i;
+
-
+    vgmstream->meta_type = meta_PSND;
-        }
+
-    }
+    if (!vgmstream_open_stream(vgmstream, sf, start_offset))
-
+        goto fail;
-    return vgmstream;
+    return vgmstream;
-
+fail:
-    /* clean up anything we may have opened */
+    close_vgmstream(vgmstream);
-fail:
+    return NULL;
-    if (vgmstream) close_vgmstream(vgmstream);
+}
-    return NULL;
-}

src/meta/meta.h

@@ -500,7 +500,7 @@ VGMSTREAM * init_vgmstream_ps2_wmus(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_hyperscan_kvag(STREAMFILE* streamFile);
 
-VGMSTREAM * init_vgmstream_ios_psnd(STREAMFILE* streamFile);
+VGMSTREAM* init_vgmstream_psnd(STREAMFILE* sf);
 
 VGMSTREAM* init_vgmstream_adp_wildfire(STREAMFILE* sf);
 

src/vgmstream.c

@@ -233,7 +233,7 @@ init_vgmstream_t init_vgmstream_functions[] = {
     init_vgmstream_xwav_new,
     init_vgmstream_xwav_old,
     init_vgmstream_hyperscan_kvag,
-    init_vgmstream_ios_psnd,
+    init_vgmstream_psnd,
     init_vgmstream_adp_wildfire,
     init_vgmstream_adp_qd,
     init_vgmstream_eb_sfx,

src/vgmstream_types.h

@@ -496,7 +496,7 @@ typedef enum {
     meta_RAW_SNDS,
     meta_PS2_WMUS,          /* The Warriors (PS2) */
     meta_HYPERSCAN_KVAG,    /* Hyperscan KVAG/BVG */
-    meta_IOS_PSND,          /* Crash Bandicoot Nitro Kart 2 (iOS) */
+    meta_PSND,
     meta_ADP_WILDFIRE,
     meta_QD_ADP,
     meta_EB_SFX,            /* Excitebots .sfx */