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

working de2

Browse Source 
git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@406 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
This commit is contained in:
halleyscometsw 2008-08-11 08:10:59 +00:00
parent a397d17741
commit 13f039645b
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/layout/de2_blocked.c
View File

@ -6,8 +6,8 @@ void de2_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
int i;
vgmstream->current_block_offset = block_offset;
vgmstream->current_block_size = read_32bitLE(
vgmstream->current_block_offset+4,
vgmstream->ch[0].streamfile)/2/vgmstream->channels;
vgmstream->current_block_offset,
vgmstream->ch[0].streamfile);
vgmstream->next_block_offset = block_offset+8+read_32bitLE(
vgmstream->current_block_offset,
vgmstream->ch[0].streamfile);

12
src/vgmstream.c
View File

@ -545,7 +545,7 @@ int get_vgmstream_samples_per_frame(VGMSTREAM * vgmstream) {
is for WS ADPCM */
return vgmstream->ws_output_size;
case coding_MSADPCM:
return (vgmstream->interleave_block_size-(7-1)*vgmstream->channels)*2;
return (vgmstream->interleave_block_size-(7-1)*vgmstream->channels)*2/vgmstream->channels;
default:
return 0;
}
@ -872,6 +872,7 @@ void decode_vgmstream(VGMSTREAM * vgmstream, int samples_written, int samples_to
vgmstream->samples_into_block,
samples_to_do);
}
break;
}
}
@ -1174,6 +1175,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
case coding_NWA5:
snprintf(temp,TEMPSIZE,"NWA DPCM Level 5");
break;
case coding_MSADPCM:
snprintf(temp,TEMPSIZE,"Microsoft 4-bit ADPCM");
break;
default:
snprintf(temp,TEMPSIZE,"CANNOT DECODE");
}
@ -1233,6 +1237,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
case layout_matx_blocked:
snprintf(temp,TEMPSIZE,"Matrix .matx blocked");
break;
case layout_de2_blocked:
snprintf(temp,TEMPSIZE,"de2 blocked");
break;
#ifdef VGM_USE_MPEG
case layout_fake_mpeg:
snprintf(temp,TEMPSIZE,"MPEG Audio stream with incorrect frame headers");
@ -1617,6 +1624,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
case meta_XBOX_MATX:
snprintf(temp,TEMPSIZE,"assumed Matrix file by .matx extension");
break;
case meta_DE2:
snprintf(temp,TEMPSIZE,"gurumin .de2 with embedded funky RIFF");
break;
default:
snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET");
}

1
unix/data.c
View File

@ -112,6 +112,7 @@ gchar *vgmstream_exts [] = {
"wvs",
"stma",
"matx",
"de2",
/* terminator */
NULL
};