X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fspu.c;h=d6cd952bb5d95447a1fa698320ad714be8ff73a6;hp=780b09173736f50440824e0679fe8944b23dc319;hb=1775933abd26d2e282c4e0b4093778d204a0038d;hpb=78c60846942cad7d41d6d23a7c3d2b905ee4b822 diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index 780b0917..d6cd952b 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -4,6 +4,9 @@ begin : Wed May 15 2002 copyright : (C) 2002 by Pete Bernert email : BlackDove@addcom.de + + Portions (C) Gražvydas "notaz" Ignotas, 2010-2011 + ***************************************************************************/ /*************************************************************************** * * @@ -35,6 +38,16 @@ #define N_(x) (x) #endif +#ifdef __arm__ + #define ssat32_to_16(v) \ + asm("ssat %0,#16,%1" : "=r" (v) : "r" (v)) +#else + #define ssat32_to_16(v) do { \ + if (v < -32768) v = -32768; \ + else if (v > 32767) v = 32767; \ + } while (0) +#endif + /* #if defined (USEMACOSX) static char * libraryName = N_("Mac OS X Sound"); @@ -108,6 +121,7 @@ static const int f[8][2] = { { 0, 0 }, { 115, -52 }, { 98, -55 }, { 122, -60 } }; +int ChanBuf[NSSIZE]; int SSumLR[NSSIZE*2]; int iFMod[NSSIZE]; int iCycle = 0; @@ -281,9 +295,10 @@ INLINE void VoiceChangeFrequency(int ch) //////////////////////////////////////////////////////////////////////// -INLINE void FModChangeFrequency(int ch,int ns) +INLINE int FModChangeFrequency(int ch,int ns) { int NP=s_chan[ch].iRawPitch; + int sinc; NP=((32768L+iFMod[ns])*NP)/32768L; @@ -294,11 +309,13 @@ INLINE void FModChangeFrequency(int ch,int ns) s_chan[ch].iActFreq=NP; s_chan[ch].iUsedFreq=NP; - s_chan[ch].sinc=(((NP/10)<<16)/4410); - if(!s_chan[ch].sinc) s_chan[ch].sinc=1; + sinc=(((NP/10)<<16)/4410); + if(!sinc) sinc=1; if(iUseInterpolation==1) // freq change in simple interpolation mode - s_chan[ch].SB[32]=1; + s_chan[ch].SB[32]=1; iFMod[ns]=0; + + return sinc; } //////////////////////////////////////////////////////////////////////// @@ -520,6 +537,115 @@ static int decode_block(int ch) return ret; } +// do block, but ignore sample data +static int skip_block(int ch) +{ + unsigned char *start = s_chan[ch].pCurr; + int flags = start[1]; + int ret = 0; + + // Tron Bonne hack, probably wrong (could be wrong memory contents..) + if(flags & ~7) flags = 0; + + if(start == pSpuIrq) + { + do_irq(); + ret = 1; + } + + if((flags & 4) && !s_chan[ch].bIgnoreLoop) + s_chan[ch].pLoop=start; + + s_chan[ch].pCurr += 16; + + if(flags & 1) + s_chan[ch].pCurr = s_chan[ch].pLoop; + + return ret; +} + +#define make_do_samples(name, fmod_code, interp_start, interp1_code, interp2_code, interp_end) \ +static int do_samples_##name(int ch, int ns, int ns_to) \ +{ \ + int sinc = s_chan[ch].sinc; \ + int spos = s_chan[ch].spos; \ + int ret = -1; \ + int d, fa; \ + interp_start; \ + \ + for (; ns < ns_to; ns++) \ + { \ + fmod_code; \ + \ + while (spos >= 0x10000) \ + { \ + if(s_chan[ch].iSBPos == 28) \ + { \ + d = decode_block(ch); \ + if(d && iSPUIRQWait) \ + { \ + ret = ns; \ + goto out; \ + } \ + } \ + \ + fa = s_chan[ch].SB[s_chan[ch].iSBPos++]; \ + interp1_code; \ + spos -= 0x10000; \ + } \ + \ + interp2_code; \ + spos += sinc; \ + } \ + \ +out: \ + s_chan[ch].sinc = sinc; \ + s_chan[ch].spos = spos; \ + interp_end; \ + \ + return ret; \ +} + +#define fmod_recv_check \ + if(s_chan[ch].bFMod==1 && iFMod[ns]) \ + sinc = FModChangeFrequency(ch,ns) + +make_do_samples(default, fmod_recv_check, , + StoreInterpolationVal(ch, fa), + ChanBuf[ns] = iGetInterpolationVal(ch), ) +make_do_samples(noint, , fa = s_chan[ch].SB[29], , ChanBuf[ns] = fa, s_chan[ch].SB[29] = fa) + +#define simple_interp_store \ + s_chan[ch].SB[28] = 0; \ + s_chan[ch].SB[29] = s_chan[ch].SB[30]; \ + s_chan[ch].SB[30] = s_chan[ch].SB[31]; \ + s_chan[ch].SB[31] = fa; \ + s_chan[ch].SB[32] = 1 + +#define simple_interp_get \ + if(sinc<0x10000) /* -> upsampling? */ \ + InterpolateUp(ch); /* --> interpolate up */ \ + else InterpolateDown(ch); /* --> else down */ \ + ChanBuf[ns] = s_chan[ch].SB[29] + +make_do_samples(simple, , , + simple_interp_store, simple_interp_get, ) + +static int do_samples_noise(int ch, int ns, int ns_to) +{ + s_chan[ch].spos += s_chan[ch].sinc * (ns_to - ns); + while (s_chan[ch].spos >= 28*0x10000) + { + skip_block(ch); + s_chan[ch].spos -= 28*0x10000; + } + + for (; ns < ns_to; ns++) + ChanBuf[ns] = iGetNoiseVal(ch); + + return -1; +} + //////////////////////////////////////////////////////////////////////// // MAIN SPU FUNCTION // here is the main job handler... thread, timer or direct func call @@ -537,7 +663,7 @@ static int decode_block(int ch) static void *MAINThread(void *arg) { - int fa,ns,ns_from,ns_to; + int ns,ns_from,ns_to; #if !defined(_MACOSX) && !defined(__arm__) int voldiv = iVolume; #else @@ -595,64 +721,49 @@ static void *MAINThread(void *arg) if(s_chan[ch].iActFreq!=s_chan[ch].iUsedFreq) // new psx frequency? VoiceChangeFrequency(ch); - for(ns=ns_from;ns=0) { - int sval; + bIRQReturn=1; + lastch=ch; + lastns=ns_to=d; + } - if(!(dwChannelOn&(1<=0x10000L) + for(ns=ns_from;ns option: wait after irq for main emu - { - bIRQReturn=1; - lastch=ch; - lastns=ns_to=ns; - goto ENDX; // do remaining chans unil this ns - } - } - - fa=s_chan[ch].SB[s_chan[ch].iSBPos++]; // get sample data - - StoreInterpolationVal(ch,fa); // store val for later interpolation - - s_chan[ch].spos -= 0x10000L; - } - - if(s_chan[ch].bNoise) - fa=iGetNoiseVal(ch); // get noise val - else fa=iGetInterpolationVal(ch); // get sample val - - sval = (MixADSR(ch) * fa) / 1024; // mix adsr + int sval = ChanBuf[ns]; + int l, r; - if(s_chan[ch].bFMod==2) // fmod freq channel - iFMod[ns]=sval; // -> store 1T sample data, use that to do fmod on next channel - else // no fmod freq channel - { ////////////////////////////////////////////// // ok, left/right sound volume (psx volume goes from 0 ... 0x3fff) - SSumLR[ns*2] +=(sval*s_chan[ch].iLeftVolume)/0x4000L; - SSumLR[ns*2+1]+=(sval*s_chan[ch].iRightVolume)/0x4000L; + l=(sval*lv)>>14; + r=(sval*rv)>>14; + SSumLR[ns*2] +=l; + SSumLR[ns*2+1]+=r; ////////////////////////////////////////////// // now let us store sound data for reverb - if(s_chan[ch].bRVBActive) StoreREVERB(ch,ns,sval); + if(s_chan[ch].bRVBActive) StoreREVERB(ch,ns,l,r); } - - //////////////////////////////////////////////// - // ok, go on until 1 ms data of this channel is collected - - s_chan[ch].spos += s_chan[ch].sinc; } -ENDX: ; } } @@ -674,31 +785,15 @@ ENDX: ; while(s_chan[ch].spos >= 28 * 0x10000) { unsigned char *start=s_chan[ch].pCurr; - int flags = start[1]; - - // Tron Bonne hack, probably wrong (could be wrong memory contents..) - if(flags & ~7) flags = 0; - if(start == pSpuIrq) - { - do_irq(); - bIRQReturn = 1; - } - else if((flags & 1) && start == s_chan[ch].pLoop) + bIRQReturn |= skip_block(ch); + if(start == s_chan[ch].pCurr) { // looping on self s_chan[ch].pCurr=(unsigned char *)-1; break; } - if((flags&4) && !s_chan[ch].bIgnoreLoop) - s_chan[ch].pLoop=start; - - s_chan[ch].pCurr += 16; - - if(flags & 1) - s_chan[ch].pCurr = s_chan[ch].pLoop; - s_chan[ch].spos -= 28 * 0x10000; } } @@ -733,19 +828,24 @@ ENDX: ; /////////////////////////////////////////////////////// // mix all channels (including reverb) into one buffer + if(iUseReverb) + REVERBDo(); + + if((spuCtrl&0x4000)==0) // muted? (rare, don't optimize for this) + { + memset(pS, 0, NSSIZE * 2 * sizeof(pS[0])); + pS += NSSIZE*2; + } + else for (ns = 0; ns < NSSIZE*2; ) { - SSumLR[ns] += MixREVERBLeft(ns/2); - d = SSumLR[ns] / voldiv; SSumLR[ns] = 0; - if (d < -32767) d = -32767; if (d > 32767) d = 32767; + ssat32_to_16(d); *pS++ = d; ns++; - SSumLR[ns] += MixREVERBRight(); - d = SSumLR[ns] / voldiv; SSumLR[ns] = 0; - if(d < -32767) d = -32767; if(d > 32767) d = 32767; + ssat32_to_16(d); *pS++ = d; ns++; } @@ -959,7 +1059,6 @@ long CALLBACK SPUinit(void) InitADSR(); iVolume = 3; - iReverbOff = -1; spuIrq = 0; spuAddr = 0xffffffff; bEndThread = 0; @@ -1075,4 +1174,24 @@ char * SPUgetLibInfos(void) } */ +// debug +void spu_get_debug_info(int *chans_out, int *fmod_chans_out, int *noise_chans_out) +{ + int ch = 0, fmod_chans = 0, noise_chans = 0; + + for(;ch