diff --git a/fb2k/foo_filetypes.h b/fb2k/foo_filetypes.h index ffca17de..e173be20 100644 --- a/fb2k/foo_filetypes.h +++ b/fb2k/foo_filetypes.h @@ -185,6 +185,7 @@ VGMSTREAM_DECLARE_FILE_TYPE("MIC", mic); VGMSTREAM_DECLARE_FILE_TYPE("MIHB", mihb); VGMSTREAM_DECLARE_FILE_TYPE("MNSTR", mnstr); //"mp4", //common +VGMSTREAM_DECLARE_FILE_TYPE("MPC", mpc); VGMSTREAM_DECLARE_FILE_TYPE("MPDSP", mpdsp); VGMSTREAM_DECLARE_FILE_TYPE("MPDS", mpds); VGMSTREAM_DECLARE_FILE_TYPE("MSA", msa); @@ -328,6 +329,7 @@ VGMSTREAM_DECLARE_FILE_TYPE("VOI", voi); VGMSTREAM_DECLARE_FILE_TYPE("VPK", vpk); VGMSTREAM_DECLARE_FILE_TYPE("VS", vs); VGMSTREAM_DECLARE_FILE_TYPE("VSF", vsf); +VGMSTREAM_DECLARE_FILE_TYPE("VXN", vxn); VGMSTREAM_DECLARE_FILE_TYPE("WAA", waa); VGMSTREAM_DECLARE_FILE_TYPE("WAC", wac); diff --git a/src/formats.c b/src/formats.c index 7cdb672d..0a754055 100644 --- a/src/formats.c +++ b/src/formats.c @@ -179,6 +179,7 @@ static const char* extension_list[] = { "mihb", "mnstr", //"mp4", //common + "mpc", //FFmpeg, not parsed (musepack) "mpdsp", "mpds", "msa", @@ -327,6 +328,7 @@ static const char* extension_list[] = { "vpk", "vs", "vsf", + "vxn", "waa", "wac", @@ -908,6 +910,7 @@ static const meta_info meta_info_list[] = { {meta_UBI_SB, "Ubisoft SBx header"}, {meta_NAAC, "Namco NAAC header"}, {meta_EZW, "EZ2DJ EZWAVE header"}, + {meta_VXN, "Gameloft VXN header"}, #ifdef VGM_USE_VORBIS {meta_OGG_VORBIS, "Ogg Vorbis"}, diff --git a/src/libvgmstream.vcproj b/src/libvgmstream.vcproj index d5f77db1..82a59e6c 100644 --- a/src/libvgmstream.vcproj +++ b/src/libvgmstream.vcproj @@ -1198,6 +1198,10 @@ RelativePath=".\meta\vsf.c" > + + diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj index 57f20db6..fe5db0f9 100644 --- a/src/libvgmstream.vcxproj +++ b/src/libvgmstream.vcxproj @@ -405,6 +405,7 @@ + diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters index dd189199..4c167304 100644 --- a/src/libvgmstream.vcxproj.filters +++ b/src/libvgmstream.vcxproj.filters @@ -730,6 +730,9 @@ meta\Source Files + + meta\Source Files + meta\Source Files diff --git a/src/meta/meta.h b/src/meta/meta.h index af7e57aa..a4a998c9 100644 --- a/src/meta/meta.h +++ b/src/meta/meta.h @@ -693,4 +693,6 @@ VGMSTREAM * init_vgmstream_ubi_sb(STREAMFILE * streamFile); VGMSTREAM * init_vgmstream_ezw(STREAMFILE * streamFile); +VGMSTREAM * init_vgmstream_vxn(STREAMFILE * streamFile); + #endif /*_META_H*/ diff --git a/src/meta/vxn.c b/src/meta/vxn.c new file mode 100644 index 00000000..d7161fcb --- /dev/null +++ b/src/meta/vxn.c @@ -0,0 +1,102 @@ +#include "meta.h" +#include "../coding/coding.h" + +/* VXN - from Gameloft mobile games */ +VGMSTREAM * init_vgmstream_vxn(STREAMFILE *streamFile) { + VGMSTREAM * vgmstream = NULL; + int loop_flag = 0, channel_count, codec, sample_rate, block_align, bits, num_samples; + off_t start_offset, stream_offset, chunk_offset, first_offset = 0x00; + size_t stream_size; + int total_streams, target_stream = streamFile->stream_index; + + /* check extensions */ + if (!check_extensions(streamFile,"vxn")) + goto fail; + + /* check header/version chunk (RIFF-like format with many custom chunks) */ + if (read_32bitBE(0x00,streamFile) != 0x566F784E) /* "VoxN" */ + goto fail; + if (read_32bitLE(0x10,streamFile) != get_streamfile_size(streamFile) ) + goto fail; + + if (!find_chunk_le(streamFile, 0x41666D74,first_offset,0, &chunk_offset,NULL)) /* "Afmt" */ + goto fail; + codec = (uint16_t)read_16bitLE(chunk_offset+0x00, streamFile); + channel_count = (uint16_t)read_16bitLE(chunk_offset+0x02, streamFile); + sample_rate = read_32bitLE(chunk_offset+0x04, streamFile); + block_align = (uint16_t)read_16bitLE(chunk_offset+0x08, streamFile); + bits = (uint16_t)read_16bitLE(chunk_offset+0x0a, streamFile); + + /* files are divided into segment subsongs, often a leadout and loop in that order + * (the "Plst" and "Rule" chunks may have order info) */ + if (!find_chunk_le(streamFile, 0x5365676D,first_offset,0, &chunk_offset,NULL)) /* "Segm" */ + goto fail; + total_streams = read_32bitLE(chunk_offset+0x00, streamFile); + if (target_stream == 0) target_stream = 1; + if (target_stream < 0 || target_stream > total_streams || total_streams < 1) goto fail; + + stream_offset = read_32bitLE(chunk_offset+0x04 + (target_stream-1)*0x18 + 0x00, streamFile); + stream_size = read_32bitLE(chunk_offset+0x04 + (target_stream-1)*0x18 + 0x04, streamFile); + num_samples = read_32bitLE(chunk_offset+0x04 + (target_stream-1)*0x18 + 0x08, streamFile); + + if (!find_chunk_le(streamFile, 0x44617461,first_offset,0, &chunk_offset,NULL)) /* "Data" */ + goto fail; + start_offset = chunk_offset + stream_offset; + + + /* build the VGMSTREAM */ + vgmstream = allocate_vgmstream(channel_count,loop_flag); + if (!vgmstream) goto fail; + + vgmstream->sample_rate = sample_rate; + vgmstream->num_samples = num_samples; + vgmstream->num_streams = total_streams; + + vgmstream->meta_type = meta_VXN; + + switch (codec) { + + case 0x0002: /* MSADPCM (ex. Asphalt 7) */ + if (bits != 4) goto fail; + + vgmstream->coding_type = coding_MSADPCM; + vgmstream->interleave_block_size = block_align; + vgmstream->layout_type = layout_none; + break; + + case 0x0011: /* MS-IMA (ex. Asphalt 6) */ + if (bits != 16) goto fail; + + vgmstream->coding_type = coding_MS_IMA; + vgmstream->interleave_block_size = block_align; + vgmstream->layout_type = layout_none; + break; + +#ifdef VGM_USE_FFMPEG + case 0x0800: { /* Musepack (ex. Asphalt Xtreme) */ + ffmpeg_codec_data * ffmpeg_data = NULL; + if (bits != 0xFFFF) goto fail; + + ffmpeg_data = init_ffmpeg_offset(streamFile, start_offset,stream_size); + if (!ffmpeg_data) goto fail; + vgmstream->codec_data = ffmpeg_data; + vgmstream->coding_type = coding_FFmpeg; + vgmstream->layout_type = layout_none; + break; + } +#endif + + default: + VGM_LOG("VXN: unknown codec 0x%02x\n", codec); + goto fail; + } + + /* open the file for reading */ + if ( !vgmstream_open_stream(vgmstream, streamFile, start_offset) ) + goto fail; + return vgmstream; + +fail: + close_vgmstream(vgmstream); + return NULL; +} diff --git a/src/vgmstream.c b/src/vgmstream.c index dcd7232a..9c3bde7c 100644 --- a/src/vgmstream.c +++ b/src/vgmstream.c @@ -365,7 +365,8 @@ VGMSTREAM * (*init_vgmstream_functions[])(STREAMFILE *streamFile) = { init_vgmstream_pc_ast, init_vgmstream_naac, init_vgmstream_ubi_sb, - init_vgmstream_ezw, + init_vgmstream_ezw, + init_vgmstream_vxn, init_vgmstream_txth, /* should go at the end (lower priority) */ #ifdef VGM_USE_FFMPEG diff --git a/src/vgmstream.h b/src/vgmstream.h index 1276a714..d157f0e6 100644 --- a/src/vgmstream.h +++ b/src/vgmstream.h @@ -628,7 +628,8 @@ typedef enum { meta_PC_AST, /* Dead Rising (PC) */ meta_NAAC, /* Namco AAC (3DS) */ meta_UBI_SB, /* Ubisoft banks */ - meta_EZW, /* EZ2DJ (Arcade) EZWAV */ + meta_EZW, /* EZ2DJ (Arcade) EZWAV */ + meta_VXN, /* Gameloft mobile games */ #ifdef VGM_USE_VORBIS meta_OGG_VORBIS, /* Ogg Vorbis */