From 13a7cdacf53aa6aa30a84bc7dc4143b7c8fc9703 Mon Sep 17 00:00:00 2001 From: manakoAT Date: Tue, 18 Nov 2008 19:13:12 +0000 Subject: [PATCH] support for Donkey Kong Jet Race added (.str .asr) git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@480 51a99a44-fe44-0410-b1ba-c3e57ba2b86b --- src/Makefile | 3 +- src/libvgmstream.vcproj | 4 ++ src/meta/Makefile.unix.am | 1 + src/meta/meta.h | 2 + src/meta/str_asr.c | 98 +++++++++++++++++++++++++++++++++++++++ src/vgmstream.c | 4 ++ src/vgmstream.h | 3 +- winamp/in_vgmstream.c | 1 + 8 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 src/meta/str_asr.c diff --git a/src/Makefile b/src/Makefile index f6d1f5c2..5751b848 100644 --- a/src/Makefile +++ b/src/Makefile @@ -146,7 +146,8 @@ META_OBJS=meta/adx_header.o \ meta/bgw.o \ meta/ps2_ass.o \ meta/ngc_waa_wac_wad_wam.o \ - meta/ps2_seg.o + meta/ps2_seg.o \ + meta/str_asr.o OBJECTS=vgmstream.o streamfile.o util.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS) diff --git a/src/libvgmstream.vcproj b/src/libvgmstream.vcproj index e59c2036..4e1f2fbb 100644 --- a/src/libvgmstream.vcproj +++ b/src/libvgmstream.vcproj @@ -605,6 +605,10 @@ RelativePath=".\meta\sli.c" > + + diff --git a/src/meta/Makefile.unix.am b/src/meta/Makefile.unix.am index 8d3e720a..f6e6def1 100644 --- a/src/meta/Makefile.unix.am +++ b/src/meta/Makefile.unix.am @@ -115,4 +115,5 @@ libmeta_la_SOURCES += bgw.c libmeta_la_SOURCES += ps2_ass.c libmeta_la_SOURCES += ngc_waa_wac_wad_wam.c libmeta_la_SOURCES += ps2_seg.c +libmeta_la_SOURCES += str_asr.c EXTRA_DIST = meta.h diff --git a/src/meta/meta.h b/src/meta/meta.h index 734e01a6..8d320d82 100644 --- a/src/meta/meta.h +++ b/src/meta/meta.h @@ -279,4 +279,6 @@ VGMSTREAM * init_vgmstream_ps2_seg(STREAMFILE * streamFile); VGMSTREAM * init_vgmstream_nds_strm_ffta2(STREAMFILE * streamFile); +VGMSTREAM * init_vgmstream_str_asr(STREAMFILE * streamFile); + #endif diff --git a/src/meta/str_asr.c b/src/meta/str_asr.c new file mode 100644 index 00000000..a6ad7a9f --- /dev/null +++ b/src/meta/str_asr.c @@ -0,0 +1,98 @@ +#include "meta.h" +#include "../util.h" + +/* STR -ASR (from Donkey Kong Jet Race) */ +VGMSTREAM * init_vgmstream_str_asr(STREAMFILE *streamFile) { + VGMSTREAM * vgmstream = NULL; + char filename[260]; + off_t start_offset; + + int loop_flag = 0; + int channel_count; + + /* check extension, case insensitive */ + streamFile->get_name(streamFile,filename,sizeof(filename)); + if (strcasecmp("str",filename_extension(filename)) && /* PCM Files */ + strcasecmp("asr",filename_extension(filename))) /* DSP Files */ + goto fail; + + /* check header */ + if (read_32bitBE(0x00,streamFile) != 0x4B4E4F4E && /* "KNON" */ + read_32bitBE(0x08,streamFile) != 0x00000000 && /* "0x0" */ + read_32bitBE(0xCC,streamFile) != 0x57494920) /* "WII\0x20" */ + goto fail; + + + loop_flag = (read_32bitBE(0x44,streamFile)!=0); + channel_count = 2; + /* 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(0x40,streamFile); + + switch (read_32bitBE(0x20,streamFile)) { + case 0x4B415354: /* KAST - DSP encoding */ + vgmstream->coding_type = coding_NGC_DSP; + vgmstream->num_samples = (read_32bitBE(0x3C,streamFile))*14/8/channel_count; + if (loop_flag) { + vgmstream->loop_start_sample = (read_32bitBE(0x44,streamFile))*14/8/channel_count; + vgmstream->loop_end_sample = (read_32bitBE(0x48,streamFile))*14/8/channel_count; + } + vgmstream->interleave_block_size = 0x10; + break; + case 0x4B505354: /* KPST - PCM encoding */ + vgmstream->coding_type = coding_PCM16BE; + vgmstream->num_samples = (read_32bitBE(0x3C,streamFile))/2/channel_count; + if (loop_flag) { + vgmstream->loop_start_sample = (read_32bitBE(0x44,streamFile))/2/channel_count; + vgmstream->loop_end_sample = (read_32bitBE(0x48,streamFile))/2/channel_count; + } + vgmstream->interleave_block_size = 0x2; + break; + default: + goto fail; + } + + /* Interleave and Layout settings */ + vgmstream->layout_type = layout_interleave; + vgmstream->meta_type = meta_STR_ASR; + + if (vgmstream->coding_type == coding_NGC_DSP) { + int i; + for (i=0;i<16;i++) { + vgmstream->ch[0].adpcm_coef[i] = read_16bitBE(0x8C+i*2,streamFile); + } + if (vgmstream->channels) { + for (i=0;i<16;i++) { + vgmstream->ch[1].adpcm_coef[i] = read_16bitBE(0xEC+i*2,streamFile); + } + } + } + + /* open the file for reading */ + { + int i; + STREAMFILE * file; + file = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE); + if (!file) goto fail; + for (i=0;ich[i].streamfile = file; + + vgmstream->ch[i].channel_start_offset= + vgmstream->ch[i].offset=start_offset+ + vgmstream->interleave_block_size*i; + + } + } + + return vgmstream; + + /* clean up anything we may have opened */ +fail: + if (vgmstream) close_vgmstream(vgmstream); + return NULL; +} diff --git a/src/vgmstream.c b/src/vgmstream.c index c69e070a..301936b3 100644 --- a/src/vgmstream.c +++ b/src/vgmstream.c @@ -156,6 +156,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = { init_vgmstream_waa_wac_wad_wam, init_vgmstream_ps2_seg, init_vgmstream_nds_strm_ffta2, + init_vgmstream_str_asr, }; #define INIT_VGMSTREAM_FCNS (sizeof(init_vgmstream_fcns)/sizeof(init_vgmstream_fcns[0])) @@ -1811,6 +1812,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) { break; case meta_NDS_STRM_FFTA2: snprintf(temp,TEMPSIZE,"Final Fantasy Tactics A2 RIFF Header"); + break; + case meta_STR_ASR: + snprintf(temp,TEMPSIZE,"Donkey Kong Jet Race KNON/WII Header"); break; default: snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET"); diff --git a/src/vgmstream.h b/src/vgmstream.h index aa78811e..8eb2b0b3 100644 --- a/src/vgmstream.h +++ b/src/vgmstream.h @@ -264,7 +264,8 @@ typedef enum { meta_PS2_ASS, /* ASS */ meta_PS2_SEG, /* Eragon */ - meta_NDS_STRM_FFTA2, /* FFTA2 */ + meta_NDS_STRM_FFTA2, /* Final Fantasy Tactics A2 */ + meta_STR_ASR, /* Donkey Kong Jet Race */ meta_XBOX_WAVM, /* XBOX WAVM File */ meta_XBOX_RIFF, /* XBOX RIFF/WAVE File */ diff --git a/winamp/in_vgmstream.c b/winamp/in_vgmstream.c index e10a1ab9..a1131ea7 100644 --- a/winamp/in_vgmstream.c +++ b/winamp/in_vgmstream.c @@ -200,6 +200,7 @@ char * extension_list[] = { "wad\0WAD Audio File (*.WAD)\0", "wam\0WAM Audio File (*.WAM)\0", "seg\0SEG Audio File (*.SEG)\0", + "asr\0ASR Audio File (*.ASR)\0", }; void about(HWND hwndParent) {