mirror of
https://github.com/vgmstream/vgmstream.git
synced 2025-01-18 07:44:43 +01:00
JOE header fixed
git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@691 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
This commit is contained in:
manakoAT
parent
cf92497382
commit
9d1d7078e5
@ -1,7 +1,7 @@
|
||||
#include "meta.h"
|
||||
#include "../util.h"
|
||||
|
||||
/* WAC - WAD - WAM (Beyond Good & Evil GC) */
|
||||
/* WAC - WAD - WAM (Beyond Good & Evil GC/PS2) */
|
||||
VGMSTREAM * init_vgmstream_waa_wac_wad_wam(STREAMFILE *streamFile) {
|
||||
VGMSTREAM * vgmstream = NULL;
|
||||
char filename[260];
|
||||
@ -10,6 +10,8 @@ VGMSTREAM * init_vgmstream_waa_wac_wad_wam(STREAMFILE *streamFile) {
|
||||
int channel_count;
|
||||
int coef1_start;
|
||||
int coef2_start;
|
||||
int i;
|
||||
unsigned short encoder;
|
||||
int second_channel_start;
|
||||
|
||||
streamFile->get_name(streamFile,filename,sizeof(filename));
|
||||
@ -22,70 +24,112 @@ VGMSTREAM * init_vgmstream_waa_wac_wad_wam(STREAMFILE *streamFile) {
|
||||
if (read_32bitBE(0x00,streamFile) != 0x52494646 || /* "RIFF" */
|
||||
read_32bitBE(0x08,streamFile) != 0x57415645 || /* "WAVE" */
|
||||
read_32bitBE(0x0C,streamFile) != 0x666D7420 || /* "fmt\0x20" */
|
||||
read_32bitBE(0x10,streamFile) != 0x12000000 || /* "0x12000000" */
|
||||
read_16bitBE(0x14,streamFile) != (int16_t)0xFEFF) /* "FEFF" */
|
||||
read_32bitBE(0x10,streamFile) != 0x12000000) /* "0x12000000" */
|
||||
goto fail;
|
||||
|
||||
loop_flag = 1;
|
||||
/* files don't contain looping information,
|
||||
so the looping is not done depending on extension.
|
||||
wam and waa contain ambient sounds and music, so often they contain
|
||||
looped music. Change extension to wac or wad to make the sound non-looping.
|
||||
*/
|
||||
loop_flag = strcasecmp("wac",filename_extension(filename)) &&
|
||||
strcasecmp("wad",filename_extension(filename));
|
||||
channel_count = (uint16_t)read_16bitLE(0x16,streamFile);
|
||||
encoder = read_16bitBE(0x14,streamFile);
|
||||
|
||||
/* build the VGMSTREAM */
|
||||
vgmstream = allocate_vgmstream(channel_count,loop_flag);
|
||||
if (!vgmstream) goto fail;
|
||||
|
||||
/* fill in the vital statistics */
|
||||
start_offset = 0x5C;
|
||||
vgmstream->channels = channel_count;
|
||||
vgmstream->sample_rate = read_32bitLE(0x18,streamFile);
|
||||
vgmstream->coding_type = coding_NGC_DSP;
|
||||
vgmstream->num_samples = (read_32bitLE(0x2A,streamFile))*14/8/channel_count;
|
||||
if (loop_flag) {
|
||||
vgmstream->loop_start_sample = 0;
|
||||
vgmstream->loop_end_sample = (read_32bitLE(0x2A,streamFile))*14/8/channel_count;
|
||||
}
|
||||
vgmstream->layout_type = layout_none;
|
||||
vgmstream->meta_type = meta_WAA_WAC_WAD_WAM;
|
||||
/* Check what encoder is needed */
|
||||
switch( encoder )
|
||||
{
|
||||
//FIXME: //PC version uses pcm, but which encoder?
|
||||
//FIXME: //Rayman Ravin Rabid Games on the wii use it with an unknown encoder yet
|
||||
case 0xFFFF: //PS2 adpcm
|
||||
/* fill in the vital statistics */
|
||||
start_offset = 0x7e;
|
||||
vgmstream->channels = channel_count;
|
||||
vgmstream->sample_rate = read_32bitLE(0x18,streamFile);
|
||||
vgmstream->coding_type = coding_PSX;
|
||||
vgmstream->num_samples = (read_32bitLE(0x2A,streamFile))/16*28/channel_count;
|
||||
if (loop_flag) {
|
||||
vgmstream->loop_start_sample = 0;
|
||||
vgmstream->loop_end_sample = (read_32bitLE(0x2A,streamFile))/16*28/channel_count;
|
||||
}
|
||||
vgmstream->layout_type = layout_none;
|
||||
vgmstream->meta_type = meta_WAA_WAC_WAD_WAM;
|
||||
vgmstream->interleave_block_size = read_16bitLE(0x20,streamFile);
|
||||
|
||||
/* Retrieveing the coef tables and the start of the second channel*/
|
||||
coef1_start = 0x2E;
|
||||
coef2_start = (read_32bitLE(0x2A,streamFile)/2)+0x5C;
|
||||
second_channel_start = coef2_start+0x2E;
|
||||
{
|
||||
for (i=0;i<channel_count;i++) {
|
||||
vgmstream->ch[i].streamfile = streamFile->open(streamFile,filename,start_offset);
|
||||
|
||||
if (!vgmstream->ch[i].streamfile) goto fail;
|
||||
|
||||
vgmstream->ch[i].channel_start_offset=
|
||||
vgmstream->ch[i].offset=
|
||||
(off_t)(start_offset+vgmstream->interleave_block_size*i);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 0xFeFF: //game cube DSP
|
||||
/* fill in the vital statistics */
|
||||
start_offset = 0x5C;
|
||||
vgmstream->channels = channel_count;
|
||||
vgmstream->sample_rate = read_32bitLE(0x18,streamFile);
|
||||
vgmstream->coding_type = coding_NGC_DSP;
|
||||
vgmstream->num_samples = (read_32bitLE(0x2A,streamFile))*14/8/channel_count;
|
||||
if (loop_flag) {
|
||||
vgmstream->loop_start_sample = 0;
|
||||
vgmstream->loop_end_sample = (read_32bitLE(0x2A,streamFile))*14/8/channel_count;
|
||||
}
|
||||
vgmstream->layout_type = layout_none;
|
||||
vgmstream->meta_type = meta_WAA_WAC_WAD_WAM;
|
||||
|
||||
/* Retrieveing the coef tables and the start of the second channel*/
|
||||
coef1_start = 0x2E;
|
||||
coef2_start = (read_32bitLE(0x2A,streamFile)/2)+0x5C;
|
||||
second_channel_start = coef2_start+0x2E;
|
||||
|
||||
{
|
||||
int i;
|
||||
for (i=0;i<16;i++)
|
||||
vgmstream->ch[0].adpcm_coef[i] = read_16bitBE(coef1_start+i*2,streamFile);
|
||||
if (channel_count == 2) {
|
||||
for (i=0;i<16;i++)
|
||||
vgmstream->ch[1].adpcm_coef[i] = read_16bitBE(coef2_start+i*2,streamFile);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* open the file for reading */
|
||||
{
|
||||
int i;
|
||||
for (i=0;i<16;i++)
|
||||
vgmstream->ch[0].adpcm_coef[i] = read_16bitBE(coef1_start+i*2,streamFile);
|
||||
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;
|
||||
|
||||
/* The first channel */
|
||||
vgmstream->ch[0].channel_start_offset=
|
||||
vgmstream->ch[0].offset=start_offset;
|
||||
|
||||
/* The second channel */
|
||||
if (channel_count == 2) {
|
||||
for (i=0;i<16;i++)
|
||||
vgmstream->ch[1].adpcm_coef[i] = read_16bitBE(coef2_start+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;
|
||||
|
||||
/* The first channel */
|
||||
vgmstream->ch[0].channel_start_offset=
|
||||
vgmstream->ch[0].offset=start_offset;
|
||||
|
||||
/* The second channel */
|
||||
if (channel_count == 2) {
|
||||
vgmstream->ch[1].streamfile = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
|
||||
|
||||
if (!vgmstream->ch[1].streamfile) goto fail;
|
||||
|
||||
vgmstream->ch[1].channel_start_offset=
|
||||
vgmstream->ch[1].offset=second_channel_start;
|
||||
vgmstream->ch[1].streamfile = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
|
||||
|
||||
if (!vgmstream->ch[1].streamfile) goto fail;
|
||||
|
||||
vgmstream->ch[1].channel_start_offset=
|
||||
vgmstream->ch[1].offset=second_channel_start;
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
goto fail;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return vgmstream;
|
||||
|
||||
@ -19,8 +19,8 @@ VGMSTREAM * init_vgmstream_ps2_joe(STREAMFILE *streamFile) {
|
||||
if (strcasecmp("joe",filename_extension(filename))) goto fail;
|
||||
|
||||
/* check header */
|
||||
if (read_32bitBE(0x0C,streamFile) != 0xCCCCCCCC)
|
||||
goto fail;
|
||||
// if (read_32bitBE(0x0C,streamFile) != 0xCCCCCCCC)
|
||||
// goto fail;
|
||||
|
||||
loop_flag = 1;
|
||||
channel_count = 2;
|
||||
@ -38,7 +38,7 @@ VGMSTREAM * init_vgmstream_ps2_joe(STREAMFILE *streamFile) {
|
||||
|
||||
|
||||
fileLength = get_streamfile_size(streamFile);
|
||||
|
||||
readOffset = start_offset;
|
||||
do {
|
||||
|
||||
readOffset+=(off_t)read_streamfile(testBuffer,readOffset,0x10,streamFile);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user