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

adding xbox XVAS

Browse Source 
git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@414 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
This commit is contained in:
fastelbja 2008-08-19 11:34:16 +00:00
parent 821ffc9136
commit 85d882a36a
9 changed files with 120 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/layout/blocked.c
View File

@ -85,6 +85,8 @@ void render_vgmstream_blocked(sample * buffer, int32_t sample_count, VGMSTREAM *
case layout_de2_blocked:
de2_block_update(vgmstream->next_block_offset,vgmstream);
break;
case layout_xvas_blocked:
xvas_block_update(vgmstream->next_block_offset,vgmstream);
default:
break;
}

2
src/layout/layout.h
View File

@ -28,6 +28,8 @@ void matx_block_update(off_t block_offset, VGMSTREAM * vgmstream);
void de2_block_update(off_t block_offset, VGMSTREAM * vgmstream);
void xvas_block_update(off_t block_offset, VGMSTREAM * vgmstream);
void render_vgmstream_interleave(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstream);
void render_vgmstream_nolayout(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstream);

24
src/layout/xvas_block.c Normal file
View File

@ -0,0 +1,24 @@
#include "layout.h"
#include "../vgmstream.h"
/* set up for the block at the given offset */
void xvas_block_update(off_t block_offset, VGMSTREAM * vgmstream) {
int i;
vgmstream->current_block_offset = block_offset;
if((vgmstream->current_block_offset-get_streamfile_size(vgmstream->ch[0].streamfile))>(0x20000-0x20))
vgmstream->current_block_size = 0x20000-0x20;
else
vgmstream->current_block_size = vgmstream->current_block_offset-get_streamfile_size(vgmstream->ch[0].streamfile)-0x20;
vgmstream->next_block_offset =
vgmstream->current_block_offset +
(vgmstream->current_block_size + 0x20);
for (i=0;i<vgmstream->channels;i++) {
vgmstream->ch[i].offset = vgmstream->current_block_offset;
}
vgmstream->current_block_size /=2;
}

8
src/libvgmstream.vcproj
View File

@ -560,6 +560,10 @@
RelativePath=".\meta\xbox_xmu.c"
>
</File>
<File
RelativePath=".\meta\xbox_xvas.c"
>
</File>
<File
RelativePath=".\meta\xbox_xwav.c"
>
@ -752,6 +756,10 @@
RelativePath=".\layout\xa_blocked.c"
>
</File>
<File
RelativePath=".\layout\xvas_block.c"
>
</File>
</Filter>
</Filter>
</Files>

2
src/meta/meta.h
View File

@ -205,4 +205,6 @@ VGMSTREAM * init_vgmstream_de2(STREAMFILE *streamFile);
VGMSTREAM * init_vgmstream_xbox_xmu(STREAMFILE *streamFile);
VGMSTREAM * init_vgmstream_xbox_xvas(STREAMFILE *streamFile);
#endif

71
src/meta/xbox_xvas.c Normal file
View File

