mirror of
https://github.com/vgmstream/vgmstream.git
synced 2025-01-17 23:36:41 +01:00
capdsp re-enabled
git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@732 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
This commit is contained in:
parent
a7feabe063
commit
e48638cab7
@ -6,7 +6,6 @@ VGMSTREAM * init_vgmstream_capdsp(STREAMFILE *streamFile) {
|
||||
VGMSTREAM * vgmstream = NULL;
|
||||
char filename[260];
|
||||
off_t start_offset;
|
||||
|
||||
int loop_flag;
|
||||
int channel_count;
|
||||
|
||||
@ -33,7 +32,7 @@ VGMSTREAM * init_vgmstream_capdsp(STREAMFILE *streamFile) {
|
||||
}
|
||||
|
||||
vgmstream->layout_type = layout_interleave;
|
||||
vgmstream->interleave_block_size = 0x2000;
|
||||
vgmstream->interleave_block_size = 0x4000;
|
||||
vgmstream->meta_type = meta_CAPDSP;
|
||||
|
||||
if (vgmstream->coding_type == coding_NGC_DSP) {
|
||||
@ -54,11 +53,9 @@ VGMSTREAM * init_vgmstream_capdsp(STREAMFILE *streamFile) {
|
||||
if (!file) goto fail;
|
||||
for (i=0;i<channel_count;i++) {
|
||||
vgmstream->ch[i].streamfile = file;
|
||||
|
||||
vgmstream->ch[i].channel_start_offset=
|
||||
vgmstream->ch[i].offset=start_offset+
|
||||
vgmstream->interleave_block_size*i;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -21,7 +21,7 @@ VGMSTREAM * init_vgmstream_dsp_ygo(STREAMFILE *streamFile) {
|
||||
if (strcasecmp("dsp",filename_extension(filename))) goto fail;
|
||||
|
||||
/* check file size with size given in header */
|
||||
if ((read_32bitBE(0x0,streamFile)+0xE0) != (get_streamfile_size(streamFile)))
|
||||
if ((read_32bitBE(0x0,streamFile)+0xE0) != (get_streamfile_size(streamFile)))
|
||||
goto fail;
|
||||
|
||||
loop_flag = (uint16_t)(read_16bitBE(0x2C,streamFile) != 0x0);
|
||||
@ -38,10 +38,10 @@ VGMSTREAM * init_vgmstream_dsp_ygo(STREAMFILE *streamFile) {
|
||||
vgmstream->coding_type = coding_NGC_DSP;
|
||||
vgmstream->num_samples = read_32bitBE(0x20,streamFile);
|
||||
vgmstream->layout_type = layout_none;
|
||||
vgmstream->meta_type = meta_DSP_YGO;
|
||||
if (loop_flag) {
|
||||
vgmstream->loop_start_sample = (read_32bitBE(0x30,streamFile)*14/16);
|
||||
vgmstream->loop_end_sample = (read_32bitBE(0x34,streamFile)*14/16);
|
||||
vgmstream->meta_type = meta_DSP_YGO;
|
||||
if (loop_flag) {
|
||||
vgmstream->loop_start_sample = (read_32bitBE(0x30,streamFile)*14/16);
|
||||
vgmstream->loop_end_sample = (read_32bitBE(0x34,streamFile)*14/16);
|
||||
}
|
||||
|
||||
// read coef stuff
|
||||
|
@ -2375,6 +2375,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
|
||||
break;
|
||||
case meta_PS2_AST:
|
||||
snprintf(temp,TEMPSIZE,"KOEI AST header");
|
||||
break;
|
||||
case meta_CAPDSP:
|
||||
snprintf(temp,TEMPSIZE,"Capcom custom DSP header");
|
||||
break;
|
||||
default:
|
||||
snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET");
|
||||
|
@ -76,7 +76,7 @@ char working_extension_list[EXTENSION_LIST_SIZE] = {0};
|
||||
char * extension_list[] = {
|
||||
/*WIP formats, enable on demand...! */
|
||||
#if 0
|
||||
"capdsp\0CAPDSP Audio File (*.CAPDSP)\0", /* Capcom custom coefs */
|
||||
|
||||
"pdt\0PDT Audio File (*.PDT)\0", /* Mario Party and some other games */
|
||||
#endif
|
||||
|
||||
@ -112,7 +112,8 @@ char * extension_list[] = {
|
||||
"brstm;brstmspm\0BRSTM Audio File (*.BRSTM)\0",
|
||||
|
||||
"caf\0CAF Audio File (*.CAF)\0",
|
||||
"ccc\0CCC Audio File (*.CCC)\0",
|
||||
"capdsp\0CAPDSP Audio File (*.CAPDSP)\0", /* Capcom custom coefs */
|
||||
"ccc\0CCC Audio File (*.CCC)\0",
|
||||
"cfn\0CFN Audio File (*.CFN)\0",
|
||||
"cnk\0CNK Audio File (*.CNK)\0",
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user