#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");
//s_chan[ch].bStop=0;
//s_chan[ch].bOn=1;
- s_chan[ch].s_1=0; // init mixing vars
- s_chan[ch].s_2=0;
+ s_chan[ch].SB[26]=0; // init mixing vars
+ s_chan[ch].SB[27]=0;
s_chan[ch].iSBPos=28;
s_chan[ch].SB[29]=0; // init our interpolation helpers
s_chan[ch].SB[29]=fa;
else
{
- if((spuCtrl&0x4000)==0) fa=0; // muted?
- else // else adjust
- {
- if(fa>32767L) fa=32767L;
- if(fa<-32767L) fa=-32767L;
- }
+ ssat32_to_16(fa);
if(iUseInterpolation>=2) // gauss/cubic interpolation
{
}
}
+static void decode_block_data(int *dest, const unsigned char *src, int predict_nr, int shift_factor)
+{
+ int nSample;
+ int fa, s_1, s_2, d, s;
+
+ s_1 = dest[27];
+ s_2 = dest[26];
+
+ for (nSample = 0; nSample < 28; src++)
+ {
+ d = (int)*src;
+ s = (int)(signed short)((d & 0x0f) << 12);
+
+ fa = s >> shift_factor;
+ fa += ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6);
+ s_2=s_1;s_1=fa;
+
+ dest[nSample++] = fa;
+
+ s = (int)(signed short)((d & 0xf0) << 8);
+ fa = s >> shift_factor;
+ fa += ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6);
+ s_2=s_1;s_1=fa;
+
+ dest[nSample++] = fa;
+ }
+}
+
static int decode_block(int ch)
{
unsigned char *start;
- unsigned int nSample;
- int predict_nr,shift_factor,flags,d,s;
- int fa,s_1,s_2;
+ int predict_nr,shift_factor,flags;
int ret = 0;
- s_chan[ch].iSBPos=0;
-
start=s_chan[ch].pCurr; // set up the current pos
if(start == (unsigned char*)-1 || // special "stop" sign
(dwPendingChanOff&(1<<ch)))
}
}
- s_1=s_chan[ch].s_1;
- s_2=s_chan[ch].s_2;
-
- predict_nr=(int)*start;start++;
+ predict_nr=(int)start[0];
shift_factor=predict_nr&0xf;
predict_nr >>= 4;
- flags=(int)*start;start++;
-
- // -------------------------------------- //
-
- for (nSample=0;nSample<28;start++)
- {
- d=(int)*start;
- s=((d&0xf)<<12);
- if(s&0x8000) s|=0xffff0000;
-
- fa=(s >> shift_factor);
- fa=fa + ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6);
- s_2=s_1;s_1=fa;
- s=((d & 0xf0) << 8);
-
- s_chan[ch].SB[nSample++]=fa;
-
- if(s&0x8000) s|=0xffff0000;
- fa=(s>>shift_factor);
- fa=fa + ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6);
- s_2=s_1;s_1=fa;
- s_chan[ch].SB[nSample++]=fa;
- }
+ decode_block_data(s_chan[ch].SB, start + 2, predict_nr, shift_factor);
//////////////////////////////////////////// flag handler
- if((flags&4) && (!s_chan[ch].bIgnoreLoop))
- s_chan[ch].pLoop=start-16; // loop adress
+ flags=(int)start[1];
+ if(flags&4)
+ s_chan[ch].pLoop=start; // loop adress
+ start+=16;
if(flags&1) // 1: stop/loop
{
if(!(flags&2))
if (start - spuMemC >= 0x80000)
start = (unsigned char*)-1;
- s_chan[ch].pCurr=start; // store values for next cycle
- s_chan[ch].s_1=s_1;
- s_chan[ch].s_2=s_2;
+ s_chan[ch].pCurr = start; // store values for next cycle
return ret;
}
ret = 1;
}
- if((flags & 4) && !s_chan[ch].bIgnoreLoop)
+ if(flags & 4)
s_chan[ch].pLoop=start;
s_chan[ch].pCurr += 16;
{ \
int sinc = s_chan[ch].sinc; \
int spos = s_chan[ch].spos; \
+ int sbpos = s_chan[ch].iSBPos; \
+ int *SB = s_chan[ch].SB; \
int ret = -1; \
int d, fa; \
interp_start; \
\
while (spos >= 0x10000) \
{ \
- if(s_chan[ch].iSBPos == 28) \
+ if(sbpos == 28) \
{ \
+ sbpos = 0; \
d = decode_block(ch); \
if(d && iSPUIRQWait) \
{ \
} \
} \
\
- fa = s_chan[ch].SB[s_chan[ch].iSBPos++]; \
+ fa = SB[sbpos++]; \
interp1_code; \
spos -= 0x10000; \
} \
out: \
s_chan[ch].sinc = sinc; \
s_chan[ch].spos = spos; \
+ s_chan[ch].iSBPos = sbpos; \
interp_end; \
\
return ret; \
if(s_chan[ch].bFMod==2) // fmod freq channel
memcpy(iFMod, ChanBuf, sizeof(iFMod));
- else for(ns=ns_from;ns<ns_to;ns++)
+ else
{
- int sval = ChanBuf[ns];
+ 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)
- 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);
}
}
}
///////////////////////////////////////////////////////
// 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++;
}
// feed the sound
// wanna have around 1/60 sec (16.666 ms) updates
- if (iCycle++ > 16)
+ if (iCycle++ > 16/FRAG_MSECS)
{
SoundFeedStreamData((unsigned char *)pSpuBuffer,
((unsigned char *)pS) - ((unsigned char *)pSpuBuffer));
if(iSpuAsyncWait)
{
iSpuAsyncWait++;
- if(iSpuAsyncWait<=16) return;
+ if(iSpuAsyncWait<=16/FRAG_MSECS) return;
iSpuAsyncWait=0;
}
InitADSR();
iVolume = 3;
- iReverbOff = -1;
spuIrq = 0;
spuAddr = 0xffffffff;
bEndThread = 0;