@ -0,0 +1,71 @@
#include "meta.h"
#include "../util.h"
/* XVAS
XVAS (found in TMNT 2 & TMNT 3))
*/
VGMSTREAM * init_vgmstream_xbox_xvas(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL;
char filename[260];
int loop_flag=0;
int channel_count;
int i;
/* check extension, case insensitive */
streamFile->get_name(streamFile,filename,sizeof(filename));
if (strcasecmp("xvas",filename_extension(filename))) goto fail;
if((read_32bitLE(0x00,streamFile)!=0x69) &&
(read_32bitLE(0x08,streamFile)!=0x48))
goto fail;
/* No Loop found atm */
loop_flag = (read_32bitLE(0x14,streamFile)==read_32bitLE(0x24,streamFile));
/* Always stereo files */
channel_count=read_32bitLE(0x04,streamFile);
/* build the VGMSTREAM */
vgmstream = allocate_vgmstream(channel_count,loop_flag);
if (!vgmstream) goto fail;
/* fill in the vital statistics */
vgmstream->channels = channel_count;
vgmstream->sample_rate = read_32bitLE(0x0c,streamFile);
vgmstream->coding_type = coding_XBOX;
vgmstream->num_samples = read_32bitLE(0x24,streamFile);
vgmstream->num_samples -= ((vgmstream->num_samples/0x20000)*0x20);
vgmstream->num_samples = vgmstream->num_samples / 36 * 64 / vgmstream->channels;
vgmstream->layout_type = layout_xvas_blocked;
vgmstream->meta_type = meta_XBOX_XVAS;
if(loop_flag) {
vgmstream->loop_start_sample = read_32bitLE(0x10,streamFile);
vgmstream->loop_start_sample -= ((vgmstream->loop_start_sample/0x20000)*0x20);
vgmstream->loop_start_sample = vgmstream->loop_start_sample / 36 * 64 / vgmstream->channels;
vgmstream->loop_end_sample=vgmstream->num_samples;
}
/* open the file for reading by each channel */
{
for (i=0;i<channel_count;i++) {
vgmstream->ch[i].streamfile = streamFile->open(streamFile,filename,36);
vgmstream->ch[i].offset = 0x800;
if (!vgmstream->ch[i].streamfile) goto fail;
}
}
xvas_block_update(0x800,vgmstream);
return vgmstream;
/* clean up anything we may have opened */
fail:
if (vgmstream) close_vgmstream(vgmstream);
return NULL;
}

8
src/vgmstream.c
View File

@ -117,6 +117,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
init_vgmstream_de2,
init_vgmstream_dc_str,
init_vgmstream_xbox_xmu,
init_vgmstream_xbox_xvas,
};
#define INIT_VGMSTREAM_FCNS (sizeof(init_vgmstream_fcns)/sizeof(init_vgmstream_fcns[0]))
@ -466,6 +467,7 @@ void render_vgmstream(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstre
case layout_ws_aud_blocked:
case layout_matx_blocked:
case layout_de2_blocked:
case layout_xvas_blocked:
render_vgmstream_blocked(buffer,sample_count,vgmstream);
break;
case layout_interleave_byte:
@ -1237,6 +1239,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
case layout_wsi_blocked:
snprintf(temp,TEMPSIZE,".wsi blocked");
break;
case layout_xvas_blocked:
snprintf(temp,TEMPSIZE,".xvas blocked");
break;
#ifdef VGM_USE_VORBIS
case layout_ogg_vorbis:
snprintf(temp,TEMPSIZE,"Ogg");
@ -1647,6 +1652,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
case meta_XBOX_XMU:
snprintf(temp,TEMPSIZE,"XMU header");
break;
case meta_XBOX_XVAS:
snprintf(temp,TEMPSIZE,"assumed TMNT file by .xvas extension");
break;
default:
snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET");
}

2
src/vgmstream.h
View File

@ -114,6 +114,7 @@ typedef enum {
layout_ws_aud_blocked,
layout_matx_blocked,
layout_de2_blocked,
layout_xvas_blocked,
#if 0
layout_strm_blocked, /* */
#endif
@ -233,6 +234,7 @@ typedef enum {
meta_XBOX_STMA, /* XBOX STMA */
meta_XBOX_MATX, /* XBOX MATX */
meta_XBOX_XMU, /* XBOX XMU */
meta_XBOX_XVAS, /* XBOX VAS */
meta_EAXA_R2, /* EA XA Release 2 */
meta_EAXA_R3, /* EA XA Release 3 */

1
winamp/in_vgmstream.c
View File

@ -175,6 +175,7 @@ char * extension_list[] = {
"matx\0MATX Audio File (*.MATX)\0",
"de2\0DE2 Audio File (*.DE2)\0",
"xmu\0XMU Audio File (*.XMU)\0",
"xvas\0XVAS Audio File (*.XVAS)\0",
};
void about(HWND hwndParent) {