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

small changes in FSB MPEG

Browse Source 
git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@966 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
This commit is contained in:
manakoat 2011-08-06 07:34:00 +00:00
parent 85e9303b61
commit 4db4ae8620
1 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/meta/fsb.c
View File

@ -183,7 +183,6 @@ VGMSTREAM * init_vgmstream_fsb3(STREAMFILE *streamFile) {
} }
else goto fail; else goto fail;
vgmstream->num_samples = read_32bitLE(0x38,streamFile); vgmstream->num_samples = read_32bitLE(0x38,streamFile);
if (loop_flag) { if (loop_flag) {
vgmstream->loop_start_sample = read_32bitLE(0x40,streamFile); vgmstream->loop_start_sample = read_32bitLE(0x40,streamFile);
@ -532,14 +531,9 @@ VGMSTREAM * init_vgmstream_fsb_mpeg(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM * vgmstream = NULL;
char filename[260]; char filename[260];
off_t start_offset; off_t start_offset;
int channel_count; int channel_count, channels, encoding, loop_flag, fsb_mainheader_len, fsb_subheader_len, FSBFlag;
int loop_flag; long sample_rate = 0, num_samples = 0, rate;
long sample_rate = 0; uint16_t mp3ID;
long num_samples = 0;
uint8_t mp3ID;
long rate;
int channels,encoding;
// int FSBFlag;
#ifdef VGM_USE_MPEG #ifdef VGM_USE_MPEG
mpeg_codec_data *mpeg_data = NULL; mpeg_codec_data *mpeg_data = NULL;
@ -551,36 +545,54 @@ VGMSTREAM * init_vgmstream_fsb_mpeg(STREAMFILE *streamFile) {
if (strcasecmp("fsb",filename_extension(filename))) goto fail; if (strcasecmp("fsb",filename_extension(filename))) goto fail;
/* check header */ /* check header */
if (read_32bitBE(0x00,streamFile) != 0x46534234) /* "FSB4" */ if (read_32bitBE(0x00,streamFile) == 0x46534233) /* "FSB3" */
{
fsb_mainheader_len = 0x18;
}
else if (read_32bitBE(0x00,streamFile) == 0x46534234) /* "FSB4" */
{
fsb_mainheader_len = 0x30;
}
else
{
goto fail; goto fail;
}
fsb_subheader_len = read_16bitLE(fsb_mainheader_len,streamFile);
/* "Check if the FSB is used as conatiner or as single file" */ /* "Check if the FSB is used as conatiner or as single file" */
if (read_32bitBE(0x04,streamFile) != 0x01000000) if (read_32bitBE(0x04,streamFile) != 0x01000000)
goto fail; goto fail;
#if 0
/* Check channel count, multi-channel not supported and will be refused */ /* Check channel count, multi-channel not supported and will be refused */
if ((read_16bitLE(0x6E,streamFile) != 0x2) && if ((read_16bitLE(0x6E,streamFile) != 0x2) &&
(read_16bitLE(0x6E,streamFile) != 0x1)) (read_16bitLE(0x6E,streamFile) != 0x1))
goto fail; goto fail;
#endif
start_offset = read_32bitLE(0x08,streamFile)+0x30; //read_32bitBE(0x4,streamFile); start_offset = fsb_mainheader_len+fsb_subheader_len+0x10;
mp3ID = read_8bit(start_offset,streamFile);
if (mp3ID != 0xFF) /* Check the MPEG Sync Header */
mp3ID = read_16bitLE(start_offset,streamFile);
if (mp3ID&0x7FF != 0x7FF)
goto fail; goto fail;
/* Still WIP */ channel_count = read_16bitLE(fsb_mainheader_len+0x3E,streamFile);
if (read_32bitBE(0x80,streamFile)==0x53594E43) if (channel_count != 1 && channel_count != 2)
loop_flag = 1; goto fail;
else
loop_flag = 0;
num_samples = (read_32bitLE(0x5C,streamFile)); FSBFlag = read_32bitLE(fsb_mainheader_len+0x30,streamFile);
if (FSBFlag&0x2 || FSBFlag&0x4 || FSBFlag&0x6)
loop_flag = 1;
num_samples = (read_32bitLE(fsb_mainheader_len+0x2C,streamFile));
#ifdef VGM_USE_MPEG #ifdef VGM_USE_MPEG
mpeg_data = init_mpeg_codec_data(streamFile, start_offset, -1, -1, &mpeg_coding_type, &rate, &channels); // -1 to not check sample rate or channels mpeg_data = init_mpeg_codec_data(streamFile, start_offset, -1, -1, &mpeg_coding_type, &rate, &channels); // -1 to not check sample rate or channels
if (!mpeg_data) goto fail; if (!mpeg_data) goto fail;
channel_count = channels; //channel_count = channels;
sample_rate = rate; sample_rate = rate;
#else #else
@ -598,8 +610,8 @@ VGMSTREAM * init_vgmstream_fsb_mpeg(STREAMFILE *streamFile) {
/* Still WIP */ /* Still WIP */
if (loop_flag) { if (loop_flag) {
vgmstream->loop_start_sample = read_32bitLE(0x58,streamFile); vgmstream->loop_start_sample = read_32bitLE(fsb_mainheader_len+0x28,streamFile);
vgmstream->loop_end_sample = read_32bitLE(0x5c,streamFile); vgmstream->loop_end_sample = read_32bitLE(fsb_mainheader_len+0x2C,streamFile);
} }
vgmstream->meta_type = meta_FSB_MPEG; vgmstream->meta_type = meta_FSB_MPEG;