chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Update vgmstream for Super Smash Bros. Wii U

Browse source
This commit is contained in:
Chris Moeller 2014-12-13 17:05:15 -08:00
parent bb7fcd31da
commit 78be8bbec3
1 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Frameworks/vgmstream/vgmstream/src/meta/ngc_dsp_std.c
View file

@ -601,6 +601,7 @@ VGMSTREAM * init_vgmstream_3ds_idsp(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM * vgmstream = NULL;
char filename[PATH_LIMIT]; char filename[PATH_LIMIT];
off_t idsp_offset = 0;
off_t start_offset; off_t start_offset;
off_t interleave; off_t interleave;
@ -609,19 +610,37 @@ VGMSTREAM * init_vgmstream_3ds_idsp(STREAMFILE *streamFile) {
int channel_count; int channel_count;
/* check extension, case insensitive */ /* check extension, case insensitive */
streamFile->get_name(streamFile,filename,sizeof(filename)); //streamFile->get_name(streamFile,filename,sizeof(filename));
if (strcasecmp("idsp",filename_extension(filename))) goto fail; //if (strcasecmp("idsp",filename_extension(filename))) goto fail;
/* check header magic */ /* check header magic */
if (read_32bitBE(0x0,streamFile) != 0x49445350) goto fail; /* "IDSP" */ if( read_32bitBE(0x0,streamFile) != 0x49445350 )
{
channel_count = read_32bitBE(0x8, streamFile); /* check header magic */
if (channel_count != 2) goto fail; if (read_32bitBE(0,streamFile) != 0x4E555333) goto fail; /* "NUS3" */
if (read_dsp_header(&ch0_header, 0x40, streamFile)) goto fail; /* Header size */
if (channel_count == 2 && read_dsp_header(&ch1_header, 0xa0, streamFile)) goto fail; idsp_offset = 0x14 + read_32bitLE( 0x10, streamFile );
start_offset = read_32bitBE(0x28,streamFile); idsp_offset += read_32bitLE( 0x1C, streamFile ) + 8;
idsp_offset += read_32bitLE( 0x24, streamFile ) + 8;
idsp_offset += read_32bitLE( 0x2C, streamFile ) + 8;
idsp_offset += read_32bitLE( 0x34, streamFile ) + 8;
idsp_offset += read_32bitLE( 0x3C, streamFile ) + 8;
idsp_offset += read_32bitLE( 0x44, streamFile ) + 8;
idsp_offset += 8;
}
/* check magic */
if (read_32bitBE(idsp_offset,streamFile) != 0x49445350) goto fail; /* "IDSP" */
channel_count = read_32bitBE(idsp_offset+0x8, streamFile);
if(channel_count != 2 && channel_count != 1) goto fail;
if (read_dsp_header(&ch0_header, idsp_offset+0x40, streamFile)) goto fail;
if (channel_count == 2 && read_dsp_header(&ch1_header, idsp_offset+0xa0, streamFile)) goto fail;
start_offset = read_32bitBE(idsp_offset+0x28,streamFile) + idsp_offset;
interleave = 16; interleave = 16;
/* check initial predictor/scale */ /* check initial predictor/scale */
@ -639,9 +658,9 @@ VGMSTREAM * init_vgmstream_3ds_idsp(STREAMFILE *streamFile) {
if ( channel_count == 2 &&( if ( channel_count == 2 &&(
ch0_header.sample_count != ch1_header.sample_count || ch0_header.sample_count != ch1_header.sample_count ||
ch0_header.nibble_count != ch1_header.nibble_count || ch0_header.nibble_count != ch1_header.nibble_count ||
ch0_header.sample_rate != ch1_header.sample_rate || ch0_header.sample_rate != ch1_header.sample_rate ||
ch0_header.sample_rate != read_32bitBE(0xc, streamFile) || ch0_header.sample_rate != read_32bitBE(idsp_offset+0xc, streamFile) ||
ch0_header.loop_flag != ch1_header.loop_flag || ch0_header.loop_flag != ch1_header.loop_flag ||
ch0_header.loop_start_offset != ch1_header.loop_start_offset || ch0_header.loop_start_offset != ch1_header.loop_start_offset ||
ch0_header.loop_end_offset != ch1_header.loop_end_offset ch0_header.loop_end_offset != ch1_header.loop_end_offset
)) goto fail; )) goto fail;
@ -2593,7 +2612,7 @@ struct csmp_chunk {
VGMSTREAM * init_vgmstream_ngc_dsp_csmp(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_ngc_dsp_csmp(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM * vgmstream = NULL;
char filename[PATH_LIMIT]; char filename[PATH_LIMIT];
off_t current_offset; long current_offset;
int tries; int tries;
struct dsp_header header; struct dsp_header header;