From 6b57005c076e9a9580be7fb56cd967ab97ceac03 Mon Sep 17 00:00:00 2001 From: bnnm Date: Sat, 14 Oct 2017 13:42:59 +0200 Subject: [PATCH] Fix some S14/SSS (Korogashi Puzzle Katamari Damacy) --- src/formats.c | 4 +- src/meta/s14_sss.c | 119 +++++++++++++++------------------------------ src/vgmstream.c | 2 - 3 files changed, 42 insertions(+), 83 deletions(-) diff --git a/src/formats.c b/src/formats.c index e311dc65..e4c04f48 100644 --- a/src/formats.c +++ b/src/formats.c @@ -789,8 +789,8 @@ static const meta_info meta_info_list[] = { {meta_PS2_STER, "STER Header"}, {meta_BNSF, "Namco Bandai BNSF header"}, {meta_PS2_WB, "Shooting Love. ~TRIZEAL~ WB header"}, - {meta_S14, "assumed Polycom Siren 14 by .s14 extension"}, - {meta_SSS, "assumed Polycom Siren 14 by .sss extension"}, + {meta_S14, "Namco .S14 raw header"}, + {meta_SSS, "Namco .SSS raw header"}, {meta_PS2_GCM, "GCM 'MCG' Header"}, {meta_PS2_SMPL, "Homura 'SMPL' Header"}, {meta_PS2_MSA, "Psyvariar -Complete Edition- MSA header"}, diff --git a/src/meta/s14_sss.c b/src/meta/s14_sss.c index e85db981..e1aed330 100644 --- a/src/meta/s14_sss.c +++ b/src/meta/s14_sss.c @@ -1,105 +1,66 @@ -#include "../vgmstream.h" - -#ifdef VGM_USE_G7221 - #include "meta.h" #include "../util.h" #include "../coding/coding.h" +#include -/* .s14 and .sss - from Idolm@ster DS (and others?) - * Raw 24kbit Siren 14 stream, s14 is mono and sss is - * frame-interleaved stereo - */ - +/* .s14 and .sss - headerless siren14 stream (The Idolm@ster DS, Korogashi Puzzle Katamari Damacy DS) */ VGMSTREAM * init_vgmstream_s14_sss(STREAMFILE *streamFile) { VGMSTREAM * vgmstream = NULL; - char filename[PATH_LIMIT]; - int channel_count; + off_t start_offset = 0; + int channel_count, loop_flag = 0, interleave; - size_t file_size; - /* check extension, case insensitive */ - /* this is all we have to go on, rsf is completely headerless */ - streamFile->get_name(streamFile,filename,sizeof(filename)); - if (!strcasecmp("sss",filename_extension(filename))) - { + /* check extension */ + if (check_extensions(streamFile,"sss")) { channel_count = 2; - } - else if (!strcasecmp("s14",filename_extension(filename))) - { - channel_count = 1; - } - else - { + } else if (check_extensions(streamFile,"s14")) { + channel_count = 1; //todo missing dual _0ch.s14 _1ch.s14, but dual_ext thing doesn't work properly with siren14 decoder + } else { goto fail; } - file_size = get_streamfile_size(streamFile); + /* raw siren comes in 3 frame sizes, try to guess the correct one + * (should try to decode and check the error flag but it isn't currently reported) */ + { + char filename[PATH_LIMIT]; + streamFile->get_name(streamFile,filename,sizeof(filename)); + + /* horrid but I ain't losing sleep over it (besides the header must be somewhere as some tracks loop) */ + if (strstr(filename,"S037")==filename || strstr(filename,"b06")==filename) /* Korogashi Puzzle Katamari Damacy */ + interleave = 0x78; + else if (strstr(filename,"32700")==filename || /* Hottarake no Shima - Kanata to Nijiiro no Kagami */ + (strstr(filename,"b0")==filename || strstr(filename,"puzzle")==filename || strstr(filename,"M09")==filename) ) /* Korogashi Puzzle Katamari Damacy */ + interleave = 0x50; + else + interleave = 0x3c; /* The Idolm@ster - Dearly Stars */ + } + /* build the VGMSTREAM */ - - vgmstream = allocate_vgmstream(channel_count,0); + vgmstream = allocate_vgmstream(channel_count,loop_flag); if (!vgmstream) goto fail; + vgmstream->num_samples = get_streamfile_size(streamFile) / (interleave * channel_count) * (32000/50); + vgmstream->sample_rate = 32768; /* maybe 32700? */ - /* fill in the vital statistics */ - vgmstream->num_samples = file_size/0x3c/channel_count*(32000/50); - vgmstream->sample_rate = 32768; - - vgmstream->coding_type = coding_G7221C; + vgmstream->meta_type = channel_count==1 ? meta_S14 : meta_SSS; vgmstream->layout_type = layout_interleave; - vgmstream->interleave_block_size = 0x3c; - if (1 == channel_count) - { - vgmstream->meta_type = meta_S14; - } - else - { - vgmstream->meta_type = meta_SSS; - } + vgmstream->interleave_block_size = interleave; { - int i; - g7221_codec_data *data; - - /* one data structure per channel */ - data = malloc(sizeof(g7221_codec_data) * channel_count); - if (!data) - { - goto fail; - } - memset(data,0,sizeof(g7221_codec_data) * channel_count); - vgmstream->codec_data = data; - - for (i = 0; i < channel_count; i++) - { - /* Siren 14 == 14khz bandwidth */ - data[i].handle = g7221_init(vgmstream->interleave_block_size, 14000); - if (!data[i].handle) - { - goto fail; /* close_vgmstream is able to clean up */ - } - } - } - - /* open the file for reading by each channel */ - { - int i; - for (i=0;ich[i].streamfile = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE); - - if (!vgmstream->ch[i].streamfile) goto fail; - - vgmstream->ch[i].channel_start_offset= - vgmstream->ch[i].offset=0x3c*i; - } +#ifdef VGM_USE_G7221 + vgmstream->coding_type = coding_G7221C; + vgmstream->codec_data = init_g7221(vgmstream->channels, vgmstream->interleave_block_size); + if (!vgmstream->codec_data) goto fail; +#else + goto fail; +#endif } + if (!vgmstream_open_stream(vgmstream,streamFile,start_offset)) + goto fail; return vgmstream; - /* clean up anything we may have opened */ fail: - if (vgmstream) close_vgmstream(vgmstream); + close_vgmstream(vgmstream); return NULL; } - -#endif diff --git a/src/vgmstream.c b/src/vgmstream.c index 0c871582..1ef1c73d 100644 --- a/src/vgmstream.c +++ b/src/vgmstream.c @@ -259,9 +259,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = { init_vgmstream_ps2_ster, init_vgmstream_ps2_wb, init_vgmstream_bnsf, -#ifdef VGM_USE_G7221 init_vgmstream_s14_sss, -#endif init_vgmstream_ps2_gcm, init_vgmstream_ps2_smpl, init_vgmstream_ps2_msa,