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

Fix mono Xbox decoding, mono DSP start_offset; code cleanup

Browse Source
This commit is contained in:
bnnm 2017-01-26 23:31:02 +01:00
parent dfa9edea76
commit 802e414bdc
1 changed files with 33 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/meta/ads.c
View File

@ -1,18 +1,17 @@
#include "meta.h" #include "meta.h"
#include "../util.h" #include "../util.h"
#include "../coding/coding.h"
/* ADS (from Gauntlet Dark Legends (GC)) */ /* ADS - from Gauntlet Dark Legacy (GC/Xbox) */
VGMSTREAM * init_vgmstream_ads(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_ads(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM * vgmstream = NULL;
char filename[PATH_LIMIT];
off_t start_offset; off_t start_offset;
int loop_flag; int loop_flag;
int channel_count; int channel_count;
int identifer_byte; int identifer_byte;
/* check extension, case insensitive */ /* check extension, case insensitive */
streamFile->get_name(streamFile,filename,sizeof(filename)); if (!check_extensions(streamFile,"ads")) goto fail;
if (strcasecmp("ads",filename_extension(filename))) goto fail;
/* check dhSS Header */ /* check dhSS Header */
if (read_32bitBE(0x00,streamFile) != 0x64685353) if (read_32bitBE(0x00,streamFile) != 0x64685353)
@ -35,86 +34,52 @@ VGMSTREAM * init_vgmstream_ads(STREAMFILE *streamFile) {
/* fill in the vital statistics */ /* fill in the vital statistics */
identifer_byte = read_32bitBE(0x08,streamFile); identifer_byte = read_32bitBE(0x08,streamFile);
switch (identifer_byte) { switch (identifer_byte) {
case 0x00000020: case 0x00000020: /* GC */
start_offset = 0xE8; start_offset = 0x28 + 0x60 * channel_count;
vgmstream->channels = channel_count; vgmstream->channels = channel_count;
vgmstream->sample_rate = read_32bitBE(0x0c,streamFile); vgmstream->sample_rate = read_32bitBE(0x0c,streamFile);
vgmstream->coding_type = coding_NGC_DSP; vgmstream->coding_type = coding_NGC_DSP;
vgmstream->num_samples = read_32bitBE(0x28,streamFile); vgmstream->num_samples = read_32bitBE(0x28,streamFile);
if (loop_flag) { if (loop_flag) {
vgmstream->loop_start_sample = 0; vgmstream->loop_start_sample = 0;
vgmstream->loop_end_sample = vgmstream->num_samples; vgmstream->loop_end_sample = vgmstream->num_samples;
} }
if (channel_count == 1){ if (channel_count == 1){
vgmstream->layout_type = layout_none; vgmstream->layout_type = layout_none;
} else if (channel_count == 2){ } else if (channel_count == 2){
vgmstream->layout_type = layout_interleave; vgmstream->layout_type = layout_interleave;
vgmstream->interleave_block_size = read_32bitBE(0x14,streamFile); vgmstream->interleave_block_size = read_32bitBE(0x14,streamFile);
} }
break;
case 0x00000021: dsp_read_coefs_be(vgmstream, streamFile, 0x44,0x60);
break;
case 0x00000021: /* Xbox */
start_offset = 0x28; start_offset = 0x28;
vgmstream->channels = channel_count; vgmstream->channels = channel_count;
vgmstream->sample_rate = read_32bitBE(0x0c,streamFile); vgmstream->sample_rate = read_32bitBE(0x0c,streamFile);
vgmstream->coding_type = coding_INT_XBOX; vgmstream->coding_type = coding_INT_XBOX;
vgmstream->num_samples = (read_32bitBE(0x24,streamFile) / 36 *64 / vgmstream->channels)-64; // to avoid the "pop" at the loop point vgmstream->num_samples = (read_32bitBE(0x24,streamFile) / 36 *64 / vgmstream->channels)-64; // to avoid the "pop" at the loop point
vgmstream->layout_type = layout_interleave; vgmstream->layout_type = channel_count == 1 ? layout_none : layout_interleave;
vgmstream->interleave_block_size = 0x24; vgmstream->interleave_block_size = 0x24;
if (loop_flag) { if (loop_flag) {
vgmstream->loop_start_sample = 0; vgmstream->loop_start_sample = 0;
vgmstream->loop_end_sample = vgmstream->num_samples; vgmstream->loop_end_sample = vgmstream->num_samples;
} }
break; break;
default:
goto fail; default:
} goto fail;
}
vgmstream->meta_type = meta_ADS; vgmstream->meta_type = meta_ADS;
{ if (!vgmstream_open_stream(vgmstream, streamFile, start_offset))
int i; goto fail;
for (i=0;i<16;i++)
vgmstream->ch[0].adpcm_coef[i] = read_16bitBE(0x44+i*2,streamFile);
if (channel_count == 2) {
for (i=0;i<16;i++)
vgmstream->ch[1].adpcm_coef[i] = read_16bitBE(0xA4+i*2,streamFile);
}
}
/* open the file for reading */
if (vgmstream->coding_type == coding_NGC_DSP) {
int i,c;
for (c=0;c<channel_count;c++) {
for (i=0;i<16;i++) {
vgmstream->ch[c].adpcm_coef[i] =
read_16bitBE(0x44+c*0x60 +i*2,streamFile);
}
}
}
/* open the file for reading */
{
int i;
STREAMFILE * file;
file = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
if (!file) goto fail;
for (i=0;i<channel_count;i++) {
vgmstream->ch[i].streamfile = file;
vgmstream->ch[i].channel_start_offset=
start_offset+vgmstream->interleave_block_size*i;
vgmstream->ch[i].offset = vgmstream->ch[i].channel_start_offset;
}
}
return vgmstream; return vgmstream;
fail: fail:
/* clean up anything we may have opened */ close_vgmstream(vgmstream);
if (vgmstream) close_vgmstream(vgmstream);
return NULL; return NULL;
} }