Merge pull request #1136 from bnnm/aix

aix
This commit is contained in:
bnnm 2022-05-08 13:32:42 +02:00 committed by GitHub
commit b1d6e689dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -7,28 +7,34 @@
* as pseudo dynamic/multi-song container [Sega Ages 2500 Vol 28 Tetris Collection (PS2)] */
#define MAX_SEGMENTS 120
static VGMSTREAM* build_segmented_vgmstream(STREAMFILE* sf, off_t* segment_offsets, size_t* segment_sizes, int32_t* segment_samples, int segment_count, int layer_count);
typedef struct {
uint32_t segment_offsets[MAX_SEGMENTS];
uint32_t segment_sizes[MAX_SEGMENTS];
int32_t segment_samples[MAX_SEGMENTS];
int segment_rates[MAX_SEGMENTS];
int segment_count;
int layer_count;
} aix_header_t;
static VGMSTREAM* build_segmented_vgmstream(STREAMFILE* sf, aix_header_t* aix);
/* AIX - N segments with M layers (2ch ADX) inside [SoulCalibur IV (PS3), Dragon Ball Z: Burst Limit (PS3)] */
VGMSTREAM* init_vgmstream_aix(STREAMFILE* sf) {
VGMSTREAM* vgmstream = NULL;
off_t segment_offsets[MAX_SEGMENTS] = {0};
size_t segment_sizes[MAX_SEGMENTS] = {0};
int32_t segment_samples[MAX_SEGMENTS] = {0};
int segment_rates[MAX_SEGMENTS] = {0};
aix_header_t aix = {0};
off_t data_offset, subtable_offset;
int segment_count, layer_count;
int i;
/* checks */
if (!is_id32be(0x00, sf, "AIXF"))
goto fail;
if (!check_extensions(sf, "aix"))
goto fail;
if (read_u32be(0x00,sf) != 0x41495846 || /* "AIXF" */
read_u32be(0x08,sf) != 0x01000014 || /* version? */
read_u32be(0x0c,sf) != 0x00000800)
if (read_u32be(0x08,sf) != 0x01000014 || /* version? */
read_u32be(0x0c,sf) != 0x00000800) /* header size? */
goto fail;
/* AIX combine layers for multichannel and segments for looping, all very hacky.
@ -42,30 +48,41 @@ VGMSTREAM* init_vgmstream_aix(STREAMFILE* sf) {
const off_t segment_list_offset = 0x20;
const size_t segment_list_entry_size = 0x10;
segment_count = read_u16be(0x18,sf);
if (segment_count < 1 || segment_count > MAX_SEGMENTS) goto fail;
aix.segment_count = read_u16be(0x18,sf);
if (aix.segment_count < 1 || aix.segment_count > MAX_SEGMENTS) goto fail;
subtable_offset = segment_list_offset + segment_count*segment_list_entry_size;
subtable_offset = segment_list_offset + aix.segment_count * segment_list_entry_size;
if (subtable_offset >= data_offset) goto fail;
for (i = 0; i < segment_count; i++) {
segment_offsets[i] = read_s32be(segment_list_offset + segment_list_entry_size*i + 0x00,sf);
segment_sizes[i] = read_u32be(segment_list_offset + segment_list_entry_size*i + 0x04,sf);
segment_samples[i] = read_s32be(segment_list_offset + segment_list_entry_size*i + 0x08,sf);
segment_rates[i] = read_s32be(segment_list_offset + segment_list_entry_size*i + 0x0c,sf);
for (i = 0; i < aix.segment_count; i++) {
aix.segment_offsets[i] = read_s32be(segment_list_offset + segment_list_entry_size*i + 0x00,sf);
aix.segment_sizes[i] = read_u32be(segment_list_offset + segment_list_entry_size*i + 0x04,sf);
aix.segment_samples[i] = read_s32be(segment_list_offset + segment_list_entry_size*i + 0x08,sf);
aix.segment_rates[i] = read_s32be(segment_list_offset + segment_list_entry_size*i + 0x0c,sf);
/* segments > 0 can have 0 sample rate, seems to indicate same as first
* [Ryu ga Gotoku: Kenzan! (PS3) tenkei_sng1.aix] */
if (i > 0 && segment_rates[i] == 0)
segment_rates[i] = segment_rates[0];
if (i > 0 && aix.segment_rates[i] == 0)
aix.segment_rates[i] = aix.segment_rates[0];
/* all segments must have equal sample rate */
if (segment_rates[i] != segment_rates[0])
if (aix.segment_rates[i] != aix.segment_rates[0])
goto fail;
}
if (segment_offsets[0] != data_offset)
if (aix.segment_offsets[0] != data_offset)
goto fail;
/* Metroid: Other M (Wii)'s bgm_m_stage_06_02 is truncated on disc, seemingly not an extraction error.
* Playing expected samples aligns to bgm_m_stage_06, so not sure how the game would actually play it,
* tweaking samples to max size sounds a bit abrupt. */
if (aix.segment_count == 3 && aix.segment_offsets[1] + aix.segment_sizes[1] > get_streamfile_size(sf)) {
aix.segment_count = 2;
aix.segment_sizes[1] = get_streamfile_size(sf) - aix.segment_offsets[1];
//aix.segment_samples[1] = 0;
vgm_logi("AIX: missing data, parts will be silent\n");
}
}
/* between the segment and layer table some kind of 0x10 subtable? */
@ -80,15 +97,15 @@ VGMSTREAM* init_vgmstream_aix(STREAMFILE* sf) {
layer_list_offset = subtable_offset + 0x10;
if (layer_list_offset >= data_offset) goto fail;
layer_count = read_u8(layer_list_offset,sf);
if (layer_count < 1) goto fail;
aix.layer_count = read_u8(layer_list_offset,sf);
if (aix.layer_count < 1) goto fail;
layer_list_end = layer_list_offset + 0x08 + layer_count*layer_list_entry_size;
layer_list_end = layer_list_offset + 0x08 + aix.layer_count * layer_list_entry_size;
if (layer_list_end >= data_offset) goto fail;
for (i = 0; i < layer_count; i++) {
for (i = 0; i < aix.layer_count; i++) {
/* all layers must have same sample rate as segments */
if (read_s32be(layer_list_offset + 0x08 + i*layer_list_entry_size + 0x00,sf) != segment_rates[0])
if (read_s32be(layer_list_offset + 0x08 + i * layer_list_entry_size + 0x00,sf) != aix.segment_rates[0])
goto fail;
/* 0x04: layer channels */
}
@ -96,7 +113,7 @@ VGMSTREAM* init_vgmstream_aix(STREAMFILE* sf) {
/* build combo layers + segments VGMSTREAM */
vgmstream = build_segmented_vgmstream(sf, segment_offsets, segment_sizes, segment_samples, segment_count, layer_count);
vgmstream = build_segmented_vgmstream(sf, &aix);
if (!vgmstream) goto fail;
vgmstream->meta_type = meta_AIX;
@ -108,7 +125,7 @@ fail:
return NULL;
}
static VGMSTREAM *build_layered_vgmstream(STREAMFILE* sf, off_t segment_offset, size_t segment_size, int layer_count) {
static VGMSTREAM* build_layered_vgmstream(STREAMFILE* sf, aix_header_t* aix, int segment) {
VGMSTREAM* vgmstream = NULL;
layered_layout_data* data = NULL;
int i;
@ -116,12 +133,12 @@ static VGMSTREAM *build_layered_vgmstream(STREAMFILE* sf, off_t segment_offset,
/* build layers */
data = init_layout_layered(layer_count);
data = init_layout_layered(aix->layer_count);
if (!data) goto fail;
for (i = 0; i < layer_count; i++) {
for (i = 0; i < aix->layer_count; i++) {
/* build the layer STREAMFILE */
temp_sf = setup_aix_streamfile(sf, segment_offset, segment_size, i, "adx");
temp_sf = setup_aix_streamfile(sf, aix->segment_offsets[segment], aix->segment_sizes[segment], i, "adx");
if (!temp_sf) goto fail;
/* build the sub-VGMSTREAM */
@ -130,6 +147,18 @@ static VGMSTREAM *build_layered_vgmstream(STREAMFILE* sf, off_t segment_offset,
data->layers[i]->stream_size = get_streamfile_size(temp_sf);
#if 0
/* for rare truncated AIX */
if (aix->segment_samples[segment] == 0) {
VGMSTREAM* vl = data->layers[i];
uint32_t offset = read_u16be(0x02, temp_sf) + 0x04;
uint32_t size = vl->stream_size - offset;
uint32_t frames = size / vl->interleave_block_size / vl->channels;
vl->num_samples = frames * ((vl->interleave_block_size - 2) * 2) + 0x100;
}
#endif
close_streamfile(temp_sf);
temp_sf = NULL;
}
@ -151,24 +180,30 @@ fail:
return NULL;
}
static VGMSTREAM *build_segmented_vgmstream(STREAMFILE* sf, off_t* segment_offsets, size_t* segment_sizes, int32_t* segment_samples, int segment_count, int layer_count) {
static VGMSTREAM* build_segmented_vgmstream(STREAMFILE* sf, aix_header_t* aix) {
VGMSTREAM* vgmstream = NULL;
segmented_layout_data* data = NULL;
int i, loop_flag, loop_start_segment, loop_end_segment;
/* build segments */
data = init_layout_segmented(segment_count);
data = init_layout_segmented(aix->segment_count);
if (!data) goto fail;
for (i = 0; i < segment_count; i++) {
for (i = 0; i < aix->segment_count; i++) {
/* build the layered sub-VGMSTREAM */
data->segments[i] = build_layered_vgmstream(sf, segment_offsets[i], segment_sizes[i], layer_count);
data->segments[i] = build_layered_vgmstream(sf, aix, i);
if (!data->segments[i]) goto fail;
data->segments[i]->num_samples = segment_samples[i]; /* just in case */
data->segments[i]->stream_size = aix->segment_sizes[i];
data->segments[i]->stream_size = segment_sizes[i];
data->segments[i]->num_samples = aix->segment_samples[i];
#if 0
/* should be the same as layer's */
if (aix->segment_samples[i] != 0) {
data->segments[i]->num_samples = aix->segment_samples[i];
}
#endif
}
if (!setup_layout_segmented(data))
@ -180,9 +215,9 @@ static VGMSTREAM *build_segmented_vgmstream(STREAMFILE* sf, off_t* segment_offse
* - 3 segments: intro + loop + end [Dragon Ball Z: Burst Limit (PS3), Metroid: Other M (Wii)]
* - 4/5 segments: intros + loop + ends [Danball Senki (PSP)]
* - +39 segments: no loops but multiple segments for dynamic parts? [Tetris Collection (PS2)] */
loop_flag = (segment_count > 0 && segment_count <= 5);
loop_start_segment = (segment_count > 3) ? 2 : 1;
loop_end_segment = (segment_count > 3) ? (segment_count - 2) : 1;
loop_flag = (aix->segment_count > 0 && aix->segment_count <= 5);
loop_start_segment = (aix->segment_count > 3) ? 2 : 1;
loop_end_segment = (aix->segment_count > 3) ? (aix->segment_count - 2) : 1;
/* build the segmented VGMSTREAM */
vgmstream = allocate_segmented_vgmstream(data, loop_flag, loop_start_segment, loop_end_segment);