Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-01-17 23:36:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some AIX [Danball Senki (PSP), Tetris Collection (PS2)]

Browse Source
This commit is contained in:
bnnm 2019-02-23 17:12:20 +01:00
parent e5ddc9337a
commit cb93647cdd
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/meta/aix.c
View File

@ -3,7 +3,7 @@
#include "aix_streamfile.h" #include "aix_streamfile.h"
#define MAX_SEGMENTS 10 /* usually segment0=intro, segment1=loop/main, sometimes ~5 */ #define MAX_SEGMENTS 50 /* usually segment0=intro, segment1=loop/main, sometimes ~5, rarely ~40 */
static VGMSTREAM *build_segmented_vgmstream(STREAMFILE *streamFile, off_t *segment_offsets, size_t *segment_sizes, int32_t *segment_samples, int segment_count, int layer_count); static VGMSTREAM *build_segmented_vgmstream(STREAMFILE *streamFile, off_t *segment_offsets, size_t *segment_sizes, int32_t *segment_samples, int segment_count, int layer_count);
@ -16,10 +16,7 @@ VGMSTREAM * init_vgmstream_aix(STREAMFILE *sf) {
int32_t segment_samples[MAX_SEGMENTS] = {0}; int32_t segment_samples[MAX_SEGMENTS] = {0};
int segment_rates[MAX_SEGMENTS] = {0}; int segment_rates[MAX_SEGMENTS] = {0};
off_t data_offset; off_t data_offset, subtable_offset;
off_t layer_list_offset;
off_t layer_list_end;
int segment_count, layer_count; int segment_count, layer_count;
int i; int i;
@ -44,11 +41,10 @@ VGMSTREAM * init_vgmstream_aix(STREAMFILE *sf) {
const size_t segment_list_entry_size = 0x10; const size_t segment_list_entry_size = 0x10;
segment_count = read_u16be(0x18,sf); segment_count = read_u16be(0x18,sf);
if (segment_count < 1 || segment_count > MAX_SEGMENTS) goto fail; if (segment_count < 1 || segment_count > MAX_SEGMENTS) goto fail;
layer_list_offset = segment_list_offset + segment_count*segment_list_entry_size + 0x10; subtable_offset = segment_list_offset + segment_count*segment_list_entry_size;
if (layer_list_offset >= data_offset) goto fail; if (subtable_offset >= data_offset) goto fail;
for (i = 0; i < segment_count; i++) { for (i = 0; i < segment_count; i++) {
segment_offsets[i] = read_s32be(segment_list_offset + segment_list_entry_size*i + 0x00,sf); segment_offsets[i] = read_s32be(segment_list_offset + segment_list_entry_size*i + 0x00,sf);
@ -70,9 +66,17 @@ VGMSTREAM * init_vgmstream_aix(STREAMFILE *sf) {
goto fail; goto fail;
} }
/* between the segment and layer table some kind of 0x10 subtable? */
if (read_u8(subtable_offset,sf) != 0x01)
goto fail;
/* parse layers table */ /* parse layers table */
{ {
const size_t layer_list_entry_size = 0x08; const size_t layer_list_entry_size = 0x08;
off_t layer_list_offset, layer_list_end;
layer_list_offset = subtable_offset + 0x10;
if (layer_list_offset >= data_offset) goto fail;
layer_count = read_u8(layer_list_offset,sf); layer_count = read_u8(layer_list_offset,sf);
if (layer_count < 1) goto fail; if (layer_count < 1) goto fail;
@ -166,9 +170,15 @@ static VGMSTREAM *build_segmented_vgmstream(STREAMFILE *streamFile, off_t *segme
if (!setup_layout_segmented(data)) if (!setup_layout_segmented(data))
goto fail; goto fail;
loop_flag = (segment_count > 0); /* known loop cases:
loop_start_segment = 1; * - 1 segment: main/no loop [Hatsune Miku: Project Diva (PSP)]
loop_end_segment = 1; /* looks correct in some games (DBZ: Burst Limit, Metroid: Other M) */ * - 2 segments: intro + loop [SoulCalibur IV (PS3)]
* - 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;
/* build the segmented VGMSTREAM */ /* build the segmented VGMSTREAM */
vgmstream = allocate_segmented_vgmstream(data, loop_flag, loop_start_segment, loop_end_segment); vgmstream = allocate_segmented_vgmstream(data, loop_flag, loop_start_segment, loop_end_segment);

8
src/meta/aix_streamfile.h
View File

@ -56,6 +56,14 @@ static size_t aix_io_read(STREAMFILE *streamfile, uint8_t *dest, off_t offset, s
/* 0x0c: -1 */ /* 0x0c: -1 */
data->skip_size = 0x10; data->skip_size = 0x10;
} }
/* strange AIX in Tetris Collection (PS2) with padding before ADX start (no known flag) */
if (data->logical_offset == 0x00 &&
read_u32be(data->physical_offset + 0x10, streamfile) == 0 &&
read_u16be(data->physical_offset + data->block_size - 0x28, streamfile) == 0x8000) {
data->data_size = 0x28;
data->skip_size = data->block_size - 0x28;
}
} }
/* move to next block */ /* move to next block */