X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fspu.c;h=b89ab1af8c120ba4a25a379a5da9a94f110e8bef;hp=bf02946185b3873429badb9099aa514e320baa71;hb=ee9afdbd4d9e0aee75dd9e17878c76f1c7236d04;hpb=b72f17a1320e9038c8416343ce270b0f676c757c diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index bf029461..b89ab1af 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -24,7 +24,8 @@ #include "externals.h" #include "registers.h" -#include "dsoundoss.h" +#include "out.h" +#include "arm_features.h" #ifdef ENABLE_NLS #include @@ -243,7 +244,7 @@ INLINE void InterpolateDown(int ch) // helpers for gauss interpolation #define gval0 (((short*)(&s_chan[ch].SB[29]))[gpos]) -#define gval(x) (((short*)(&s_chan[ch].SB[29]))[(gpos+x)&3]) +#define gval(x) ((int)((short*)(&s_chan[ch].SB[29]))[(gpos+x)&3]) #include "gauss_i.h" @@ -296,8 +297,6 @@ INLINE void StartSound(int ch) {s_chan[ch].spos=0x30000L;s_chan[ch].SB[28]=0;} // -> start with more decoding else {s_chan[ch].spos=0x10000L;s_chan[ch].SB[31]=0;} // -> no/simple interpolation starts with one 44100 decoding - check_irq(ch, s_chan[ch].pCurr); // just in case - dwNewChannel&=~(1<> 6) & ~3; gpos = s_chan[ch].SB[28]; - vr=(gauss[vl]*gval0)&~2047; + vr=(gauss[vl]*(int)gval0)&~2047; vr+=(gauss[vl+1]*gval(1))&~2047; vr+=(gauss[vl+2]*gval(2))&~2047; vr+=(gauss[vl+3]*gval(3))&~2047; @@ -445,21 +444,29 @@ static int decode_block(int ch) { unsigned char *start; int predict_nr,shift_factor,flags; + int stop = 0; int ret = 0; - start=s_chan[ch].pCurr; // set up the current pos + start = s_chan[ch].pCurr; // set up the current pos + if(start == spuMemC) // ? + stop = 1; if(s_chan[ch].prevflags&1) // 1: stop/loop { if(!(s_chan[ch].prevflags&2)) - { - dwChannelOn&=~(1< turn everything off - s_chan[ch].bStop=1; - s_chan[ch].ADSRX.EnvelopeVol=0; - } + stop = 1; start = s_chan[ch].pLoop; } + else + ret = check_irq(ch, start); // hack, see check_irq below.. + + if(stop) + { + dwChannelOn &= ~(1< turn everything off + s_chan[ch].bStop = 1; + s_chan[ch].ADSRX.EnvelopeVol = 0; + } predict_nr=(int)start[0]; shift_factor=predict_nr&0xf; @@ -473,14 +480,14 @@ static int decode_block(int ch) start+=16; - if(flags&1) // 1: stop/loop + if(flags&1) { // 1: stop/loop start = s_chan[ch].pLoop; + ret |= check_irq(ch, start); // hack.. :( + } if (start - spuMemC >= 0x80000) start = spuMemC; - ret = check_irq(ch, start); - s_chan[ch].pCurr = start; // store values for next cycle s_chan[ch].prevflags = flags; @@ -492,6 +499,7 @@ static int skip_block(int ch) { unsigned char *start = s_chan[ch].pCurr; int flags = start[1]; + int ret = check_irq(ch, start); if(s_chan[ch].prevflags & 1) start = s_chan[ch].pLoop; @@ -507,7 +515,7 @@ static int skip_block(int ch) s_chan[ch].pCurr = start; s_chan[ch].prevflags = flags; - return check_irq(ch, start); + return ret; } #define make_do_samples(name, fmod_code, interp_start, interp1_code, interp2_code, interp_end) \ @@ -532,10 +540,7 @@ static int do_samples_##name(int ch, int ns, int ns_to) \ sbpos = 0; \ d = decode_block(ch); \ if(d) \ - { \ - ret = ns; \ - goto out; \ - } \ + ret = ns_to = ns + 1; \ } \ \ fa = SB[sbpos++]; \ @@ -547,7 +552,6 @@ static int do_samples_##name(int ch, int ns, int ns_to) \ spos += sinc; \ } \ \ -out: \ s_chan[ch].sinc = sinc; \ s_chan[ch].spos = spos; \ s_chan[ch].iSBPos = sbpos; \ @@ -584,11 +588,14 @@ make_do_samples(simple, , , static int do_samples_noise(int ch, int ns, int ns_to) { int level, shift, bit; + int ret = -1, d; s_chan[ch].spos += s_chan[ch].sinc * (ns_to - ns); while (s_chan[ch].spos >= 28*0x10000) { - skip_block(ch); + d = skip_block(ch); + if (d) + ret = ns_to; s_chan[ch].spos -= 28*0x10000; } @@ -612,10 +619,10 @@ static int do_samples_noise(int ch, int ns, int ns_to) ChanBuf[ns] = (signed short)dwNoiseVal; } - return -1; + return ret; } -#ifdef __arm__ +#ifdef HAVE_ARMV5 // asm code; lv and rv must be 0-3fff extern void mix_chan(int start, int count, int lv, int rv); extern void mix_chan_rvb(int start, int count, int lv, int rv); @@ -664,12 +671,13 @@ static void noinline do_decode_bufs(int which, int start, int count) { const int *src = ChanBuf + start; unsigned short *dst = &spuMem[0x800/2 + which*0x400/2]; - int cursor = decode_pos; + int cursor = decode_pos + start; while (count-- > 0) { + cursor &= 0x1ff; dst[cursor] = *src++; - cursor = (cursor + 1) & 0x1ff; + cursor++; } // decode_pos is updated and irqs are checked later, after voice loop @@ -688,25 +696,18 @@ static int do_samples(int forced_updates) int ch,d,silentch; int bIRQReturn=0; - while(1) - { - // ok, at the beginning we are looking if there is - // enuff free place in the dsound/oss buffer to - // fill in new data, or if there is a new channel to start. - // if not, we wait (thread) or return (timer/spuasync) - // until enuff free place is available/a new channel gets - // started - - if(!forced_updates && SoundGetBytesBuffered()) // still enuff data in sound buffer? - { - return 0; - } + // ok, at the beginning we are looking if there is + // enuff free place in the dsound/oss buffer to + // fill in new data, or if there is a new channel to start. + // if not, we return until enuff free place is available + // /a new channel gets started - cycles_since_update = 0; - if(forced_updates > 0) - forced_updates--; + if(!forced_updates && out_current->busy()) // still enuff data in sound buffer? + return 0; - //--------------------------------------------------// continue from irq handling in timer mode? + while(!bIRQReturn) + { + cycles_since_update = 0; ns_from=0; ns_to=NSSIZE; @@ -740,8 +741,6 @@ static int do_samples(int forced_updates) bIRQReturn=1; lastch=ch; lastns=ns_to=d; - if(d==0) - break; } MixADSR(ch, ns_from, ns_to); @@ -778,9 +777,9 @@ static int do_samples(int forced_updates) // no need for bIRQReturn since the channel is silent skip_block(ch); - if(start == s_chan[ch].pCurr) + if(start == s_chan[ch].pCurr || start - spuMemC < 0x1000) { - // looping on self + // looping on self or stopped(?) dwChannelDead |= 1< 16/FRAG_MSECS) + if (iCycle++ >= 16/FRAG_MSECS) { - SoundFeedStreamData((unsigned char *)pSpuBuffer, - ((unsigned char *)pS) - ((unsigned char *)pSpuBuffer)); + out_current->feed(pSpuBuffer, (unsigned char *)pS - pSpuBuffer); pS = (short *)pSpuBuffer; iCycle = 0; + + if(!forced_updates && out_current->busy()) + break; + } + + if(forced_updates > 0) + { + forced_updates--; + if(forced_updates == 0 && out_current->busy()) + break; } } @@ -1058,7 +1067,7 @@ long CALLBACK SPUclose(void) bSPUIsOpen = 0; // no more open - RemoveSound(); // no more sound handling + out_current->finish(); // no more sound handling return 0; }