***************************************************************************/
#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;
short l, r;
- uint32_t v;
+ uint32_t v = spu.XALastVal;
if(spu.XAPlay != spu.XAFeed || spu.XARepeat > 0)
{
if(spu.XAPlay == spu.XAFeed)
spu.XARepeat--;
- v = spu.XALastVal;
- 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;
}
+ // occasionally CDDAFeed underflows by a few samples due to poor timing,
+ // hence this 'ns_to < 8'
+ else if(spu.CDDAPlay != spu.CDDAFeed || ns_to < 8)
+ {
+ 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;
- for(ns = 0; ns < ns_to * 2 && spu.CDDAPlay!=spu.CDDAFeed && (spu.CDDAPlay!=spu.CDDAEnd-1||spu.CDDAFeed!=spu.CDDAStart);)
- {
- 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;
+ l = ((int)(short)v * spu.iLeftXAVol) >> 15;
+ r = ((int)(short)(v >> 16) * spu.iLeftXAVol) >> 15;
+ 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;
- cursor = (cursor + 1) & 0x1ff;
- }
+ spu.spuMem[cursor] = HTOLE16(v);
+ spu.spuMem[cursor + 0x400/2] = HTOLE16(v >> 16);
+ cursor = (cursor + 1) & 0x1ff;
+ }
+ spu.XALastVal = v;
+ }
+ else
+ spu.XALastVal = 0;
}
////////////////////////////////////////////////////////////////////////
// small linux time helper... only used for watchdog
////////////////////////////////////////////////////////////////////////
+#if 0
static unsigned long timeGetTime_spu()
{
#if defined(NO_OS)
return tv.tv_sec * 1000 + tv.tv_usec/1000; // to do that, but at least it works
#endif
}
+#endif
////////////////////////////////////////////////////////////////////////
// FEED XA
////////////////////////////////////////////////////////////////////////
-INLINE void FeedXA(xa_decode_t *xap)
+void FeedXA(const xa_decode_t *xap)
{
int sinc,spos,i,iSize,iPlace,vl,vr;
if(!spu.bSPUIsOpen) return;
- spu.xapGlobal = xap; // store info for save states
- spu.XARepeat = 100; // set up repeat
+ spu.XARepeat = 3; // set up repeat
#if 0//def XA_HACK
iSize=((45500*xap->nsamples)/xap->freq); // get size
if(iPlace==0) return; // no place at all
//----------------------------------------------------//
+#if 0
if(spu_config.iXAPitch) // pitch change option?
{
static DWORD dwLT=0;
if(iLastSize) iSize=iLastSize;
}
}
+#endif
//----------------------------------------------------//
spos=0x10000L;
uint32_t * pS=(uint32_t *)xap->pcm;
uint32_t l=0;
+#if 0
if(spu_config.iXAPitch)
{
int32_t l1,l2;short s;
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
{
}
}
else
+#endif
{
for(i=0;i<iSize;i++)
{
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
{
unsigned short * pS=(unsigned short *)xap->pcm;
uint32_t l;short s=0;
+#if 0
if(spu_config.iXAPitch)
{
int32_t l1;
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
}
}
else
+#endif
{
for(i=0;i<iSize;i++)
{
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
{
// FEED CDDA
////////////////////////////////////////////////////////////////////////
-INLINE int FeedCDDA(unsigned char *pcm, int nBytes)
+void FeedCDDA(unsigned char *pcm, int nBytes)
{
int space;
space=(spu.CDDAPlay-spu.CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1);
if(space<nBytes)
- return 0x7761; // rearmed_wait
+ return;
while(nBytes>0)
{
nBytes-=space;
pcm+=space;
}
-
- return 0x676f; // rearmed_go
}
#endif
+// vim:shiftwidth=1:expandtab