// user settings
-int iVolume=3;
+int iVolume=768; // 1024 is 1.0
int iXAPitch=1;
int iUseTimer=2;
int iSPUIRQWait=1;
SPUCHAN s_chan[MAXCHAN+1]; // channel + 1 infos (1 is security for fmod handling)
REVERBInfo rvb;
-unsigned long dwNoiseVal=1; // global noise generator
+unsigned int dwNoiseVal; // global noise generator
+unsigned int dwNoiseCount;
int iSpuAsyncWait=0;
unsigned short spuCtrl=0; // some vars to store psx reg infos
{ 115, -52 },
{ 98, -55 },
{ 122, -60 } };
-int ChanBuf[NSSIZE];
-int SSumLR[NSSIZE*2];
+int ChanBuf[NSSIZE+3];
+int SSumLR[(NSSIZE+3)*2];
int iFMod[NSSIZE];
int iCycle = 0;
short * pS;
////////////////////////////////////////////////////////////////////////
-// noise handler... just produces some noise data
-// surely wrong... and no noise frequency (spuCtrl&0x3f00) will be used...
-// and sometimes the noise will be used as fmod modulation... pfff
-
-INLINE int iGetNoiseVal(int ch)
-{
- int fa;
-
- if((dwNoiseVal<<=1)&0x80000000L)
- {
- dwNoiseVal^=0x0040001L;
- fa=((dwNoiseVal>>2)&0x7fff);
- fa=-fa;
- }
- else fa=(dwNoiseVal>>2)&0x7fff;
-
- // mmm... depending on the noise freq we allow bigger/smaller changes to the previous val
- fa=s_chan[ch].iOldNoise+((fa-s_chan[ch].iOldNoise)/((0x001f-((spuCtrl&0x3f00)>>9))+1));
- if(fa>32767L) fa=32767L;
- if(fa<-32767L) fa=-32767L;
- s_chan[ch].iOldNoise=fa;
-
- if(iUseInterpolation<2) // no gauss/cubic interpolation?
- s_chan[ch].SB[29] = fa; // -> store noise val in "current sample" slot
- return fa;
-}
-
-////////////////////////////////////////////////////////////////////////
-
INLINE void StoreInterpolationVal(int ch,int fa)
{
if(s_chan[ch].bFMod==2) // fmod freq channel
static int do_samples_noise(int ch, int ns, int ns_to)
{
+ int level, shift, bit;
+
s_chan[ch].spos += s_chan[ch].sinc * (ns_to - ns);
while (s_chan[ch].spos >= 28*0x10000)
{
s_chan[ch].spos -= 28*0x10000;
}
+ // modified from DrHell/shalma, no fraction
+ level = (spuCtrl >> 10) & 0x0f;
+ level = 0x8000 >> level;
+
for (; ns < ns_to; ns++)
- ChanBuf[ns] = iGetNoiseVal(ch);
+ {
+ dwNoiseCount += 2;
+ if (dwNoiseCount >= level)
+ {
+ dwNoiseCount -= level;
+ shift = (dwNoiseVal >> 10) & 0x1f;
+ bit = (0x69696969 >> shift) & 1;
+ if (dwNoiseVal & 0x8000)
+ bit ^= 1;
+ dwNoiseVal = (dwNoiseVal << 1) | bit;
+ }
+
+ ChanBuf[ns] = (signed short)dwNoiseVal;
+ }
return -1;
}
+#ifdef __arm__
+// asm code
+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);
+#else
+static void mix_chan(int start, int count, int lv, int rv)
+{
+ int *dst = SSumLR + start * 2;
+ const int *src = ChanBuf + start;
+ int l, r;
+
+ while (count--)
+ {
+ int sval = *src++;
+
+ l = (sval * lv) >> 14;
+ r = (sval * rv) >> 14;
+ *dst++ += l;
+ *dst++ += r;
+ }
+}
+
+static void mix_chan_rvb(int start, int count, int lv, int rv)
+{
+ int *dst = SSumLR + start * 2;
+ int *drvb = sRVBStart + start * 2;
+ const int *src = ChanBuf + start;
+ int l, r;
+
+ while (count--)
+ {
+ int sval = *src++;
+
+ l = (sval * lv) >> 14;
+ r = (sval * rv) >> 14;
+ *dst++ += l;
+ *dst++ += r;
+ *drvb++ += l;
+ *drvb++ += r;
+ }
+}
+#endif
+
////////////////////////////////////////////////////////////////////////
// MAIN SPU FUNCTION
// here is the main job handler... thread, timer or direct func call
static void *MAINThread(void *arg)
{
+ int volmult = iVolume;
int ns,ns_from,ns_to;
-#if !defined(_MACOSX) && !defined(__arm__)
- int voldiv = iVolume;
-#else
- const int voldiv = 2;
-#endif
int ch,d;
int bIRQReturn=0;
if(s_chan[ch].bFMod==2) // fmod freq channel
memcpy(iFMod, ChanBuf, sizeof(iFMod));
+ else if(s_chan[ch].bRVBActive)
+ mix_chan_rvb(ns_from,ns_to-ns_from,s_chan[ch].iLeftVolume,s_chan[ch].iRightVolume);
else
- {
- int lv=s_chan[ch].iLeftVolume;
- int rv=s_chan[ch].iRightVolume;
-
- for(ns=ns_from;ns<ns_to;ns++)
- {
- int sval = ChanBuf[ns];
- int l, r;
-
- //////////////////////////////////////////////
- // ok, left/right sound volume (psx volume goes from 0 ... 0x3fff)
-
- 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,l,r);
- }
- }
+ mix_chan(ns_from,ns_to-ns_from,s_chan[ch].iLeftVolume,s_chan[ch].iRightVolume);
}
}
else
for (ns = 0; ns < NSSIZE*2; )
{
- d = SSumLR[ns] / voldiv; SSumLR[ns] = 0;
+ d = SSumLR[ns]; SSumLR[ns] = 0;
+ d = d * volmult >> 10;
ssat32_to_16(d);
*pS++ = d;
ns++;
- d = SSumLR[ns] / voldiv; SSumLR[ns] = 0;
+ d = SSumLR[ns]; SSumLR[ns] = 0;
+ d = d * volmult >> 10;
ssat32_to_16(d);
*pS++ = d;
ns++;
memset((void *)&rvb, 0, sizeof(REVERBInfo));
InitADSR();
- iVolume = 3;
spuIrq = 0;
spuAddr = 0xffffffff;
bEndThread = 0;