adding thp movie audio file format

git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@511 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
This commit is contained in:
fastelbja 2008-12-11 23:16:09 +00:00
parent d818447cff
commit 828568bfef
7 changed files with 30 additions and 1 deletions

View File

@ -94,6 +94,9 @@ void render_vgmstream_blocked(sample * buffer, int32_t sample_count, VGMSTREAM *
case layout_xvas_blocked:
xvas_block_update(vgmstream->next_block_offset,vgmstream);
break;
case layout_thp_blocked:
thp_block_update(vgmstream->next_block_offset,vgmstream);
break;
default:
break;
}

View File

@ -34,6 +34,8 @@ void emff_block_update(off_t block_offset, VGMSTREAM * vgmstream);
void xvas_block_update(off_t block_offset, VGMSTREAM * vgmstream);
void thp_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);

View File

@ -658,6 +658,10 @@
RelativePath=".\meta\svs.c"
>
</File>
<File
RelativePath=".\meta\thp.c"
>
</File>
<File
RelativePath=".\meta\vgs.c"
>
@ -894,6 +898,10 @@
RelativePath=".\layout\str_snds_blocked.c"
>
</File>
<File
RelativePath=".\layout\thp_blocked.c"
>
</File>
<File
RelativePath=".\layout\vs_blocked.c"
>

View File

@ -316,4 +316,6 @@ VGMSTREAM * init_vgmstream_wii_smp(STREAMFILE * streamFile);
VGMSTREAM * init_vgmstream_emff(STREAMFILE * streamFile);
VGMSTREAM * init_vgmstream_thp(STREAMFILE *streamFile);
#endif

View File

@ -175,6 +175,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
init_vgmstream_wii_smp,
init_vgmstream_emff,
init_vgmstream_ss_stream,
init_vgmstream_thp,
};
#define INIT_VGMSTREAM_FCNS (sizeof(init_vgmstream_fcns)/sizeof(init_vgmstream_fcns[0]))
@ -532,6 +533,7 @@ void render_vgmstream(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstre
case layout_vs_blocked:
case layout_emff_blocked:
case layout_xvas_blocked:
case layout_thp_blocked:
render_vgmstream_blocked(buffer,sample_count,vgmstream);
break;
case layout_interleave_byte:
@ -1359,6 +1361,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
case layout_emff_blocked:
snprintf(temp,TEMPSIZE,"EMFF blocked");
break;
case layout_thp_blocked:
snprintf(temp,TEMPSIZE,"THP Movie Audio blocked");
break;
#ifdef VGM_USE_MPEG
case layout_fake_mpeg:
snprintf(temp,TEMPSIZE,"MPEG Audio stream with incorrect frame headers");
@ -1901,6 +1906,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
break;
case meta_EMFF:
snprintf(temp,TEMPSIZE,"Eidos Music File Format Header");
break;
case meta_THP:
snprintf(temp,TEMPSIZE,"THP Movie File Format Header");
break;
default:
snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET");

View File

@ -121,6 +121,7 @@ typedef enum {
layout_xvas_blocked,
layout_vs_blocked,
layout_emff_blocked,
layout_thp_blocked,
#if 0
layout_strm_blocked, /* */
@ -166,6 +167,8 @@ typedef enum {
meta_AST, /* AST */
meta_RWSD, /* single-stream RWSD */
meta_RSTM_SPM, /* RSTM with 44->22khz hack */
meta_THP,
/* CRI ADX */
meta_ADX_03, /* ADX "type 03" */
meta_ADX_04, /* ADX "type 04" */
@ -430,6 +433,8 @@ typedef struct {
void * start_vgmstream; /* a copy of the VGMSTREAM as it was at the beginning of the stream */
int32_t thpNextFrameSize;
/* Data the codec needs for the whole stream. This is for codecs too
* different from vgmstream's structure to be reasonably shoehorned into
* using the ch structures.

View File

@ -71,7 +71,7 @@ int decode_pos_samples = 0;
int stream_length_samples = 0;
int fade_samples = 0;
#define EXTENSION_LIST_SIZE 8192
#define EXTENSION_LIST_SIZE 9216
char working_extension_list[EXTENSION_LIST_SIZE] = {0};
char * extension_list[] = {
"adx\0ADX Audio File (*.ADX)\0",
@ -216,6 +216,7 @@ char * extension_list[] = {
"dcs\0DCS Audio File (*.DCS)\0",
"smp\0SMP Audio File (*.SMP)\0",
"emff\0EMFF Audio File (*.EMFF)\0",
"thp\0THP Audio File (*.THP)\0",
};
void about(HWND hwndParent) {