copyright : (C) 2002 by Pete Bernert
email : BlackDove@addcom.de
- Portions (C) Gražvydas "notaz" Ignotas, 2010-2012
+ Portions (C) Gražvydas "notaz" Ignotas, 2010-2012,2014
***************************************************************************/
/***************************************************************************
* *
***************************************************************************/
+#ifndef _WIN32
+#include <sys/time.h> // gettimeofday in xa.c
+#endif
#include "stdafx.h"
#define _IN_SPU
#include "arm_features.h"
#include "spu_config.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define _(x) gettext(x)
-#define N_(x) (x)
-#else
-#define _(x) (x)
-#define N_(x) (x)
-#endif
-
#ifdef __ARM_ARCH_7A__
#define ssat32_to_16(v) \
asm("ssat %0,#16,%1" : "=r" (v) : "r" (v))
// /
//
-
-INLINE void InterpolateUp(int ch)
+static void InterpolateUp(int *SB, int sinc)
{
- if(s_chan[ch].SB[32]==1) // flag == 1? calc step and set flag... and don't change the value in this pass
+ if(SB[32]==1) // flag == 1? calc step and set flag... and don't change the value in this pass
{
- const int id1=s_chan[ch].SB[30]-s_chan[ch].SB[29]; // curr delta to next val
- const int id2=s_chan[ch].SB[31]-s_chan[ch].SB[30]; // and next delta to next-next val :)
+ const int id1=SB[30]-SB[29]; // curr delta to next val
+ const int id2=SB[31]-SB[30]; // and next delta to next-next val :)
- s_chan[ch].SB[32]=0;
+ SB[32]=0;
if(id1>0) // curr delta positive
{
if(id2<id1)
- {s_chan[ch].SB[28]=id1;s_chan[ch].SB[32]=2;}
+ {SB[28]=id1;SB[32]=2;}
else
if(id2<(id1<<1))
- s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x10000L;
+ SB[28]=(id1*sinc)>>16;
else
- s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L;
+ SB[28]=(id1*sinc)>>17;
}
else // curr delta negative
{
if(id2>id1)
- {s_chan[ch].SB[28]=id1;s_chan[ch].SB[32]=2;}
+ {SB[28]=id1;SB[32]=2;}
else
if(id2>(id1<<1))
- s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x10000L;
+ SB[28]=(id1*sinc)>>16;
else
- s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L;
+ SB[28]=(id1*sinc)>>17;
}
}
else
- if(s_chan[ch].SB[32]==2) // flag 1: calc step and set flag... and don't change the value in this pass
+ if(SB[32]==2) // flag 1: calc step and set flag... and don't change the value in this pass
{
- s_chan[ch].SB[32]=0;
+ SB[32]=0;
- s_chan[ch].SB[28]=(s_chan[ch].SB[28]*s_chan[ch].sinc)/0x20000L;
- //if(s_chan[ch].sinc<=0x8000)
- // s_chan[ch].SB[29]=s_chan[ch].SB[30]-(s_chan[ch].SB[28]*((0x10000/s_chan[ch].sinc)-1));
+ SB[28]=(SB[28]*sinc)>>17;
+ //if(sinc<=0x8000)
+ // SB[29]=SB[30]-(SB[28]*((0x10000/sinc)-1));
//else
- s_chan[ch].SB[29]+=s_chan[ch].SB[28];
+ SB[29]+=SB[28];
}
else // no flags? add bigger val (if possible), calc smaller step, set flag1
- s_chan[ch].SB[29]+=s_chan[ch].SB[28];
+ SB[29]+=SB[28];
}
//
// even easier interpolation on downsampling, also no special filter, again just "Pete's common sense" tm
//
-INLINE void InterpolateDown(int ch)
+static void InterpolateDown(int *SB, int sinc)
{
- if(s_chan[ch].sinc>=0x20000L) // we would skip at least one val?
+ if(sinc>=0x20000L) // we would skip at least one val?
{
- s_chan[ch].SB[29]+=(s_chan[ch].SB[30]-s_chan[ch].SB[29])/2; // add easy weight
- if(s_chan[ch].sinc>=0x30000L) // we would skip even more vals?
- s_chan[ch].SB[29]+=(s_chan[ch].SB[31]-s_chan[ch].SB[30])/2;// add additional next weight
+ SB[29]+=(SB[30]-SB[29])/2; // add easy weight
+ if(sinc>=0x30000L) // we would skip even more vals?
+ SB[29]+=(SB[31]-SB[30])/2; // add additional next weight
}
}
////////////////////////////////////////////////////////////////////////
// helpers for gauss interpolation
-#define gval0 (((short*)(&s_chan[ch].SB[29]))[gpos&3])
-#define gval(x) ((int)((short*)(&s_chan[ch].SB[29]))[(gpos+x)&3])
+#define gval0 (((short*)(&SB[29]))[gpos&3])
+#define gval(x) ((int)((short*)(&SB[29]))[(gpos+x)&3])
#include "gauss_i.h"
StartADSR(ch);
StartREVERB(ch);
- // fussy timing issues - do in VoiceOn
- //s_chan[ch].pCurr=s_chan[ch].pStart; // set sample start
- //s_chan[ch].bStop=0;
- //s_chan[ch].bOn=1;
+ s_chan[ch].bStop=0;
+ s_chan[ch].prevflags=2;
s_chan[ch].SB[26]=0; // init mixing vars
s_chan[ch].SB[27]=0;
- s_chan[ch].iSBPos=28;
+ s_chan[ch].iSBPos=27;
+ s_chan[ch].SB[28]=0;
s_chan[ch].SB[29]=0; // init our interpolation helpers
s_chan[ch].SB[30]=0;
-
- if(spu_config.iUseInterpolation>=2) // gauss interpolation?
- {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
+ s_chan[ch].SB[31]=0;
+ s_chan[ch].spos=0;
spu.dwNewChannel&=~(1<<ch); // clear new channel bit
+ spu.dwChannelOn|=1<<ch;
+ spu.dwChannelDead&=~(1<<ch);
}
////////////////////////////////////////////////////////////////////////
// ALL KIND OF HELPERS
////////////////////////////////////////////////////////////////////////
-INLINE int FModChangeFrequency(int ch,int ns)
+INLINE int FModChangeFrequency(int *SB, int pitch, int ns)
{
- unsigned int NP=s_chan[ch].iRawPitch;
+ unsigned int NP=pitch;
int sinc;
- NP=((32768L+iFMod[ns])*NP)/32768L;
+ NP=((32768L+iFMod[ns])*NP)>>15;
if(NP>0x3fff) NP=0x3fff;
if(NP<0x1) NP=0x1;
sinc=NP<<4; // calc frequency
if(spu_config.iUseInterpolation==1) // freq change in simple interpolation mode
- s_chan[ch].SB[32]=1;
+ SB[32]=1;
iFMod[ns]=0;
return sinc;
////////////////////////////////////////////////////////////////////////
-INLINE void StoreInterpolationVal(int ch,int fa)
+INLINE void StoreInterpolationVal(int *SB, int sinc, int fa, int fmod_freq)
{
- if(s_chan[ch].bFMod==2) // fmod freq channel
- s_chan[ch].SB[29]=fa;
+ if(fmod_freq) // fmod freq channel
+ SB[29]=fa;
else
{
ssat32_to_16(fa);
if(spu_config.iUseInterpolation>=2) // gauss/cubic interpolation
- {
- int gpos = s_chan[ch].SB[28];
- gval0 = fa;
+ {
+ int gpos = SB[28];
+ gval0 = fa;
gpos = (gpos+1) & 3;
- s_chan[ch].SB[28] = gpos;
+ SB[28] = gpos;
}
else
if(spu_config.iUseInterpolation==1) // simple interpolation
{
- s_chan[ch].SB[28] = 0;
- s_chan[ch].SB[29] = s_chan[ch].SB[30]; // -> helpers for simple linear interpolation: delay real val for two slots, and calc the two deltas, for a 'look at the future behaviour'
- s_chan[ch].SB[30] = s_chan[ch].SB[31];
- s_chan[ch].SB[31] = fa;
- s_chan[ch].SB[32] = 1; // -> flag: calc new interolation
+ SB[28] = 0;
+ SB[29] = SB[30]; // -> helpers for simple linear interpolation: delay real val for two slots, and calc the two deltas, for a 'look at the future behaviour'
+ SB[30] = SB[31];
+ SB[31] = fa;
+ SB[32] = 1; // -> flag: calc new interolation
}
- else s_chan[ch].SB[29]=fa; // no interpolation
+ else SB[29]=fa; // no interpolation
}
}
////////////////////////////////////////////////////////////////////////
-INLINE int iGetInterpolationVal(int ch, int spos)
+INLINE int iGetInterpolationVal(int *SB, int sinc, int spos, int fmod_freq)
{
int fa;
- if(s_chan[ch].bFMod==2) return s_chan[ch].SB[29];
+ if(fmod_freq) return SB[29];
switch(spu_config.iUseInterpolation)
- {
+ {
//--------------------------------------------------//
case 3: // cubic interpolation
{
long xd;int gpos;
xd = (spos >> 1)+1;
- gpos = s_chan[ch].SB[28];
+ gpos = SB[28];
fa = gval(3) - 3*gval(2) + 3*gval(1) - gval0;
fa *= (xd - (2<<15)) / 6;
{
int vl, vr;int gpos;
vl = (spos >> 6) & ~3;
- gpos = s_chan[ch].SB[28];
+ gpos = SB[28];
vr=(gauss[vl]*(int)gval0)&~2047;
vr+=(gauss[vl+1]*gval(1))&~2047;
vr+=(gauss[vl+2]*gval(2))&~2047;
//--------------------------------------------------//
case 1: // simple interpolation
{
- if(s_chan[ch].sinc<0x10000L) // -> upsampling?
- InterpolateUp(ch); // --> interpolate up
- else InterpolateDown(ch); // --> else down
- fa=s_chan[ch].SB[29];
+ if(sinc<0x10000L) // -> upsampling?
+ InterpolateUp(SB, sinc); // --> interpolate up
+ else InterpolateDown(SB, sinc); // --> else down
+ fa=SB[29];
} break;
//--------------------------------------------------//
default: // no interpolation
{
- fa=s_chan[ch].SB[29];
+ fa=SB[29];
} break;
//--------------------------------------------------//
}
}
}
-static int decode_block(int ch)
+static int decode_block(int ch, int *SB)
{
unsigned char *start;
- int predict_nr,shift_factor,flags;
- int stop = 0;
+ int predict_nr, shift_factor, flags;
int ret = 0;
start = s_chan[ch].pCurr; // set up the current pos
- if(start == spu.spuMemC) // ?
- stop = 1;
+ if (start == spu.spuMemC) // ?
+ ret = 1;
- if(s_chan[ch].prevflags&1) // 1: stop/loop
+ if (s_chan[ch].prevflags & 1) // 1: stop/loop
{
- if(!(s_chan[ch].prevflags&2))
- stop = 1;
+ if (!(s_chan[ch].prevflags & 2))
+ ret = 1;
start = s_chan[ch].pLoop;
}
else
- ret = check_irq(ch, start); // hack, see check_irq below..
-
- if(stop)
- {
- spu.dwChannelOn &= ~(1<<ch); // -> turn everything off
- s_chan[ch].bStop = 1;
- s_chan[ch].ADSRX.EnvelopeVol = 0;
- }
+ check_irq(ch, start); // hack, see check_irq below..
- predict_nr=(int)start[0];
- shift_factor=predict_nr&0xf;
+ predict_nr = (int)start[0];
+ shift_factor = predict_nr & 0xf;
predict_nr >>= 4;
- decode_block_data(s_chan[ch].SB, start + 2, predict_nr, shift_factor);
+ decode_block_data(SB, start + 2, predict_nr, shift_factor);
- flags=(int)start[1];
- if(flags&4)
- s_chan[ch].pLoop=start; // loop adress
+ flags = start[1];
+ if (flags & 4)
+ s_chan[ch].pLoop = start; // loop adress
- start+=16;
+ 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.. :(
+ check_irq(ch, start); // hack.. :(
}
if (start - spu.spuMemC >= 0x80000)
static int skip_block(int ch)
{
unsigned char *start = s_chan[ch].pCurr;
- int flags = start[1];
- int ret = check_irq(ch, start);
+ int flags;
+ int ret = 0;
+
+ if (s_chan[ch].prevflags & 1) {
+ if (!(s_chan[ch].prevflags & 2))
+ ret = 1;
- if(s_chan[ch].prevflags & 1)
start = s_chan[ch].pLoop;
+ }
+ else
+ check_irq(ch, start);
- if(flags & 4)
+ flags = start[1];
+ if (flags & 4)
s_chan[ch].pLoop = start;
start += 16;
- if(flags & 1)
+ if (flags & 1) {
start = s_chan[ch].pLoop;
+ check_irq(ch, start);
+ }
s_chan[ch].pCurr = start;
s_chan[ch].prevflags = flags;
}
#define make_do_samples(name, fmod_code, interp_start, interp1_code, interp2_code, interp_end) \
-static noinline int do_samples_##name(int ch, int ns, int ns_to) \
+static noinline int do_samples_##name(int ch, int ns_to) \
{ \
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; \
+ int ns, d, fa; \
+ int ret = ns_to; \
interp_start; \
\
- for (; ns < ns_to; ns++) \
+ for (ns = 0; ns < ns_to; ns++) \
{ \
fmod_code; \
\
while (spos >= 0x10000) \
{ \
fa = SB[sbpos++]; \
- if(sbpos >= 28) \
+ if (sbpos >= 28) \
{ \
sbpos = 0; \
- d = decode_block(ch); \
- if(d) \
- ret = /*ns_to =*/ ns + 1; \
+ d = decode_block(ch, SB); \
+ if (d && ns < ret) \
+ ret = ns; \
} \
\
interp1_code; \
#define fmod_recv_check \
if(s_chan[ch].bFMod==1 && iFMod[ns]) \
- sinc = FModChangeFrequency(ch,ns)
+ sinc = FModChangeFrequency(SB, s_chan[ch].iRawPitch, ns)
make_do_samples(default, fmod_recv_check, ,
- StoreInterpolationVal(ch, fa),
- ChanBuf[ns] = iGetInterpolationVal(ch, spos), )
-make_do_samples(noint, , fa = s_chan[ch].SB[29], , ChanBuf[ns] = fa, s_chan[ch].SB[29] = fa)
+ StoreInterpolationVal(SB, sinc, fa, s_chan[ch].bFMod==2),
+ ChanBuf[ns] = iGetInterpolationVal(SB, sinc, spos, s_chan[ch].bFMod==2), )
+make_do_samples(noint, , fa = SB[29], , ChanBuf[ns] = fa, 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
+ SB[28] = 0; \
+ SB[29] = SB[30]; \
+ SB[30] = SB[31]; \
+ SB[31] = fa; \
+ 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]
+ if(sinc<0x10000) /* -> upsampling? */ \
+ InterpolateUp(SB, sinc); /* --> interpolate up */ \
+ else InterpolateDown(SB, sinc); /* --> else down */ \
+ ChanBuf[ns] = SB[29]
make_do_samples(simple, , ,
simple_interp_store, simple_interp_get, )
-static noinline int do_samples_noise(int ch, int ns, int ns_to)
+static int do_samples_skip(int ch, int ns_to)
{
- int level, shift, bit;
- int ret = -1, d;
+ int ret = ns_to, ns, d;
+
+ s_chan[ch].spos += s_chan[ch].iSBPos << 16;
- s_chan[ch].spos += s_chan[ch].sinc * (ns_to - ns);
- while (s_chan[ch].spos >= 28*0x10000)
+ for (ns = 0; ns < ns_to; ns++)
{
- d = skip_block(ch);
- if (d)
- ret = ns_to;
- s_chan[ch].spos -= 28*0x10000;
+ s_chan[ch].spos += s_chan[ch].sinc;
+ while (s_chan[ch].spos >= 28*0x10000)
+ {
+ d = skip_block(ch);
+ if (d && ns < ret)
+ ret = ns;
+ s_chan[ch].spos -= 28*0x10000;
+ }
}
+ s_chan[ch].iSBPos = s_chan[ch].spos >> 16;
+ s_chan[ch].spos &= 0xffff;
+
+ return ret;
+}
+
+static void do_lsfr_samples(int ns_to, int ctrl,
+ unsigned int *dwNoiseCount, unsigned int *dwNoiseVal)
+{
+ unsigned int counter = *dwNoiseCount;
+ unsigned int val = *dwNoiseVal;
+ unsigned int level, shift, bit;
+ int ns;
+
// modified from DrHell/shalma, no fraction
- level = (spu.spuCtrl >> 10) & 0x0f;
+ level = (ctrl >> 10) & 0x0f;
level = 0x8000 >> level;
- for (; ns < ns_to; ns++)
+ for (ns = 0; ns < ns_to; ns++)
{
- spu.dwNoiseCount += 2;
- if (spu.dwNoiseCount >= level)
+ counter += 2;
+ if (counter >= level)
{
- spu.dwNoiseCount -= level;
- shift = (spu.dwNoiseVal >> 10) & 0x1f;
+ counter -= level;
+ shift = (val >> 10) & 0x1f;
bit = (0x69696969 >> shift) & 1;
- if (spu.dwNoiseVal & 0x8000)
- bit ^= 1;
- spu.dwNoiseVal = (spu.dwNoiseVal << 1) | bit;
+ bit ^= (val >> 15) & 1;
+ val = (val << 1) | bit;
}
- ChanBuf[ns] = (signed short)spu.dwNoiseVal;
+ ChanBuf[ns] = (signed short)val;
}
+ *dwNoiseCount = counter;
+ *dwNoiseVal = val;
+}
+
+static int do_samples_noise(int ch, int ns_to)
+{
+ int ret;
+
+ ret = do_samples_skip(ch, ns_to);
+
+ do_lsfr_samples(ns_to, spu.spuCtrl, &spu.dwNoiseCount, &spu.dwNoiseVal);
+
return ret;
}
// 0x0800-0x0bff Voice 1
// 0x0c00-0x0fff Voice 3
-static noinline void do_decode_bufs(int which, int start, int count)
+static noinline void do_decode_bufs(unsigned short *mem, int which,
+ int count, int decode_pos)
{
- const int *src = ChanBuf + start;
- unsigned short *dst = &spu.spuMem[0x800/2 + which*0x400/2];
- int cursor = spu.decode_pos + start;
+ unsigned short *dst = &mem[0x800/2 + which*0x400/2];
+ const int *src = ChanBuf;
+ int cursor = decode_pos;
while (count-- > 0)
{
// decode_pos is updated and irqs are checked later, after voice loop
}
+static void do_silent_chans(int ns_to, int silentch)
+{
+ int ch;
+
+ for (ch = 0; ch < MAXCHAN; ch++)
+ {
+ if (!(silentch & (1<<ch))) continue; // already handled
+ if (spu.dwChannelDead & (1<<ch)) continue;
+ if (s_chan[ch].pCurr > spu.pSpuIrq && s_chan[ch].pLoop > spu.pSpuIrq)
+ continue;
+
+ s_chan[ch].spos += s_chan[ch].iSBPos << 16;
+ s_chan[ch].iSBPos = 0;
+
+ s_chan[ch].spos += s_chan[ch].sinc * ns_to;
+ while (s_chan[ch].spos >= 28 * 0x10000)
+ {
+ unsigned char *start = s_chan[ch].pCurr;
+
+ skip_block(ch);
+ if (start == s_chan[ch].pCurr || start - spu.spuMemC < 0x1000)
+ {
+ // looping on self or stopped(?)
+ spu.dwChannelDead |= 1<<ch;
+ s_chan[ch].spos = 0;
+ break;
+ }
+
+ s_chan[ch].spos -= 28 * 0x10000;
+ }
+ }
+}
+
+static void do_channels(int ns_to)
+{
+ unsigned int mask;
+ int ch, d;
+
+ InitREVERB(ns_to);
+
+ mask = spu.dwChannelOn & 0xffffff;
+ for (ch = 0; mask != 0; ch++, mask >>= 1) // loop em all...
+ {
+ if (!(mask & 1)) continue; // channel not playing? next
+
+ if (s_chan[ch].bNoise)
+ d = do_samples_noise(ch, ns_to);
+ else if (s_chan[ch].bFMod == 2
+ || (s_chan[ch].bFMod == 0 && spu_config.iUseInterpolation == 0))
+ d = do_samples_noint(ch, ns_to);
+ else if (s_chan[ch].bFMod == 0 && spu_config.iUseInterpolation == 1)
+ d = do_samples_simple(ch, ns_to);
+ else
+ d = do_samples_default(ch, ns_to);
+
+ d = MixADSR(ch, d);
+ if (d < ns_to) {
+ spu.dwChannelOn &= ~(1 << ch);
+ s_chan[ch].bStop = 1;
+ s_chan[ch].ADSRX.EnvelopeVol = 0;
+ memset(&ChanBuf[d], 0, (ns_to - d) * sizeof(ChanBuf[0]));
+ }
+
+ if (ch == 1 || ch == 3)
+ {
+ do_decode_bufs(spu.spuMem, ch/2, ns_to, spu.decode_pos);
+ spu.decode_dirty_ch |= 1 << ch;
+ }
+
+ if (s_chan[ch].bFMod == 2) // fmod freq channel
+ memcpy(iFMod, &ChanBuf, ns_to * sizeof(iFMod[0]));
+ if (s_chan[ch].bRVBActive)
+ mix_chan_rvb(0, ns_to, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume, spu.sRVBStart);
+ else
+ mix_chan(0, ns_to, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume);
+ }
+}
+
////////////////////////////////////////////////////////////////////////
// MAIN SPU FUNCTION
// here is the main job handler...
-// basically the whole sound processing is done in this fat func!
////////////////////////////////////////////////////////////////////////
+void do_samples_finish(int ns_to, int silentch);
+
void do_samples(unsigned int cycles_to)
{
- const int ns_from = 0;
- int ns,ns_to,ns_len;
- int volmult = spu_config.iVolume;
- int ch,d,silentch;
+ unsigned int mask;
+ int ch, ns_to;
+ int silentch;
int cycle_diff;
cycle_diff = cycles_to - spu.cycles_played;
// an IRQ.
if (unlikely((spu.spuCtrl & CTRL_IRQ)
- && spu.pSpuIrq && spu.pSpuIrq < spu.spuMemC+0x1000))
+ && spu.pSpuIrq < spu.spuMemC+0x1000))
{
int irq_pos = (spu.pSpuIrq - spu.spuMemC) / 2 & 0x1ff;
int left = (irq_pos - spu.decode_pos) & 0x1ff;
}
}
- InitREVERB(ns_to);
+ silentch = ~(spu.dwChannelOn|spu.dwNewChannel);
- {
- silentch=~(spu.dwChannelOn|spu.dwNewChannel);
+ mask = spu.dwNewChannel & 0xffffff;
+ for (ch = 0; mask != 0; ch++, mask >>= 1) {
+ if (mask & 1)
+ StartSound(ch);
+ }
- //--------------------------------------------------//
- //- main channel loop -//
- //--------------------------------------------------//
- {
- for(ch=0;ch<MAXCHAN;ch++) // loop em all...
- {
- if(spu.dwNewChannel&(1<<ch)) StartSound(ch); // start new sound
- if(!(spu.dwChannelOn&(1<<ch))) continue; // channel not playing? next
-
- if(s_chan[ch].bNoise)
- do_samples_noise(ch, ns_from, ns_to);
- else if(s_chan[ch].bFMod==2 || (s_chan[ch].bFMod==0 && spu_config.iUseInterpolation==0))
- do_samples_noint(ch, ns_from, ns_to);
- else if(s_chan[ch].bFMod==0 && spu_config.iUseInterpolation==1)
- do_samples_simple(ch, ns_from, ns_to);
- else
- do_samples_default(ch, ns_from, ns_to);
-
- ns_len = ns_to - ns_from;
-
- MixADSR(ch, ns_from, ns_to);
-
- if(ch==1 || ch==3)
- {
- do_decode_bufs(ch/2, ns_from, ns_len);
- spu.decode_dirty_ch |= 1<<ch;
- }
-
- if(s_chan[ch].bFMod==2) // fmod freq channel
- memcpy(&iFMod[ns_from], &ChanBuf[ns_from], ns_len * sizeof(iFMod[0]));
- if(s_chan[ch].bRVBActive)
- mix_chan_rvb(ns_from, ns_len, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume, spu.sRVBStart);
- else
- mix_chan(ns_from, ns_len, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume);
- }
- }
+ if (spu.dwChannelOn == 0)
+ InitREVERB(ns_to);
+ else {
+ do_channels(ns_to);
+ }
- // advance "stopped" channels that can cause irqs
- // (all chans are always playing on the real thing..)
- if(spu.spuCtrl&CTRL_IRQ)
- for(ch=0;ch<MAXCHAN;ch++)
- {
- if(!(silentch&(1<<ch))) continue; // already handled
- if(spu.dwChannelDead&(1<<ch)) continue;
- if(s_chan[ch].pCurr > spu.pSpuIrq && s_chan[ch].pLoop > spu.pSpuIrq)
- continue;
-
- s_chan[ch].spos += s_chan[ch].sinc * (ns_to - ns_from);
- while(s_chan[ch].spos >= 28 * 0x10000)
- {
- unsigned char *start = s_chan[ch].pCurr;
-
- skip_block(ch);
- if(start == s_chan[ch].pCurr || start - spu.spuMemC < 0x1000)
- {
- // looping on self or stopped(?)
- spu.dwChannelDead |= 1<<ch;
- s_chan[ch].spos = 0;
- break;
- }
-
- s_chan[ch].spos -= 28 * 0x10000;
- }
- }
+ do_samples_finish(ns_to, silentch);
+
+ // advance "stopped" channels that can cause irqs
+ // (all chans are always playing on the real thing..)
+ if (spu.spuCtrl & CTRL_IRQ)
+ do_silent_chans(ns_to, silentch);
+
+ spu.cycles_played += ns_to * 768;
+ spu.decode_pos = (spu.decode_pos + ns_to) & 0x1ff;
+}
+
+void do_samples_finish(int ns_to, int silentch)
+{
+ int volmult = spu_config.iVolume;
+ int ns;
+ int d;
if(unlikely(silentch & spu.decode_dirty_ch & (1<<1))) // must clear silent channel decode buffers
{
//---------------------------------------------------//
// mix XA infos (if any)
- MixXA(ns_to);
+ MixXA(ns_to, spu.decode_pos);
///////////////////////////////////////////////////////
// mix all channels (including reverb) into one buffer
*spu.pS++ = d;
ns++;
}
-
- spu.cycles_played += ns_to * 768;
-
- spu.decode_pos = (spu.decode_pos + ns_to) & 0x1ff;
- }
}
void schedule_next_irq(void)
spu.spuAddr = 0xffffffff;
spu.decode_pos = 0;
memset((void *)s_chan, 0, sizeof(s_chan));
- spu.pSpuIrq = 0;
+ spu.pSpuIrq = spu.spuMemC;
SetupStreams(); // prepare streaming
notaz.gp2x.de / pcsx_rearmed.git / blobdiff