From 011aa6c6c134e7d643ff8a23c49c92449b429ca0 Mon Sep 17 00:00:00 2001 From: bnnm Date: Sat, 2 Oct 2021 18:15:04 +0200 Subject: [PATCH] Add LOPU .lopus [Melty Blood Type Lumina (Switch)] --- src/formats.c | 3 +- src/libvgmstream.vcxproj | 1 + src/libvgmstream.vcxproj.filters | 3 ++ src/meta/lopu.c | 61 ++++++++++++++++++++++++++++++++ src/meta/meta.h | 2 ++ src/vgmstream.c | 1 + src/vgmstream.h | 1 + 7 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 src/meta/lopu.c diff --git a/src/formats.c b/src/formats.c index 98a8c890..5b07351f 100644 --- a/src/formats.c +++ b/src/formats.c @@ -289,7 +289,7 @@ static const char* extension_list[] = { "lmp4", //fake extension for .mp4 "lmpc", //fake extension for .mpc, FFmpeg/not parsed "logg", //fake extension for .ogg - "lopus", //fake extension for .opus + "lopus", //fake extension for .opus, used by LOPU too "lp", "lpcm", "lpk", @@ -1364,6 +1364,7 @@ static const meta_info meta_info_list[] = { {meta_BNK_RELIC, "Relic BNK header"}, {meta_XSH_XSD_XSS, "Treyarch XSH+XSD/XSS header"}, {meta_PSB, "M2 PSB header"}, + {meta_LOPU, "French-Break LOPU header"}, }; void get_vgmstream_coding_description(VGMSTREAM* vgmstream, char* out, size_t out_size) { diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj index a73676e8..f25dfba9 100644 --- a/src/libvgmstream.vcxproj +++ b/src/libvgmstream.vcxproj @@ -215,6 +215,7 @@ + diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters index 43549e5b..884630f0 100644 --- a/src/libvgmstream.vcxproj.filters +++ b/src/libvgmstream.vcxproj.filters @@ -1903,6 +1903,9 @@ meta\Source Files + + meta\Source Files + meta\Source Files diff --git a/src/meta/lopu.c b/src/meta/lopu.c new file mode 100644 index 00000000..9d896a3e --- /dev/null +++ b/src/meta/lopu.c @@ -0,0 +1,61 @@ +#include "meta.h" +#include "../coding/coding.h" + + +/* LOPU - French-Bread's Opus [Melty Blood: Type Lumina (Switch)] */ +VGMSTREAM* init_vgmstream_lopu(STREAMFILE* sf) { + VGMSTREAM* vgmstream = NULL; + int loop_flag, channels, sample_rate; + uint32_t start_offset, data_size; + int32_t num_samples, loop_start, loop_end, skip; + + /* checks */ + if (!is_id32be(0x00, sf, "LOPU")) + goto fail; + + /* .lopus: real extension (honest) */ + if (!check_extensions(sf, "lopus")) + goto fail; + + start_offset = read_u32le(0x04, sf); + sample_rate = read_u32le(0x08, sf); + channels = read_s16le(0x0c, sf); + /* 0x10: ? (1984) */ + num_samples = read_s32le(0x14, sf); + loop_start = read_s32le(0x18, sf); + loop_end = read_s32le(0x1c, sf) + 1; + /* 0x20: frame size */ + skip = read_s16le(0x24, sf); + data_size = read_u32le(0x28, sf); + /* rest: null */ + + loop_flag = (loop_end > 0); /* -1 if no loop */ + num_samples -= skip; + + + /* build the VGMSTREAM */ + vgmstream = allocate_vgmstream(channels, loop_flag); + if (!vgmstream) goto fail; + + vgmstream->meta_type = meta_LOPU; + vgmstream->sample_rate = sample_rate; + vgmstream->num_samples = num_samples; + vgmstream->loop_start_sample = loop_start; + vgmstream->loop_end_sample = loop_end; + +#ifdef VGM_USE_FFMPEG + vgmstream->codec_data = init_ffmpeg_switch_opus(sf, start_offset, data_size, vgmstream->channels, skip, vgmstream->sample_rate); + if (!vgmstream->codec_data) goto fail; + vgmstream->coding_type = coding_FFmpeg; + vgmstream->layout_type = layout_none; +#else + goto fail; +#endif + + if (!vgmstream_open_stream(vgmstream, sf, start_offset)) + goto fail; + return vgmstream; +fail: + close_vgmstream(vgmstream); + return NULL; +} diff --git a/src/meta/meta.h b/src/meta/meta.h index 32d354d9..5037602d 100644 --- a/src/meta/meta.h +++ b/src/meta/meta.h @@ -964,4 +964,6 @@ VGMSTREAM* init_vgmstream_xsh_xsd_xss(STREAMFILE* sf); VGMSTREAM* init_vgmstream_psb(STREAMFILE* sf); +VGMSTREAM* init_vgmstream_lopu(STREAMFILE* sf); + #endif /*_META_H*/ diff --git a/src/vgmstream.c b/src/vgmstream.c index f05370cb..95bf6bd8 100644 --- a/src/vgmstream.c +++ b/src/vgmstream.c @@ -527,6 +527,7 @@ VGMSTREAM* (*init_vgmstream_functions[])(STREAMFILE* sf) = { init_vgmstream_bnk_relic, init_vgmstream_xsh_xsd_xss, init_vgmstream_psb, + init_vgmstream_lopu, /* 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 */ diff --git a/src/vgmstream.h b/src/vgmstream.h index 8f536cbf..3aaf9e59 100644 --- a/src/vgmstream.h +++ b/src/vgmstream.h @@ -747,6 +747,7 @@ typedef enum { meta_BNK_RELIC, meta_XSH_XSD_XSS, meta_PSB, + meta_LOPU, } meta_t;