Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-17 20:07:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

correct genh

Browse Source 
git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@477 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
This commit is contained in:
fastelbja 2008-11-17 18:45:09 +00:00
parent 29819a79d4
commit e67a69da29
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/meta/genh.c
View File

@ -19,8 +19,7 @@ VGMSTREAM * init_vgmstream_genh(STREAMFILE *streamFile) {
int32_t loop_end; int32_t loop_end;
int32_t start_offset; int32_t start_offset;
int32_t header_size; int32_t header_size;
int32_t coef1; int32_t coef[2];
int32_t coef2;
char filename[260]; char filename[260];
int coding; int coding;
@ -119,10 +118,10 @@ VGMSTREAM * init_vgmstream_genh(STREAMFILE *streamFile) {
loop_start = read_32bitLE(0x10,streamFile); loop_start = read_32bitLE(0x10,streamFile);
loop_end = read_32bitLE(0x14,streamFile); loop_end = read_32bitLE(0x14,streamFile);
coef1 = read_32bitLE(0x24,streamFile); coef[0] = read_32bitLE(0x24,streamFile);
coef2 = read_32bitLE(0x28,streamFile); coef[1] = read_32bitLE(0x28,streamFile);
if (coding == coding_XBOX && channel_count != 2) goto fail; //if (coding == coding_XBOX && channel_count != 2) goto fail;
/* build the VGMSTREAM */ /* build the VGMSTREAM */
vgmstream = allocate_vgmstream(channel_count,(loop_start!=-1)); vgmstream = allocate_vgmstream(channel_count,(loop_start!=-1));
@ -137,7 +136,6 @@ VGMSTREAM * init_vgmstream_genh(STREAMFILE *streamFile) {
vgmstream->loop_end_sample = loop_end; vgmstream->loop_end_sample = loop_end;
vgmstream->loop_flag = (loop_start != -1); vgmstream->loop_flag = (loop_start != -1);
vgmstream->coding_type = coding;
switch (coding) { switch (coding) {
case coding_PCM16LE: case coding_PCM16LE:
case coding_PCM16BE: case coding_PCM16BE:
@ -154,7 +152,15 @@ VGMSTREAM * init_vgmstream_genh(STREAMFILE *streamFile) {
coding = coding_SDX2_int; coding = coding_SDX2_int;
vgmstream->coding_type = coding_SDX2_int; vgmstream->coding_type = coding_SDX2_int;
} }
if(vgmstream->interleave_block_size==0xffffffff)
vgmstream->layout_type=layout_none;
else {
vgmstream->layout_type = layout_interleave; vgmstream->layout_type = layout_interleave;
if(coding==coding_DVI_IMA)
coding=coding_INT_DVI_IMA;
if(coding==coding_IMA)
coding=coding_INT_IMA;
}
} else { } else {
vgmstream->layout_type = layout_none; vgmstream->layout_type = layout_none;
} }
@ -174,6 +180,7 @@ VGMSTREAM * init_vgmstream_genh(STREAMFILE *streamFile) {
case coding_NGC_DSP: case coding_NGC_DSP:
if (channel_count > 1) { if (channel_count > 1) {
vgmstream->layout_type = layout_interleave; vgmstream->layout_type = layout_interleave;
vgmstream->interleave_block_size = interleave;
} else { } else {
vgmstream->layout_type = layout_none; vgmstream->layout_type = layout_none;
} }
@ -186,6 +193,7 @@ VGMSTREAM * init_vgmstream_genh(STREAMFILE *streamFile) {
#endif #endif
} }
vgmstream->coding_type = coding;
vgmstream->meta_type = meta_GENH; vgmstream->meta_type = meta_GENH;
/* open the file for reading by each channel */ /* open the file for reading by each channel */
@ -208,6 +216,8 @@ VGMSTREAM * init_vgmstream_genh(STREAMFILE *streamFile) {
case coding_IMA: case coding_IMA:
case coding_PCM8: case coding_PCM8:
case coding_AICA: case coding_AICA:
case coding_INT_DVI_IMA:
case coding_INT_IMA:
if (vgmstream->layout_type == layout_interleave) { if (vgmstream->layout_type == layout_interleave) {
if (interleave >= 512) { if (interleave >= 512) {
chstreamfile = chstreamfile =
@ -239,15 +249,13 @@ VGMSTREAM * init_vgmstream_genh(STREAMFILE *streamFile) {
streamFile->open(streamFile,filename,32*0x400); streamFile->open(streamFile,filename,32*0x400);
break; break;
case coding_NGC_DSP: case coding_NGC_DSP:
for (j=0;j<16;j++) { if (!chstreamfile)
vgmstream->ch[0].adpcm_coef[j] = read_16bitBE(coef1+j*2,streamFile); chstreamfile =
} streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
if (vgmstream->channels == 2) {
for (j=0;j<16;j++) { for (j=0;j<16;j++)
vgmstream->ch[1].adpcm_coef[j] = read_16bitBE(coef2+j*2,streamFile); vgmstream->ch[i].adpcm_coef[j] = read_16bitBE(coef[i]+j*2,streamFile);
} break;
}
break;
#ifdef VGM_USE_MPEG #ifdef VGM_USE_MPEG
case coding_MPEG1_L3: case coding_MPEG1_L3: