***************************************************************************/
#include "stdafx.h"
+#include "spu.h"
#define _IN_XA
#include <stdint.h>
// MIX XA & CDDA
////////////////////////////////////////////////////////////////////////
-INLINE void MixXA(int *SSumLR, int ns_to, int decode_pos)
+INLINE void MixXA(int *SSumLR, int *RVB, int ns_to, int decode_pos)
{
int cursor = decode_pos;
int ns;
if(spu.XAPlay == spu.XAFeed)
spu.XARepeat--;
- for(ns = 0; ns < ns_to*2; )
+ for(ns = 0; ns < ns_to*2; ns += 2)
{
if(spu.XAPlay != spu.XAFeed) v=*spu.XAPlay++;
if(spu.XAPlay == spu.XAEnd) spu.XAPlay=spu.XAStart;
l = ((int)(short)v * spu.iLeftXAVol) >> 15;
r = ((int)(short)(v >> 16) * spu.iLeftXAVol) >> 15;
- SSumLR[ns++] += l;
- SSumLR[ns++] += r;
+ if (spu.spuCtrl & CTRL_CD)
+ {
+ SSumLR[ns+0] += l;
+ SSumLR[ns+1] += r;
+ }
+ if (unlikely(spu.spuCtrl & CTRL_CDREVERB))
+ {
+ RVB[ns+0] += l;
+ RVB[ns+1] += r;
+ }
- spu.spuMem[cursor] = v;
- spu.spuMem[cursor + 0x400/2] = v >> 16;
+ spu.spuMem[cursor] = HTOLE16(v);
+ spu.spuMem[cursor + 0x400/2] = HTOLE16(v >> 16);
cursor = (cursor + 1) & 0x1ff;
}
spu.XALastVal = v;
// hence this 'ns_to < 8'
else if(spu.CDDAPlay != spu.CDDAFeed || ns_to < 8)
{
- for(ns = 0; ns < ns_to*2; )
+ for(ns = 0; ns < ns_to*2; ns += 2)
{
if(spu.CDDAPlay != spu.CDDAFeed) v=*spu.CDDAPlay++;
if(spu.CDDAPlay == spu.CDDAEnd) spu.CDDAPlay=spu.CDDAStart;
l = ((int)(short)v * spu.iLeftXAVol) >> 15;
r = ((int)(short)(v >> 16) * spu.iLeftXAVol) >> 15;
- SSumLR[ns++] += l;
- SSumLR[ns++] += r;
+ if (spu.spuCtrl & CTRL_CD)
+ {
+ SSumLR[ns+0] += l;
+ SSumLR[ns+1] += r;
+ }
+ if (unlikely(spu.spuCtrl & CTRL_CDREVERB))
+ {
+ RVB[ns+0] += l;
+ RVB[ns+1] += r;
+ }
- spu.spuMem[cursor] = v;
- spu.spuMem[cursor + 0x400/2] = v >> 16;
+ spu.spuMem[cursor] = HTOLE16(v);
+ spu.spuMem[cursor + 0x400/2] = HTOLE16(v >> 16);
cursor = (cursor + 1) & 0x1ff;
}
spu.XALastVal = v;
spos -= 0x10000L;
}
vl = (spos >> 6) & ~3;
- vr=(gauss[vl]*gvall0)&~2047;
- vr+=(gauss[vl+1]*gvall(1))&~2047;
- vr+=(gauss[vl+2]*gvall(2))&~2047;
- vr+=(gauss[vl+3]*gvall(3))&~2047;
- l= (vr >> 11) & 0xffff;
- vr=(gauss[vl]*gvalr0)&~2047;
- vr+=(gauss[vl+1]*gvalr(1))&~2047;
- vr+=(gauss[vl+2]*gvalr(2))&~2047;
- vr+=(gauss[vl+3]*gvalr(3))&~2047;
- l |= vr << 5;
+ vr=(gauss[vl]*gvall0) >> 15;
+ vr+=(gauss[vl+1]*gvall(1)) >> 15;
+ vr+=(gauss[vl+2]*gvall(2)) >> 15;
+ vr+=(gauss[vl+3]*gvall(3)) >> 15;
+ l= vr & 0xffff;
+ vr=(gauss[vl]*gvalr0) >> 15;
+ vr+=(gauss[vl+1]*gvalr(1)) >> 15;
+ vr+=(gauss[vl+2]*gvalr(2)) >> 15;
+ vr+=(gauss[vl+3]*gvalr(3)) >> 15;
+ l |= vr << 16;
}
else
{
spos -= 0x10000L;
}
vl = (spos >> 6) & ~3;
- vr=(gauss[vl]*gvall0)&~2047;
- vr+=(gauss[vl+1]*gvall(1))&~2047;
- vr+=(gauss[vl+2]*gvall(2))&~2047;
- vr+=(gauss[vl+3]*gvall(3))&~2047;
- l= (vr >> 11) & 0xffff;
- vr=(gauss[vl]*gvalr0)&~2047;
- vr+=(gauss[vl+1]*gvalr(1))&~2047;
- vr+=(gauss[vl+2]*gvalr(2))&~2047;
- vr+=(gauss[vl+3]*gvalr(3))&~2047;
- l |= vr << 5;
+ vr=(gauss[vl]*gvall0) >> 15;
+ vr+=(gauss[vl+1]*gvall(1)) >> 15;
+ vr+=(gauss[vl+2]*gvall(2)) >> 15;
+ vr+=(gauss[vl+3]*gvall(3)) >> 15;
+ l= vr & 0xffff;
+ vr=(gauss[vl]*gvalr0) >> 15;
+ vr+=(gauss[vl+1]*gvalr(1)) >> 15;
+ vr+=(gauss[vl+2]*gvalr(2)) >> 15;
+ vr+=(gauss[vl+3]*gvalr(3)) >> 15;
+ l |= vr << 16;
}
else
{
spos -= 0x10000L;
}
vl = (spos >> 6) & ~3;
- vr=(gauss[vl]*gvall0)&~2047;
- vr+=(gauss[vl+1]*gvall(1))&~2047;
- vr+=(gauss[vl+2]*gvall(2))&~2047;
- vr+=(gauss[vl+3]*gvall(3))&~2047;
- l1=s= vr >> 11;
+ vr=(gauss[vl]*gvall0) >> 15;
+ vr+=(gauss[vl+1]*gvall(1)) >> 15;
+ vr+=(gauss[vl+2]*gvall(2)) >> 15;
+ vr+=(gauss[vl+3]*gvall(3)) >> 15;
+ l1=s= vr;
l1 &= 0xffff;
}
else
spos -= 0x10000L;
}
vl = (spos >> 6) & ~3;
- vr=(gauss[vl]*gvall0)&~2047;
- vr+=(gauss[vl+1]*gvall(1))&~2047;
- vr+=(gauss[vl+2]*gvall(2))&~2047;
- vr+=(gauss[vl+3]*gvall(3))&~2047;
- l=s= vr >> 11;
+ vr=(gauss[vl]*gvall0) >> 15;
+ vr+=(gauss[vl+1]*gvall(1)) >> 15;
+ vr+=(gauss[vl+2]*gvall(2)) >> 15;
+ vr+=(gauss[vl+3]*gvall(3)) >> 15;
+ l=s= vr;
}
else
{
}
#endif
+// vim:shiftwidth=1:expandtab