devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix a mistake in wrapping the echo buffer.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12414 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2007-02-20 13:06:11 +00:00
parent c187f18d5d
commit 46bb37add6
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/codecs/spc/Spc_Dsp.h
View file

@ -529,8 +529,8 @@ static void DSP_run_( struct Spc_Dsp* this, long count, int32_t* out_buf )
#ifdef CPU_COLDFIRE #ifdef CPU_COLDFIRE
/* Initialize mask register with the buffer address mask */ /* Initialize mask register with the buffer address mask */
asm ("move.l %[m], %%mask" : : [m]"i"(fir_buf_mask)); asm ("move.l %[m], %%mask" : : [m]"i"(fir_buf_mask));
const int echo_delay_mask = (this->r.g.echo_delay & 15) * 0x800 - 1; const int echo_wrap = (this->r.g.echo_delay & 15) * 0x800;
const int echo_page = this->r.g.echo_page * 0x100; const int echo_start = this->r.g.echo_page * 0x100;
#endif /* CPU_COLDFIRE */ #endif /* CPU_COLDFIRE */
#else #else
#define VOICE_RATE(x) (INT16A(raw_voice->rate) & 0x3FFF) #define VOICE_RATE(x) (INT16A(raw_voice->rate) & 0x3FFF)
@ -1081,8 +1081,10 @@ static void DSP_run_( struct Spc_Dsp* this, long count, int32_t* out_buf )
#ifdef CPU_COLDFIRE #ifdef CPU_COLDFIRE
/* Read feedback from echo buffer */ /* Read feedback from echo buffer */
int echo_pos = this->echo_pos; int echo_pos = this->echo_pos;
uint8_t* const echo_ptr = RAM + ((echo_page + echo_pos) & 0xFFFF); uint8_t* const echo_ptr = RAM + ((echo_start + echo_pos) & 0xFFFF);
echo_pos = (echo_pos + 4) & echo_delay_mask; echo_pos += 4;
if ( echo_pos >= echo_wrap )
echo_pos = 0;
this->echo_pos = echo_pos; this->echo_pos = echo_pos;
int fb = swap_odd_even32(*(int32_t *)echo_ptr); int fb = swap_odd_even32(*(int32_t *)echo_ptr);
int out_0, out_1; int out_0, out_1;