mirror of
https://github.com/vgmstream/vgmstream.git
synced 2025-01-31 20:25:23 +01:00
Add .nxa looping + Fixed Opus [Gensou Rougoku no Kaleidoscope (Switch)]
This commit is contained in:
parent
550c1ba701
commit
12d9b0b97c
@ -548,6 +548,8 @@ typedef struct {
|
||||
/* frame table */
|
||||
off_t table_offset;
|
||||
int table_count;
|
||||
/* fixed frames */
|
||||
uint16_t frame_size;
|
||||
} opus_config;
|
||||
|
||||
ffmpeg_codec_data* init_ffmpeg_switch_opus_config(STREAMFILE* sf, off_t start_offset, size_t data_size, opus_config* cfg);
|
||||
@ -557,6 +559,7 @@ ffmpeg_codec_data* init_ffmpeg_ea_opus(STREAMFILE* sf, off_t start_offset, size_
|
||||
ffmpeg_codec_data* init_ffmpeg_x_opus(STREAMFILE* sf, off_t table_offset, int table_count, off_t data_offset, size_t data_size, int channels, int skip);
|
||||
ffmpeg_codec_data* init_ffmpeg_fsb_opus(STREAMFILE* sf, off_t start_offset, size_t data_size, int channels, int skip, int sample_rate);
|
||||
ffmpeg_codec_data* init_ffmpeg_wwise_opus(STREAMFILE* sf, off_t data_offset, size_t data_size, opus_config* cfg);
|
||||
ffmpeg_codec_data* init_ffmpeg_fixed_opus(STREAMFILE* sf, off_t data_offset, size_t data_size, opus_config* cfg);
|
||||
|
||||
size_t switch_opus_get_samples(off_t offset, size_t stream_size, STREAMFILE* sf);
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
* https://github.com/hcs64/ww2ogg
|
||||
*/
|
||||
|
||||
typedef enum { OPUS_SWITCH, OPUS_UE4_v1, OPUS_UE4_v2, OPUS_EA, OPUS_X, OPUS_FSB, OPUS_WWISE } opus_type_t;
|
||||
typedef enum { OPUS_SWITCH, OPUS_UE4_v1, OPUS_UE4_v2, OPUS_EA, OPUS_X, OPUS_FSB, OPUS_WWISE, OPUS_FIXED } opus_type_t;
|
||||
|
||||
static size_t make_oggs_first(uint8_t *buf, int buf_size, opus_config *cfg);
|
||||
static size_t make_oggs_page(uint8_t *buf, int buf_size, size_t data_size, int page_sequence, int granule);
|
||||
@ -36,6 +36,9 @@ typedef struct {
|
||||
int table_count;
|
||||
uint16_t* frame_table;
|
||||
|
||||
/* fixed frame size for variations that use this */
|
||||
uint16_t frame_size;
|
||||
|
||||
/* state */
|
||||
off_t logical_offset; /* offset that corresponds to physical_offset */
|
||||
off_t physical_offset; /* actual file offset */
|
||||
@ -130,6 +133,10 @@ static size_t opus_io_read(STREAMFILE* sf, uint8_t *dest, off_t offset, size_t l
|
||||
data_size = get_table_frame_size(data, data->sequence - 2);
|
||||
skip_size = 0;
|
||||
break;
|
||||
case OPUS_FIXED:
|
||||
data_size = data->frame_size;
|
||||
skip_size = 0;
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
@ -231,6 +238,10 @@ static size_t opus_io_size(STREAMFILE* sf, opus_io_data* data) {
|
||||
data_size = get_table_frame_size(data, packet);
|
||||
skip_size = 0x00;
|
||||
break;
|
||||
case OPUS_FIXED:
|
||||
data_size = data->frame_size;
|
||||
skip_size = 0;
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
@ -295,7 +306,7 @@ static void opus_io_close(STREAMFILE* sf, opus_io_data* data) {
|
||||
|
||||
|
||||
/* Prepares custom IO for custom Opus, that is converted to Ogg Opus on the fly */
|
||||
static STREAMFILE* setup_opus_streamfile(STREAMFILE* sf, opus_config *cfg, off_t stream_offset, size_t stream_size, opus_type_t type) {
|
||||
static STREAMFILE* setup_opus_streamfile(STREAMFILE* sf, opus_config* cfg, off_t stream_offset, size_t stream_size, opus_type_t type) {
|
||||
STREAMFILE* new_sf = NULL;
|
||||
opus_io_data io_data = {0};
|
||||
|
||||
@ -308,6 +319,7 @@ static STREAMFILE* setup_opus_streamfile(STREAMFILE* sf, opus_config *cfg, off_t
|
||||
io_data.physical_offset = stream_offset;
|
||||
io_data.table_offset = cfg->table_offset;
|
||||
io_data.table_count = cfg->table_count;
|
||||
io_data.frame_size = cfg->frame_size;
|
||||
|
||||
io_data.head_size = make_oggs_first(io_data.head_buffer, sizeof(io_data.head_buffer), cfg);
|
||||
if (!io_data.head_size) goto fail;
|
||||
@ -612,12 +624,16 @@ static size_t custom_opus_get_samples(off_t offset, size_t stream_size, STREAMFI
|
||||
skip_size = 0x02;
|
||||
break;
|
||||
|
||||
#if 0 // needs data* for frame table, but num_samples should exist on header
|
||||
#if 0 //needs data*, num_samples should exist on header
|
||||
case OPUS_X:
|
||||
case OPUS_WWISE:
|
||||
data_size = get_table_frame_size(data, packet);
|
||||
skip_size = 0x00;
|
||||
break;
|
||||
case OPUS_FIXED:
|
||||
data_size = data->frame_size;
|
||||
skip_size = 0;
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
return 0;
|
||||
@ -661,6 +677,11 @@ static size_t custom_opus_get_encoder_delay(off_t offset, STREAMFILE* sf, opus_t
|
||||
case OPUS_WWISE:
|
||||
skip_size = 0x00;
|
||||
break;
|
||||
#if 0 //should exist on header
|
||||
case OPUS_FIXED:
|
||||
skip_size = 0x00;
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
@ -756,6 +777,9 @@ ffmpeg_codec_data* init_ffmpeg_fsb_opus(STREAMFILE* sf, off_t start_offset, size
|
||||
ffmpeg_codec_data* init_ffmpeg_wwise_opus(STREAMFILE* sf, off_t data_offset, size_t data_size, opus_config* cfg) {
|
||||
return init_ffmpeg_custom_opus_config(sf, data_offset, data_size, cfg, OPUS_WWISE);
|
||||
}
|
||||
ffmpeg_codec_data* init_ffmpeg_fixed_opus(STREAMFILE* sf, off_t data_offset, size_t data_size, opus_config* cfg) {
|
||||
return init_ffmpeg_custom_opus_config(sf, data_offset, data_size, cfg, OPUS_FIXED);
|
||||
}
|
||||
|
||||
static opus_type_t get_ue4opus_version(STREAMFILE* sf, off_t offset) {
|
||||
int read_samples, calc_samples;
|
||||
|
137
src/meta/nxa.c
137
src/meta/nxa.c
@ -1,58 +1,79 @@
|
||||
#include "meta.h"
|
||||
#include "../coding/coding.h"
|
||||
|
||||
|
||||
/* Entergram NXA Opus [Higurashi no Naku Koro ni Hou (Switch)] */
|
||||
VGMSTREAM * init_vgmstream_opus_nxa(STREAMFILE *streamFile) {
|
||||
VGMSTREAM * vgmstream = NULL;
|
||||
off_t start_offset;
|
||||
int loop_flag = 0, channel_count;
|
||||
size_t data_size, skip = 0;
|
||||
|
||||
/* checks */
|
||||
if (!check_extensions(streamFile, "nxa"))
|
||||
goto fail;
|
||||
if (read_32bitBE(0x00, streamFile) != 0x4E584131) /* "NXA1" */
|
||||
goto fail;
|
||||
|
||||
channel_count = read_16bitLE(0x10, streamFile);
|
||||
skip = read_16bitLE(0x16, streamFile);
|
||||
data_size = read_32bitLE(0x08, streamFile)-0x30;
|
||||
start_offset = 0x30;
|
||||
|
||||
/* TODO: Determine if loop points are stored externally. No visible loop points in header */
|
||||
loop_flag = 0;
|
||||
|
||||
|
||||
/* build the VGMSTREAM */
|
||||
vgmstream = allocate_vgmstream(channel_count, loop_flag);
|
||||
if (!vgmstream) goto fail;
|
||||
|
||||
vgmstream->meta_type = meta_NXA;
|
||||
vgmstream->num_samples = read_32bitLE(0x20, streamFile);
|
||||
vgmstream->sample_rate = read_32bitLE(0x0C, streamFile);
|
||||
|
||||
#ifdef VGM_USE_FFMPEG
|
||||
{
|
||||
vgmstream->codec_data = init_ffmpeg_switch_opus(streamFile, 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;
|
||||
|
||||
if (vgmstream->num_samples == 0) {
|
||||
vgmstream->num_samples = switch_opus_get_samples(start_offset, data_size, streamFile) - skip;
|
||||
}
|
||||
}
|
||||
#else
|
||||
goto fail;
|
||||
#endif
|
||||
|
||||
/* open the file for reading */
|
||||
if (!vgmstream_open_stream(vgmstream, streamFile, start_offset))
|
||||
goto fail;
|
||||
return vgmstream;
|
||||
|
||||
fail:
|
||||
close_vgmstream(vgmstream);
|
||||
return NULL;
|
||||
}
|
||||
#include "meta.h"
|
||||
#include "../coding/coding.h"
|
||||
|
||||
|
||||
/* Entergram NXA Opus [Higurashi no Naku Koro ni Hou (Switch), Gensou Rougoku no Kaleidoscope (Switch)] */
|
||||
VGMSTREAM* init_vgmstream_opus_nxa(STREAMFILE* sf) {
|
||||
VGMSTREAM* vgmstream = NULL;
|
||||
off_t start_offset;
|
||||
int loop_flag, channels, type, sample_rate;
|
||||
int32_t num_samples, loop_start, loop_end, skip;
|
||||
size_t data_size, frame_size;
|
||||
|
||||
/* checks */
|
||||
if (!check_extensions(sf, "nxa"))
|
||||
goto fail;
|
||||
if (!is_id32be(0x00, sf, "NXA1"))
|
||||
goto fail;
|
||||
|
||||
start_offset = 0x30;
|
||||
type = read_u32le(0x04, sf);
|
||||
data_size = read_u32le(0x08, sf) - start_offset;
|
||||
sample_rate = read_u32le(0x0C, sf);
|
||||
channels = read_s16le(0x10, sf);
|
||||
frame_size = read_u16le(0x12, sf);
|
||||
/* 0x14: frame samples */
|
||||
skip = read_s16le(0x16, sf);
|
||||
num_samples = read_s32le(0x18, sf);
|
||||
loop_start = read_s32le(0x1c, sf);
|
||||
loop_end = read_s32le(0x20, sf);
|
||||
/* rest: null */
|
||||
|
||||
loop_flag = (loop_start > 0);
|
||||
|
||||
|
||||
/* build the VGMSTREAM */
|
||||
vgmstream = allocate_vgmstream(channels, loop_flag);
|
||||
if (!vgmstream) goto fail;
|
||||
|
||||
vgmstream->meta_type = meta_NXA;
|
||||
vgmstream->sample_rate = sample_rate;
|
||||
vgmstream->num_samples = num_samples;
|
||||
vgmstream->loop_start_sample = loop_start;
|
||||
vgmstream->loop_end_sample = loop_end;
|
||||
|
||||
switch(type) {
|
||||
#ifdef VGM_USE_FFMPEG
|
||||
case 1: { /* Higurashi no Naku Koro ni Hou (Switch) */
|
||||
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;
|
||||
break;
|
||||
}
|
||||
|
||||
case 2: { /* Gensou Rougoku no Kaleidoscope (Switch) */
|
||||
opus_config cfg = {0};
|
||||
|
||||
cfg.channels = channels;
|
||||
cfg.skip = skip;
|
||||
cfg.frame_size = frame_size;
|
||||
|
||||
vgmstream->codec_data = init_ffmpeg_fixed_opus(sf, start_offset, data_size, &cfg);
|
||||
if (!vgmstream->codec_data) goto fail;
|
||||
vgmstream->coding_type = coding_FFmpeg;
|
||||
vgmstream->layout_type = layout_none;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
default:
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (!vgmstream_open_stream(vgmstream, sf, start_offset))
|
||||
goto fail;
|
||||
return vgmstream;
|
||||
fail:
|
||||
close_vgmstream(vgmstream);
|
||||
return NULL;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user