begin : Wed May 15 2002
copyright : (C) 2002 by Pete Bernert
email : BlackDove@addcom.de
+
+ Portions (C) GraÅžvydas "notaz" Ignotas, 2010-2011
+
***************************************************************************/
/***************************************************************************
* *
#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");
{ 115, -52 },
{ 98, -55 },
{ 122, -60 } };
+int ChanBuf[NSSIZE];
int SSumLR[NSSIZE*2];
int iFMod[NSSIZE];
int iCycle = 0;
////////////////////////////////////////////////////////////////////////
-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;
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;
}
////////////////////////////////////////////////////////////////////////
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
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
if(s_chan[ch].iActFreq!=s_chan[ch].iUsedFreq) // new psx frequency?
VoiceChangeFrequency(ch);
- for(ns=ns_from;ns<ns_to;ns++) // loop until 1 ms of data is reached
+ if(s_chan[ch].bNoise)
+ d=do_samples_noise(ch, ns_from, ns_to);
+ else if(s_chan[ch].bFMod==2 || (s_chan[ch].bFMod==0 && iUseInterpolation==0))
+ d=do_samples_noint(ch, ns_from, ns_to);
+ else if(s_chan[ch].bFMod==0 && iUseInterpolation==1)
+ d=do_samples_simple(ch, ns_from, ns_to);
+ else
+ d=do_samples_default(ch, ns_from, ns_to);
+ if(d>=0)
{
- int sval;
+ bIRQReturn=1;
+ lastch=ch;
+ lastns=ns_to=d;
+ }
- if(!(dwChannelOn&(1<<ch))) break; // something turned ch off (adsr or flags)
+ MixADSR(ch, ns_from, ns_to);
- if(s_chan[ch].bFMod==1 && iFMod[ns]) // fmod freq channel
- FModChangeFrequency(ch,ns);
+ if(s_chan[ch].bFMod==2) // fmod freq channel
+ memcpy(iFMod, ChanBuf, sizeof(iFMod));
+ else
+ {
+ int lv=s_chan[ch].iLeftVolume;
+ int rv=s_chan[ch].iRightVolume;
- while(s_chan[ch].spos>=0x10000L)
+ for(ns=ns_from;ns<ns_to;ns++)
{
- if(s_chan[ch].iSBPos==28) // 28 reached?
- {
- d = decode_block(ch);
- if(d && iSPUIRQWait) // -> 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: ;
}
}
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;
}
}
///////////////////////////////////////////////////////
// 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++;
}
InitADSR();
iVolume = 3;
- iReverbOff = -1;
spuIrq = 0;
spuAddr = 0xffffffff;
bEndThread = 0;
}
*/
+// 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<MAXCHAN;ch++)
+ {
+ if (!(dwChannelOn & (1<<ch)))
+ continue;
+ if (s_chan[ch].bFMod == 2)
+ fmod_chans |= 1 << ch;
+ if (s_chan[ch].bNoise)
+ noise_chans |= 1 << ch;
+ }
+
+ *chans_out = dwChannelOn;
+ *fmod_chans_out = fmod_chans;
+ *noise_chans_out = noise_chans;
+}
+
// vim:shiftwidth=1:expandtab
notaz.gp2x.de / pcsx_rearmed.git / blobdiff