Add TamaSoft .msf [Abandoner: The Severed Dreams (PC)]

src/formats.c

@@ -1111,6 +1111,7 @@ static const meta_info meta_info_list[] = {
         {meta_VS_FFX,               "Square VS header"},
         {meta_NWAV,                 "Chunsoft NWAV header"},
         {meta_XPCM,                 "Circus XPCM header"},
+        {meta_MSF_TAMASOFT,         "TamaSoft MSF header"},
 
 };
 

src/libvgmstream.vcproj

@@ -1089,6 +1089,10 @@
                 <File
                     RelativePath=".\meta\msf_banpresto.c"
                     >
+                </File>
+                <File
+                    RelativePath=".\meta\msf_tamasoft.c"
+                    >
                 </File>
 				<File
 					RelativePath=".\meta\mss.c"

src/libvgmstream.vcxproj

@@ -157,6 +157,7 @@
     <ClCompile Include="meta\mp4.c" />
     <ClCompile Include="meta\msb_msh.c" />
     <ClCompile Include="meta\msf_banpresto.c" />
+    <ClCompile Include="meta\msf_tamasoft.c" />
     <ClCompile Include="meta\ngca.c" />
     <ClCompile Include="meta\opus.c" />
     <ClCompile Include="meta\nub_vag.c" />

src/libvgmstream.vcxproj.filters

@@ -1402,6 +1402,9 @@
     <ClCompile Include="meta\msf_banpresto.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="meta\msf_tamasoft.c">
+      <Filter>meta\Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="coding\mp4_aac_decoder.c">
       <Filter>coding\Source Files</Filter>
     </ClCompile>

src/meta/meta.h

@@ -808,4 +808,6 @@ VGMSTREAM * init_vgmstream_nwav(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_xpcm(STREAMFILE * streamFile);
 
+VGMSTREAM * init_vgmstream_msf_tamasoft(STREAMFILE * streamFile);
+
 #endif /*_META_H*/

src/meta/msf_tamasoft.c

@@ -0,0 +1,74 @@
+#include "meta.h"
+#include "../coding/coding.h"
+
+/* MSF - TamaSoft games [Abandoner: The Severed Dreams (PC)] */
+VGMSTREAM * init_vgmstream_msf_tamasoft(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+    off_t start_offset;
+    int loop_flag, channel_count, sample_rate, codec, loop_start = 0, loop_end = 0;
+    size_t data_size;
+    uint16_t xor16;
+    uint32_t xor32;
+
+
+    /* checks */
+    /* .msf: extension referenced in .EXE (bigfiles don't have filenames) */
+    if (!check_extensions(streamFile, "msf"))
+        goto fail;
+
+    if (read_32bitBE(0x00,streamFile) != 0x4D534620) /* "MSF " */
+        goto fail;
+    if (read_32bitBE(0x08,streamFile) != 0x00) /* just in case since there are other .msf */
+        goto fail;
+
+    /* header from 0x10 to 0x30 is encrypted (though value at 0x10 doubles as key...) */
+    xor16 = (uint16_t)(((uint32_t)read_32bitLE(0x04,streamFile) * 0x65u) + 0x30Au); /* from the exe */
+    xor32 = (uint32_t)(((uint32_t)xor16 << 16u) | (uint32_t)xor16);
+
+    /* 0x10: null */
+    loop_flag       = (uint32_t)read_32bitLE(0x14,streamFile) ^ xor32;
+    data_size       = (uint32_t)read_32bitLE(0x18,streamFile) ^ xor32;
+    codec           = (uint16_t)read_16bitLE(0x1c,streamFile) ^ xor16;
+    channel_count   = (uint16_t)read_16bitLE(0x1e,streamFile) ^ xor16;
+    sample_rate     = (uint32_t)read_32bitLE(0x20,streamFile) ^ xor32;
+    /* 0x24: average bitrate? */
+    /* 0x28: block size */
+    /* 0x2a: bps */
+    /* 0x2c: unknown (fixed) */
+
+    if (loop_flag) {
+        loop_start      = read_32bitLE(0x30,streamFile);
+        loop_end        = read_32bitLE(0x34,streamFile);
+        /* 0x38/3c: null */
+        start_offset = 0x40;
+    }
+    else {
+        start_offset = 0x30;
+    }
+
+    if (codec != 0x01)
+        goto fail;
+
+
+    /* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count, loop_flag);
+    if (!vgmstream) goto fail;
+
+    vgmstream->meta_type = meta_MSF_TAMASOFT;
+    vgmstream->sample_rate = sample_rate;
+    vgmstream->num_samples = pcm_bytes_to_samples(data_size, channel_count, 16);
+    vgmstream->loop_start_sample = pcm_bytes_to_samples(loop_start, channel_count, 16);
+    vgmstream->loop_end_sample   = pcm_bytes_to_samples(loop_end, channel_count, 16);
+
+    vgmstream->coding_type = coding_PCM16LE;
+    vgmstream->layout_type = layout_interleave;
+    vgmstream->interleave_block_size = 0x02;
+
+    if (!vgmstream_open_stream(vgmstream,streamFile,start_offset))
+        goto fail;
+    return vgmstream;
+
+fail:
+    close_vgmstream(vgmstream);
+    return NULL;
+}

src/vgmstream.c

@@ -449,6 +449,7 @@ VGMSTREAM * (*init_vgmstream_functions[])(STREAMFILE *streamFile) = {
     init_vgmstream_msf_banpresto_2msf,
     init_vgmstream_nwav,
     init_vgmstream_xpcm,
+    init_vgmstream_msf_tamasoft,
 
     /* lowest priority metas (should go after all metas, and TXTH should go before raw formats) */
     init_vgmstream_txth,            /* proper parsers should supersede TXTH, once added */

src/vgmstream.h

@@ -705,6 +705,7 @@ typedef enum {
     meta_VS_FFX,
     meta_NWAV,
     meta_XPCM,
+    meta_MSF_TAMASOFT,
 
 } meta_t;