Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-01-21 00:38:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #707 from bxaimc/master

Browse Source 
Little Endian AST
This commit is contained in:
bxaimc 2020-09-15 07:06:41 -04:00 committed by GitHub
commit 86fbfffd88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/layout/blocked_ast.c
View File

@ -6,9 +6,10 @@ void block_update_ast(off_t block_offset, VGMSTREAM * vgmstream) {
STREAMFILE* streamFile = vgmstream->ch[0].streamfile;
int i;
size_t block_data, header_size;
int32_t(*read_32bit)(off_t, STREAMFILE*) = vgmstream->codec_endian ? read_32bitBE : read_32bitLE;
/* 0x00: "BLCK", rest: null */
block_data = read_32bitBE(block_offset+0x04,streamFile);
block_data = read_32bit(block_offset+0x04,streamFile);
header_size = 0x20;
vgmstream->current_block_offset = block_offset;

44
src/meta/ast.c
View File

@ -7,37 +7,51 @@ VGMSTREAM * init_vgmstream_ast(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL;
off_t start_offset;
int loop_flag, channel_count, codec;
int big_endian;
int32_t (*read_32bit)(off_t,STREAMFILE*) = NULL;
int16_t (*read_16bit)(off_t,STREAMFILE*) = NULL;
/* checks */
if (!check_extensions(streamFile, "ast"))
goto fail;
if (read_32bitBE(0x00,streamFile) != 0x5354524D) /* "STRM" */
if (((uint32_t)read_32bitBE(0x00, streamFile) == 0x5354524D) && /* "STRM" */
((uint32_t)read_32bitBE(0x40, streamFile) == 0x424C434B)) { /* "BLCK" */
read_32bit = read_32bitBE;
read_16bit = read_16bitBE;
big_endian = 1;
} else if (((uint32_t)read_32bitBE(0x00, streamFile) == 0x4D525453) && /* "MRTS" */ // Super Mario Galaxy (Super Mario 3D All-Stars (Switch))
((uint32_t)read_32bitBE(0x40, streamFile) == 0x4B434C42)) { /* "KCLB" */
read_32bit = read_32bitLE;
read_16bit = read_16bitLE;
big_endian = 0;
} else {
goto fail;
if (read_16bitBE(0x0a,streamFile) != 0x10) /* ? */
}
if (read_16bit(0x0a,streamFile) != 0x10) /* ? */
goto fail;
if (read_32bitBE(0x04,streamFile)+0x40 != get_streamfile_size(streamFile))
goto fail;
codec = read_16bitBE(0x08,streamFile);
channel_count = read_16bitBE(0x0c,streamFile);
loop_flag = read_16bitBE(0x0e,streamFile);
//max_block = read_32bitBE(0x20,streamFile);
start_offset = 0x40;
if (read_32bitBE(start_offset,streamFile) != 0x424C434B) /* "BLCK" */
if (read_32bit(0x04,streamFile)+0x40 != get_streamfile_size(streamFile))
goto fail;
codec = read_16bitBE(0x08,streamFile); // always big-endian?
channel_count = read_16bit(0x0c,streamFile);
loop_flag = read_16bit(0x0e,streamFile);
//max_block = read_32bit(0x20,streamFile);
start_offset = 0x40;
/* build the VGMSTREAM */
vgmstream = allocate_vgmstream(channel_count,loop_flag);
if (!vgmstream) goto fail;
vgmstream->meta_type = meta_AST;
vgmstream->sample_rate = read_32bitBE(0x10,streamFile);
vgmstream->num_samples = read_32bitBE(0x14,streamFile);
vgmstream->loop_start_sample = read_32bitBE(0x18,streamFile);
vgmstream->loop_end_sample = read_32bitBE(0x1c,streamFile);
vgmstream->sample_rate = read_32bit(0x10,streamFile);
vgmstream->num_samples = read_32bit(0x14,streamFile);
vgmstream->loop_start_sample = read_32bit(0x18,streamFile);
vgmstream->loop_end_sample = read_32bit(0x1c,streamFile);
vgmstream->codec_endian = big_endian;
vgmstream->layout_type = layout_blocked_ast;
switch (codec) {