Support for tri-Ace mobile vorbis AAC, support for KTSS

src/formats.c

@@ -156,6 +156,7 @@ static const char* extension_list[] = {
     "khv",
     "kovs",
     "kraw",
+    "ktss",
 
     "laac", //fake extension, for AAC (tri-Ace/FFmpeg)
     "lac3", //fake extension, for AC3
@@ -880,6 +881,7 @@ static const meta_info meta_info_list[] = {
         {meta_CSTM,                 "Nintendo 3DS CSTM Header"},
         {meta_FSTM,                 "Nintendo Wii U FSTM Header"},
         {meta_KT_WIIBGM,            "Koei Tecmo WiiBGM Header"},
+        {meta_KTSS,                 "Koei Tecmo Switch Sound Header"},
         {meta_3DS_IDSP,             "Nintendo IDSP Header"},
         {meta_WIIU_BTSND,           "Nintendo Wii U Menu Boot Sound"},
         {meta_MCA,                  "Capcom MCA header"},
@@ -901,6 +903,7 @@ static const meta_info meta_info_list[] = {
         {meta_GTD,                  "GTD/GHS header"},
         {meta_TA_AAC_X360,          "tri-Ace AAC (X360) header"},
         {meta_TA_AAC_PS3,           "tri-Ace AAC (PS3) header"},
+        {meta_TA_AAC_VORBIS,        "tri-Ace AAC (Mobile Vorbis) header"},
         {meta_PS3_MTA2,             "Konami MTA2 header"},
         {meta_NGC_ULW,              "Criterion ULW raw header"},
         {meta_PC_XA30,              "Reflections XA30 PC header"},

src/meta/ktss.c

@@ -0,0 +1,49 @@
+#include "meta.h"
+#include "../util.h"
+#include "../stack_alloc.h"
+#include "../coding/coding.h"
+
+VGMSTREAM * init_vgmstream_ktss(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+    int loop_flag, channel_count;
+    int32_t loop_length;
+    off_t start_offset;
+
+    if (!check_extensions(streamFile, "ktss"))
+        goto fail;
+
+    if (read_32bitBE(0, streamFile) != 0x4B545353) /* "KTSS" */
+        goto fail;
+
+    loop_length = read_32bitLE(0x38, streamFile);
+    loop_flag = loop_length > 0;
+    channel_count = read_8bit(0x29, streamFile);
+
+    /* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count, loop_flag);
+    if (!vgmstream) goto fail;
+
+    /* fill in the vital statistics */
+    vgmstream->num_samples = read_32bitLE(0x30, streamFile);
+    vgmstream->sample_rate = (uint16_t)read_16bitLE(0x2c, streamFile);
+    vgmstream->loop_start_sample = read_32bitLE(0x34, streamFile);
+    vgmstream->loop_end_sample = vgmstream->loop_start_sample + loop_length;
+
+    vgmstream->coding_type = coding_NGC_DSP;
+    vgmstream->layout_type = layout_interleave_byte;
+    vgmstream->meta_type = meta_KTSS;
+
+    vgmstream->interleave_block_size = 0x8;
+
+    dsp_read_coefs_le(vgmstream, streamFile, 0x40, 0x2e);
+    start_offset = read_32bitLE(0x24, streamFile) + 0x20;
+
+    if (!vgmstream_open_stream(vgmstream, streamFile, start_offset))
+        goto fail;
+    return vgmstream;
+
+fail:
+    close_vgmstream(vgmstream);
+    return NULL;
+}
+

src/meta/meta.h

@@ -602,6 +602,7 @@ VGMSTREAM * init_vgmstream_bfwav(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_kt_g1l(STREAMFILE* streamFile);
 VGMSTREAM * init_vgmstream_kt_wiibgm(STREAMFILE* streamFile);
+VGMSTREAM * init_vgmstream_ktss(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_mca(STREAMFILE* streamFile);
 
@@ -642,6 +643,7 @@ VGMSTREAM * init_vgmstream_gtd(STREAMFILE *streamFile);
 
 VGMSTREAM * init_vgmstream_ta_aac_x360(STREAMFILE *streamFile);
 VGMSTREAM * init_vgmstream_ta_aac_ps3(STREAMFILE *streamFile);
+VGMSTREAM * init_vgmstream_ta_aac_mobile(STREAMFILE *streamFile);
 
 VGMSTREAM * init_vgmstream_ps3_mta2(STREAMFILE *streamFile);
 

src/meta/ta_aac.c

@@ -208,3 +208,51 @@ fail:
     close_vgmstream(vgmstream);
     return NULL;
 }
+
+/* Android/iOS Variants (Star Ocean Anamnesis (APK v1.9.2), Heaven x Inferno (iOS)) */
+VGMSTREAM * init_vgmstream_ta_aac_mobile(STREAMFILE *streamFile) {
+#ifdef VGM_USE_VORBIS
+    off_t start_offset;
+    int loop_flag;
+    char filename[PATH_LIMIT];
+    int8_t codec_id;
+
+    streamFile->get_name(streamFile, filename, sizeof(filename));
+    /* check extension, case insensitive */
+    /* .aac: expected, .laac/ace: for players to avoid hijacking MP4/AAC */
+    if (!check_extensions(streamFile, "aac,laac,ace"))
+        goto fail;
+
+    if (read_32bitLE(0x00, streamFile) != 0x41414320)   /* "AAC " */
+        goto fail;
+
+    if (read_32bitLE(0xf0, streamFile) != 0x57415645)   /* "WAVE" */
+        goto fail;
+
+    codec_id = read_8bit(0x104, streamFile);
+    if (codec_id == 0xe) /* Vorbis */
+    {
+        vgm_vorbis_info_t inf;
+        VGMSTREAM * result = NULL;
+
+        memset(&inf, 0, sizeof(inf));
+        inf.layout_type = layout_ogg_vorbis;
+        inf.meta_type = meta_TA_AAC_VORBIS;
+        inf.loop_start = read_32bitLE(0x140, streamFile);
+        inf.loop_end = read_32bitLE(0x144, streamFile);
+        inf.loop_flag = inf.loop_end > inf.loop_start;
+        inf.loop_end_found = inf.loop_flag;
+
+        start_offset = read_32bitLE(0x120, streamFile);
+        result = init_vgmstream_ogg_vorbis_callbacks(streamFile, filename, NULL, start_offset, &inf);
+
+        if (result != NULL) {
+            return result;
+        }
+    }
+
+fail:
+    /* clean up anything we may have opened */
+#endif
+    return NULL;
+}

src/vgmstream.c

@@ -325,6 +325,7 @@ VGMSTREAM * (*init_vgmstream_functions[])(STREAMFILE *streamFile) = {
 	init_vgmstream_3ds_idsp,
     init_vgmstream_kt_g1l,
     init_vgmstream_kt_wiibgm,
+    init_vgmstream_ktss,
     init_vgmstream_hca,
     init_vgmstream_ps2_svag_snk,
     init_vgmstream_ps2_vds_vdm,
@@ -349,6 +350,7 @@ VGMSTREAM * (*init_vgmstream_functions[])(STREAMFILE *streamFile) = {
     init_vgmstream_rsd6xma,
     init_vgmstream_ta_aac_x360,
     init_vgmstream_ta_aac_ps3,
+    init_vgmstream_ta_aac_mobile,
     init_vgmstream_ps3_mta2,
     init_vgmstream_ngc_ulw,
     init_vgmstream_pc_xa30,

src/vgmstream.h

@@ -594,6 +594,7 @@ typedef enum {
     meta_FSTM,              // Nintendo Wii U FSTM (caFe? Stream)
     meta_3DS_IDSP,          // Nintendo 3DS/Wii U IDSP
     meta_KT_WIIBGM,         // Koei Tecmo WiiBGM
+    meta_KTSS,              // Koei Tecmo Switch Sound
     meta_MCA,               /* Capcom MCA "MADP" */
     meta_XB3D_ADX,          /* Xenoblade Chronicles 3D ADX */
     meta_HCA,               /* CRI HCA */
@@ -611,8 +612,9 @@ typedef enum {
     meta_OGL,               /* Shin'en Wii/WiiU (Jett Rocket (Wii), FAST Racing NEO (WiiU)) */
     meta_MC3,               /* Paradigm games (T3 PS2, MX Rider PS2, MI: Operation Surma PS2) */
     meta_GTD,               /* Knights Contract (X360/PS3), Valhalla Knights 3 (PSV) */
-    meta_TA_AAC_X360,       /* tri-ace AAC (Star Ocean 4, End of Eternity, Infinite Undiscovery) */
-    meta_TA_AAC_PS3,        /* tri-ace AAC (Star Ocean International, Resonance of Fate) */
+    meta_TA_AAC_X360,       /* tri-Ace AAC (Star Ocean 4, End of Eternity, Infinite Undiscovery) */
+    meta_TA_AAC_PS3,        /* tri-Ace AAC (Star Ocean International, Resonance of Fate) */
+    meta_TA_AAC_VORBIS,     /* tri-Ace AAC (Star Ocean Anamnesis, Heaven x Inferno) */
     meta_PS3_MTA2,          /* Metal Gear Solid 4 MTA2 */
     meta_NGC_ULW,           /* Burnout 1 (GC only) */
     meta_PC_XA30,           /* Driver - Parallel Lines (PC) */