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

fix pop & click on cd-xa decoder

Browse Source 
git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@152 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
This commit is contained in:
fastelbja 2008-05-17 18:06:45 +00:00
parent 543444dfe4
commit fb0e5b5559
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/coding/xa_decoder.c
View File

@ -41,7 +41,9 @@ void decode_xa(VGMSTREAMCHANNEL * stream, sample * outbuf, int channelspacing, i
first_sample = first_sample % 28;
if(!first_sample)
get_high_nibble=!get_high_nibble;
if((first_sample) && (channelspacing==1))
get_high_nibble=!get_high_nibble;
predict_nr = read_8bit(stream->offset+HeadTable[framesin]+get_high_nibble,stream->streamfile) >> 4;

2
src/layout/xa_blocked.c
View File

@ -28,7 +28,7 @@ begin:
subAudio=read_8bit(block_offset-6,vgmstream->ch[0].streamfile);
// audio is coded as 0x64
if((subAudio!=0x64) || (currentChannel!=vgmstream->xa_channel)) {
if(!((subAudio==0x64) && (currentChannel==vgmstream->xa_channel))) {
// go to next sector
block_offset+=2352;
if(currentChannel!=-1) goto begin;

33
src/meta/psx_cdxa.c
View File

@ -21,6 +21,7 @@ VGMSTREAM * init_vgmstream_cdxa(const char * const filename) {
int channel_count;
uint8_t bCoding;
off_t start_offset;
int i;
@ -37,7 +38,14 @@ VGMSTREAM * init_vgmstream_cdxa(const char * const filename) {
(read_32bitBE(0x0C,infile) == 0x666D7420)))
goto fail;
bCoding = read_8bit(0x3F,infile);
/* First init to have the correct info of the channel */
start_offset=init_xa_channel(0,infile);
/* No sound ? */
if(start_offset==0)
goto fail;
bCoding = read_8bit(start_offset-5,infile);
switch (AUDIO_CODING_GET_STEREO(bCoding)) {
case 0: channel_count = 1; break;
@ -51,6 +59,7 @@ VGMSTREAM * init_vgmstream_cdxa(const char * const filename) {
/* fill in the vital statistics */
vgmstream->channels = channel_count;
vgmstream->xa_channel = 0;
switch (AUDIO_CODING_GET_FREQ(bCoding)) {
case 0: vgmstream->sample_rate = 37800; break;
@ -75,8 +84,8 @@ VGMSTREAM * init_vgmstream_cdxa(const char * const filename) {
if (!vgmstream->ch[i].streamfile) goto fail;
}
}
xa_block_update(init_xa_channel(0,vgmstream),vgmstream);
xa_block_update(start_offset,vgmstream);
return vgmstream;
@ -87,21 +96,23 @@ fail:
return NULL;
}
// in extension, we can use this fonction to set the channel
// we want to listen to ...
off_t init_xa_channel(int channel,VGMSTREAM* vgmstream) {
off_t init_xa_channel(int channel,STREAMFILE* infile) {
off_t block_offset=0x44;
size_t filelength=get_streamfile_size(infile);
int8_t currentChannel;
int8_t subAudio;
vgmstream->xa_channel=channel;
begin:
currentChannel=read_8bit(block_offset-7,vgmstream->ch[0].streamfile);
subAudio=read_8bit(block_offset-6,vgmstream->ch[0].streamfile);
if ((currentChannel!=channel) && (subAudio==0x64)) {
// 0 can't be a correct value
if(block_offset>=filelength)
return 0;
currentChannel=read_8bit(block_offset-7,infile);
subAudio=read_8bit(block_offset-6,infile);
if (!((currentChannel==channel) && (subAudio==0x64))) {
block_offset+=2352;
goto begin;
}