aboutsummaryrefslogtreecommitdiff
path: root/plugins/dfsound
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/dfsound')
-rw-r--r--plugins/dfsound/adsr.c2
-rw-r--r--plugins/dfsound/alsa.c10
-rw-r--r--plugins/dfsound/arm_utils.S11
-rw-r--r--plugins/dfsound/dma.c40
-rw-r--r--plugins/dfsound/externals.h121
-rw-r--r--plugins/dfsound/freeze.c103
-rw-r--r--plugins/dfsound/oss.c14
-rw-r--r--plugins/dfsound/registers.c181
-rw-r--r--plugins/dfsound/registers.h2
-rw-r--r--plugins/dfsound/reverb.c62
-rw-r--r--plugins/dfsound/spu.c536
-rw-r--r--plugins/dfsound/spu_config.h12
-rw-r--r--plugins/dfsound/xa.c130
13 files changed, 620 insertions, 604 deletions
diff --git a/plugins/dfsound/adsr.c b/plugins/dfsound/adsr.c
index 79f593c..c1e98b3 100644
--- a/plugins/dfsound/adsr.c
+++ b/plugins/dfsound/adsr.c
@@ -218,7 +218,7 @@ done:
stop:
memset(&ChanBuf[ns], 0, (ns_to - ns) * sizeof(ChanBuf[0]));
s_chan[ch].ADSRX.EnvelopeVol = 0;
- dwChannelOn &= ~(1<<ch);
+ spu.dwChannelOn &= ~(1<<ch);
}
#endif
diff --git a/plugins/dfsound/alsa.c b/plugins/dfsound/alsa.c
index 1c02d37..b5655a9 100644
--- a/plugins/dfsound/alsa.c
+++ b/plugins/dfsound/alsa.c
@@ -16,6 +16,7 @@
***************************************************************************/
#include <stdio.h>
+#include <string.h>
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>
@@ -184,10 +185,17 @@ static int alsa_busy(void)
// FEED SOUND DATA
static void alsa_feed(void *pSound, int lBytes)
{
+ char sbuf[4096];
+
if (handle == NULL) return;
if (snd_pcm_state(handle) == SND_PCM_STATE_XRUN)
- snd_pcm_prepare(handle);
+ {
+ memset(sbuf, 0, sizeof(sbuf));
+ snd_pcm_prepare(handle);
+ snd_pcm_writei(handle, sbuf, sizeof(sbuf) / 4);
+ snd_pcm_writei(handle, sbuf, sizeof(sbuf) / 4);
+ }
snd_pcm_writei(handle,pSound, lBytes / 4);
}
diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S
index 4079471..1726389 100644
--- a/plugins/dfsound/arm_utils.S
+++ b/plugins/dfsound/arm_utils.S
@@ -15,7 +15,6 @@
.align 2
ptr_ChanBuf: .word ESYM(ChanBuf)
ptr_SSumLR: .word ESYM(SSumLR)
-ptr_sRVBStart: .word ESYM(sRVBStart)
#endif
.text
@@ -70,14 +69,13 @@ mc_finish:
bx lr
-FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv)
+FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv, int *rvb)
vmov.32 d14[0], r2
vmov.32 d14[1], r3 @ multipliers
mov r12, r0
load_varadr r0, ChanBuf
- load_varadr r3, sRVBStart
+ ldr r3, [sp] @ rvb
load_varadr r2, SSumLR
- ldr r3, [r3]
add r0, r12, lsl #2
add r2, r12, lsl #3
add r3, r12, lsl #3
@@ -143,14 +141,13 @@ mc_finish:
ldmfd sp!, {r4-r8,pc}
-FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv)
+FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv, int *rvb)
stmfd sp!, {r4-r8,lr}
orr lr, r2, r3, lsl #16
lsl lr, #1
- load_varadr r3, sRVBStart
+ ldr r3, [sp] @ rvb
load_varadr r2, SSumLR
load_varadr r4, ChanBuf
- ldr r3, [r3]
add r2, r2, r0, lsl #3
add r3, r3, r0, lsl #3
add r0, r4, r0, lsl #2
diff --git a/plugins/dfsound/dma.c b/plugins/dfsound/dma.c
index 7c164ac..d3706b9 100644
--- a/plugins/dfsound/dma.c
+++ b/plugins/dfsound/dma.c
@@ -27,9 +27,9 @@
unsigned short CALLBACK SPUreadDMA(void)
{
- unsigned short s=spuMem[spuAddr>>1];
- spuAddr+=2;
- if(spuAddr>0x7ffff) spuAddr=0;
+ unsigned short s=spu.spuMem[spu.spuAddr>>1];
+ spu.spuAddr+=2;
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0;
return s;
}
@@ -38,15 +38,18 @@ unsigned short CALLBACK SPUreadDMA(void)
// READ DMA (many values)
////////////////////////////////////////////////////////////////////////
-void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize)
+void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,
+ unsigned int cycles)
{
int i;
+ do_samples_if_needed(cycles);
+
for(i=0;i<iSize;i++)
{
- *pusPSXMem++=spuMem[spuAddr>>1]; // spu addr got by writeregister
- spuAddr+=2; // inc spu addr
- if(spuAddr>0x7ffff) spuAddr=0; // wrap
+ *pusPSXMem++=spu.spuMem[spu.spuAddr>>1]; // spu addr got by writeregister
+ spu.spuAddr+=2; // inc spu addr
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0; // wrap
}
}
@@ -64,34 +67,35 @@ void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize)
void CALLBACK SPUwriteDMA(unsigned short val)
{
- spuMem[spuAddr>>1] = val; // spu addr got by writeregister
+ spu.spuMem[spu.spuAddr>>1] = val; // spu addr got by writeregister
- spuAddr+=2; // inc spu addr
- if(spuAddr>0x7ffff) spuAddr=0; // wrap
+ spu.spuAddr+=2; // inc spu addr
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0; // wrap
}
////////////////////////////////////////////////////////////////////////
// WRITE DMA (many values)
////////////////////////////////////////////////////////////////////////
-void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize)
+void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,
+ unsigned int cycles)
{
int i;
- had_dma = 1;
+ do_samples_if_needed(cycles);
- if(spuAddr + iSize*2 < 0x80000)
+ if(spu.spuAddr + iSize*2 < 0x80000)
{
- memcpy(&spuMem[spuAddr>>1], pusPSXMem, iSize*2);
- spuAddr += iSize*2;
+ memcpy(&spu.spuMem[spu.spuAddr>>1], pusPSXMem, iSize*2);
+ spu.spuAddr += iSize*2;
return;
}
for(i=0;i<iSize;i++)
{
- spuMem[spuAddr>>1] = *pusPSXMem++; // spu addr got by writeregister
- spuAddr+=2; // inc spu addr
- spuAddr&=0x7ffff; // wrap
+ spu.spuMem[spu.spuAddr>>1] = *pusPSXMem++; // spu addr got by writeregister
+ spu.spuAddr+=2; // inc spu addr
+ spu.spuAddr&=0x7ffff; // wrap
}
}
diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 2f3028e..7935cb9 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -46,10 +46,8 @@
// num of channels
#define MAXCHAN 24
-// ~ FRAG_MSECS ms of data
// note: must be even due to the way reverb works now
-#define FRAG_MSECS 2
-#define NSSIZE ((44100 * FRAG_MSECS / 1000 + 1) & ~1)
+#define NSSIZE ((44100 / 50 + 16) & ~1)
///////////////////////////////////////////////////////////
// struct defines
@@ -90,6 +88,7 @@ typedef struct
int iSBPos; // mixing stuff
int spos;
int sinc;
+ int sinc_inv;
unsigned char * pCurr; // current pos in sound mem
unsigned char * pLoop; // loop ptr in sound mem
@@ -167,86 +166,82 @@ typedef struct
} REVERBInfo;
///////////////////////////////////////////////////////////
-// SPU.C globals
-///////////////////////////////////////////////////////////
-
-#ifndef _IN_SPU
// psx buffers / addresses
-extern unsigned short regArea[];
-extern unsigned short spuMem[];
-extern unsigned char * spuMemC;
-extern unsigned char * pSpuIrq;
-extern unsigned char * pSpuBuffer;
+typedef struct
+{
+ unsigned short spuCtrl;
+ unsigned short spuStat;
+
+ unsigned int spuAddr;
+ unsigned char * spuMemC;
+ unsigned char * pSpuIrq;
-#define regAreaGet(ch,offset) \
- regArea[((ch<<4)|(offset))>>1]
+ unsigned int cycles_played;
+ int decode_pos;
+ int decode_dirty_ch;
+ unsigned int bSpuInit:1;
+ unsigned int bSPUIsOpen:1;
-// user settings
+ unsigned int dwNoiseVal; // global noise generator
+ unsigned int dwNoiseCount;
+ unsigned int dwNewChannel; // flags for faster testing, if new channel starts
+ unsigned int dwChannelOn; // not silent channels
+ unsigned int dwChannelDead; // silent+not useful channels
-extern int iVolume;
-extern int iXAPitch;
-extern int iUseReverb;
-extern int iUseInterpolation;
-// MISC
+ unsigned char * pSpuBuffer;
+ short * pS;
-extern int had_dma;
-extern int decode_pos;
+ void (CALLBACK *irqCallback)(void); // func of main emu, called on spu irq
+ void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
+ void (CALLBACK *scheduleCallback)(unsigned int);
-extern SPUCHAN s_chan[];
-extern REVERBInfo rvb;
+ int * sRVBStart;
-extern unsigned short spuCtrl;
-extern unsigned short spuStat;
-extern unsigned short spuIrq;
-extern unsigned int spuAddr;
-extern int bSpuInit;
-extern unsigned int dwNewChannel;
-extern unsigned int dwChannelOn;
-extern unsigned int dwPendingChanOff;
-extern unsigned int dwChannelDead;
+ xa_decode_t * xapGlobal;
+ unsigned int * XAFeed;
+ unsigned int * XAPlay;
+ unsigned int * XAStart;
+ unsigned int * XAEnd;
-extern int SSumR[];
-extern int SSumL[];
-extern int iCycle;
-extern short * pS;
+ unsigned int * CDDAFeed;
+ unsigned int * CDDAPlay;
+ unsigned int * CDDAStart;
+ unsigned int * CDDAEnd;
-extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
+ unsigned int XARepeat;
+ unsigned int XALastVal;
-#endif
+ int iLeftXAVol;
+ int iRightXAVol;
+
+ int pad[32];
+ unsigned short regArea[0x400];
+ unsigned short spuMem[256*1024];
+} SPUInfo;
///////////////////////////////////////////////////////////
-// XA.C globals
+// SPU.C globals
///////////////////////////////////////////////////////////
-#ifndef _IN_XA
+#ifndef _IN_SPU
-extern xa_decode_t * xapGlobal;
+extern SPUInfo spu;
+extern SPUCHAN s_chan[];
+extern REVERBInfo rvb;
-extern uint32_t * XAFeed;
-extern uint32_t * XAPlay;
-extern uint32_t * XAStart;
-extern uint32_t * XAEnd;
+void do_samples(unsigned int cycles_to);
+void schedule_next_irq(void);
-extern uint32_t * CDDAFeed;
-extern uint32_t * CDDAPlay;
-extern uint32_t * CDDAStart;
-extern uint32_t * CDDAEnd;
+#define regAreaGet(ch,offset) \
+ spu.regArea[((ch<<4)|(offset))>>1]
-extern int iLeftXAVol;
-extern int iRightXAVol;
+#define do_samples_if_needed(c) \
+ do { \
+ if ((int)((c) - spu.cycles_played) >= 16 * 768) \
+ do_samples(c); \
+ } while (0)
#endif
-///////////////////////////////////////////////////////////
-// REVERB.C globals
-///////////////////////////////////////////////////////////
-
-#ifndef _IN_REVERB
-
-extern int * sRVBPlay;
-extern int * sRVBEnd;
-extern int * sRVBStart;
-
-#endif
diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 0601bf5..b865b84 100644
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -132,16 +132,14 @@ typedef struct
////////////////////////////////////////////////////////////////////////
void LoadStateV5(SPUFreeze_t * pF); // newest version
-void LoadStateUnknown(SPUFreeze_t * pF); // unknown format
-
-extern int lastch;
+void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles); // unknown format
// we want to retain compatibility between versions,
// so use original channel struct
static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
{
memset(d, 0, sizeof(*d));
- d->bNew = !!(dwNewChannel & (1<<ch));
+ d->bNew = !!(spu.dwNewChannel & (1<<ch));
d->iSBPos = s->iSBPos;
d->spos = s->spos;
d->sinc = s->sinc;
@@ -149,7 +147,7 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
d->iStart = (regAreaGet(ch,6)&~1)<<3;
d->iCurr = 0; // set by the caller
d->iLoop = 0; // set by the caller
- d->bOn = !!(dwChannelOn & (1<<ch));
+ d->bOn = !!(spu.dwChannelOn & (1<<ch));
d->bStop = s->bStop;
d->bReverb = s->bReverb;
d->iActFreq = 1;
@@ -181,10 +179,12 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
{
memset(d, 0, sizeof(*d));
- if (s->bNew) dwNewChannel |= 1<<ch;
+ if (s->bNew) spu.dwNewChannel |= 1<<ch;
d->iSBPos = s->iSBPos;
+ if ((uint32_t)d->iSBPos >= 28) d->iSBPos = 27;
d->spos = s->spos;
d->sinc = s->sinc;
+ d->sinc_inv = 0;
memcpy(d->SB, s->SB, sizeof(d->SB));
d->pCurr = (void *)((long)s->iCurr & 0x7fff0);
d->pLoop = (void *)((long)s->iLoop & 0x7fff0);
@@ -208,15 +208,24 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;
d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;
d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;
- if (s->bOn) dwChannelOn |= 1<<ch;
+ if (s->bOn) spu.dwChannelOn |= 1<<ch;
else d->ADSRX.EnvelopeVol = 0;
}
+// force load from regArea to variables
+static void load_register(unsigned long reg, unsigned int cycles)
+{
+ unsigned short *r = &spu.regArea[((reg & 0xfff) - 0xc00) >> 1];
+ *r ^= 1;
+ SPUwriteRegister(reg, *r ^ 1, cycles);
+}
+
////////////////////////////////////////////////////////////////////////
// SPUFREEZE: called by main emu on savestate load/save
////////////////////////////////////////////////////////////////////////
-long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
+long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
+ uint32_t cycles)
{
int i;SPUOSSFreeze_t * pFO;
@@ -233,31 +242,33 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
if(ulFreezeMode==2) return 1; // info mode? ok, bye
// save mode:
- memcpy(pF->cSPURam,spuMem,0x80000); // copy common infos
- memcpy(pF->cSPUPort,regArea,0x200);
+ do_samples(cycles);
+
+ memcpy(pF->cSPURam,spu.spuMem,0x80000); // copy common infos
+ memcpy(pF->cSPUPort,spu.regArea,0x200);
- if(xapGlobal && XAPlay!=XAFeed) // some xa
+ if(spu.xapGlobal && spu.XAPlay!=spu.XAFeed) // some xa
{
- pF->xaS=*xapGlobal;
+ pF->xaS=*spu.xapGlobal;
}
else
memset(&pF->xaS,0,sizeof(xa_decode_t)); // or clean xa
pFO=(SPUOSSFreeze_t *)(pF+1); // store special stuff
- pFO->spuIrq=spuIrq;
- if(pSpuIrq) pFO->pSpuIrq = (unsigned long)pSpuIrq-(unsigned long)spuMemC;
+ pFO->spuIrq = spu.regArea[(H_SPUirqAddr - 0x0c00) / 2];
+ if(spu.pSpuIrq) pFO->pSpuIrq = (unsigned long)spu.pSpuIrq-(unsigned long)spu.spuMemC;
- pFO->spuAddr=spuAddr;
+ pFO->spuAddr=spu.spuAddr;
if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
for(i=0;i<MAXCHAN;i++)
{
save_channel(&pFO->s_chan[i],&s_chan[i],i);
if(s_chan[i].pCurr)
- pFO->s_chan[i].iCurr=s_chan[i].pCurr-spuMemC;
+ pFO->s_chan[i].iCurr=s_chan[i].pCurr-spu.spuMemC;
if(s_chan[i].pLoop)
- pFO->s_chan[i].iLoop=s_chan[i].pLoop-spuMemC;
+ pFO->s_chan[i].iLoop=s_chan[i].pLoop-spu.spuMemC;
}
return 1;
@@ -266,36 +277,35 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
if(ulFreezeMode!=0) return 0; // bad mode? bye
- memcpy(spuMem,pF->cSPURam,0x80000); // get ram
- memcpy(regArea,pF->cSPUPort,0x200);
+ memcpy(spu.spuMem,pF->cSPURam,0x80000); // get ram
+ memcpy(spu.regArea,pF->cSPUPort,0x200);
if(pF->xaS.nsamples<=4032) // start xa again
SPUplayADPCMchannel(&pF->xaS);
- xapGlobal=0;
+ spu.xapGlobal=0;
if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)
LoadStateV5(pF);
- else LoadStateUnknown(pF);
-
- lastch = -1;
+ else LoadStateUnknown(pF, cycles);
// repair some globals
for(i=0;i<=62;i+=2)
- SPUwriteRegister(H_Reverb+i,regArea[(H_Reverb+i-0xc00)>>1]);
- SPUwriteRegister(H_SPUReverbAddr,regArea[(H_SPUReverbAddr-0xc00)>>1]);
- SPUwriteRegister(H_SPUrvolL,regArea[(H_SPUrvolL-0xc00)>>1]);
- SPUwriteRegister(H_SPUrvolR,regArea[(H_SPUrvolR-0xc00)>>1]);
+ load_register(H_Reverb+i, cycles);
+ load_register(H_SPUReverbAddr, cycles);
+ load_register(H_SPUrvolL, cycles);
+ load_register(H_SPUrvolR, cycles);
- SPUwriteRegister(H_SPUctrl,(unsigned short)(regArea[(H_SPUctrl-0xc00)>>1]|0x4000));
- SPUwriteRegister(H_SPUstat,regArea[(H_SPUstat-0xc00)>>1]);
- SPUwriteRegister(H_CDLeft,regArea[(H_CDLeft-0xc00)>>1]);
- SPUwriteRegister(H_CDRight,regArea[(H_CDRight-0xc00)>>1]);
+ load_register(H_SPUctrl, cycles);
+ load_register(H_SPUstat, cycles);
+ load_register(H_CDLeft, cycles);
+ load_register(H_CDRight, cycles);
// fix to prevent new interpolations from crashing
for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;
ClearWorkingState();
+ spu.cycles_played = cycles;
return 1;
}
@@ -308,47 +318,46 @@ void LoadStateV5(SPUFreeze_t * pF)
pFO=(SPUOSSFreeze_t *)(pF+1);
- spuIrq = pFO->spuIrq;
- if(pFO->pSpuIrq) pSpuIrq = spuMemC+((long)pFO->pSpuIrq&0x7fff0); else pSpuIrq=NULL;
+ if(pFO->pSpuIrq) spu.pSpuIrq = spu.spuMemC+((long)pFO->pSpuIrq&0x7fff0); else spu.pSpuIrq=NULL;
if(pFO->spuAddr)
{
- spuAddr = pFO->spuAddr;
- if (spuAddr == 0xbaadf00d) spuAddr = 0;
+ spu.spuAddr = pFO->spuAddr;
+ if (spu.spuAddr == 0xbaadf00d) spu.spuAddr = 0;
}
- dwNewChannel=0;
- dwChannelOn=0;
- dwChannelDead=0;
+ spu.dwNewChannel=0;
+ spu.dwChannelOn=0;
+ spu.dwChannelDead=0;
for(i=0;i<MAXCHAN;i++)
{
load_channel(&s_chan[i],&pFO->s_chan[i],i);
- s_chan[i].pCurr+=(unsigned long)spuMemC;
- s_chan[i].pLoop+=(unsigned long)spuMemC;
+ s_chan[i].pCurr+=(unsigned long)spu.spuMemC;
+ s_chan[i].pLoop+=(unsigned long)spu.spuMemC;
}
}
////////////////////////////////////////////////////////////////////////
-void LoadStateUnknown(SPUFreeze_t * pF)
+void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles)
{
int i;
for(i=0;i<MAXCHAN;i++)
{
s_chan[i].bStop=0;
- s_chan[i].pLoop=spuMemC;
+ s_chan[i].pLoop=spu.spuMemC;
}
- dwNewChannel=0;
- dwChannelOn=0;
- dwChannelDead=0;
- pSpuIrq=0;
+ spu.dwNewChannel=0;
+ spu.dwChannelOn=0;
+ spu.dwChannelDead=0;
+ spu.pSpuIrq=0;
for(i=0;i<0xc0;i++)
{
- SPUwriteRegister(0x1f801c00+i*2,regArea[i]);
+ load_register(0x1f801c00 + i*2, cycles);
}
}
diff --git a/plugins/dfsound/oss.c b/plugins/dfsound/oss.c
index 709cb37..8093ae4 100644
--- a/plugins/dfsound/oss.c
+++ b/plugins/dfsound/oss.c
@@ -16,6 +16,7 @@
***************************************************************************/
#include <stdio.h>
+#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -153,7 +154,20 @@ static int oss_busy(void)
static void oss_feed(void *buf, int bytes)
{
+ audio_buf_info info;
+ char sbuf[4096];
+
if(oss_audio_fd == -1) return;
+ if(ioctl(oss_audio_fd,SNDCTL_DSP_GETOSPACE,&info)==0)
+ {
+ if(info.fragments==info.fragstotal)
+ {
+ memset(sbuf, 0, sizeof(sbuf));
+ write(oss_audio_fd, sbuf, sizeof(sbuf));
+ write(oss_audio_fd, sbuf, sizeof(sbuf));
+ }
+ }
+
write(oss_audio_fd, buf, bytes);
}
diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index b9c1256..210adb2 100644
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -21,6 +21,7 @@
#include "externals.h"
#include "registers.h"
+#include "spu_config.h"
static void SoundOn(int start,int end,unsigned short val);
static void SoundOff(int start,int end,unsigned short val);
@@ -35,10 +36,28 @@ static void ReverbOn(int start,int end,unsigned short val);
// WRITE REGISTERS: called by main emu
////////////////////////////////////////////////////////////////////////
-void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
+static const uint32_t ignore_dupe[8] = {
+ // ch 0-15 c40 c80 cc0
+ 0x7f7f7f7f, 0x7f7f7f7f, 0x7f7f7f7f, 0x7f7f7f7f,
+ // ch 16-24 d40 control reverb
+ 0x7f7f7f7f, 0x7f7f7f7f, 0xff05ff0f, 0xffffffff
+};
+
+void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
+ unsigned int cycles)
{
- const unsigned long r=reg&0xfff;
- regArea[(r-0xc00)>>1] = val;
+ int r = reg & 0xfff;
+ int rofs = (r - 0xc00) >> 1;
+ int changed = spu.regArea[rofs] != val;
+ spu.regArea[rofs] = val;
+
+ if (!changed && (ignore_dupe[rofs >> 5] & (1 << (rofs & 0x1f))))
+ return;
+ // zero keyon/keyoff?
+ if (val == 0 && (r & 0xff8) == 0xd88)
+ return;
+
+ do_samples_if_needed(cycles);
if(r>=0x0c00 && r<0x0d80) // some channel info?
{
@@ -56,7 +75,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
//------------------------------------------------// pitch
case 4:
SetPitch(ch,val);
- break;
+ goto upd_irq;
//------------------------------------------------// start
case 6:
// taken from regArea later
@@ -92,8 +111,8 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
break;
//------------------------------------------------//
case 14: // loop?
- s_chan[ch].pLoop=spuMemC+((val&~1)<<3);
- break;
+ s_chan[ch].pLoop=spu.spuMemC+((val&~1)<<3);
+ goto upd_irq;
//------------------------------------------------//
}
return;
@@ -103,23 +122,26 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
{
//-------------------------------------------------//
case H_SPUaddr:
- spuAddr = (unsigned long) val<<3;
+ spu.spuAddr = (unsigned long) val<<3;
break;
//-------------------------------------------------//
case H_SPUdata:
- spuMem[spuAddr>>1] = val;
- spuAddr+=2;
- if(spuAddr>0x7ffff) spuAddr=0;
+ spu.spuMem[spu.spuAddr>>1] = val;
+ spu.spuAddr+=2;
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0;
break;
//-------------------------------------------------//
case H_SPUctrl:
- if(!(spuCtrl & CTRL_IRQ))
- spuStat&=~STAT_IRQ;
- spuCtrl=val;
+ if (!(spu.spuCtrl & CTRL_IRQ)) {
+ spu.spuStat&=~STAT_IRQ;
+ if (val & CTRL_IRQ)
+ schedule_next_irq();
+ }
+ spu.spuCtrl=val;
break;
//-------------------------------------------------//
case H_SPUstat:
- spuStat=val & 0xf800;
+ spu.spuStat=val&0xf800;
break;
//-------------------------------------------------//
case H_SPUReverbAddr:
@@ -132,18 +154,13 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
{
rvb.StartAddr=(unsigned long)val<<2;
rvb.CurrAddr=rvb.StartAddr;
- // sync-with-decode-buffers hack..
- if(rvb.StartAddr==0x3ff00)
- rvb.CurrAddr+=decode_pos/2;
}
}
- rvb.dirty = 1;
- break;
+ goto rvbd;
//-------------------------------------------------//
case H_SPUirqAddr:
- spuIrq = val;
- pSpuIrq=spuMemC+(((unsigned long) val<<3)&~0xf);
- break;
+ spu.pSpuIrq=spu.spuMemC+(((unsigned long) val<<3)&~0xf);
+ goto upd_irq;
//-------------------------------------------------//
case H_SPUrvolL:
rvb.VolLeft=val;
@@ -197,12 +214,12 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
break;
//-------------------------------------------------//
case H_CDLeft:
- iLeftXAVol=val & 0x7fff;
- if(cddavCallback) cddavCallback(0,val);
+ spu.iLeftXAVol=val & 0x7fff;
+ if(spu.cddavCallback) spu.cddavCallback(0,val);
break;
case H_CDRight:
- iRightXAVol=val & 0x7fff;
- if(cddavCallback) cddavCallback(1,val);
+ spu.iRightXAVol=val & 0x7fff;
+ if(spu.cddavCallback) spu.cddavCallback(1,val);
break;
//-------------------------------------------------//
case H_FMod1:
@@ -229,42 +246,48 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
ReverbOn(16,24,val);
break;
//-------------------------------------------------//
- case H_Reverb+0 : rvb.FB_SRC_A=val*4; break;
- case H_Reverb+2 : rvb.FB_SRC_B=val*4; break;
- case H_Reverb+4 : rvb.IIR_ALPHA=(short)val; break;
- case H_Reverb+6 : rvb.ACC_COEF_A=(short)val; break;
- case H_Reverb+8 : rvb.ACC_COEF_B=(short)val; break;
- case H_Reverb+10 : rvb.ACC_COEF_C=(short)val; break;
- case H_Reverb+12 : rvb.ACC_COEF_D=(short)val; break;
- case H_Reverb+14 : rvb.IIR_COEF=(short)val; break;
- case H_Reverb+16 : rvb.FB_ALPHA=(short)val; break;
- case H_Reverb+18 : rvb.FB_X=(short)val; break;
- case H_Reverb+20 : rvb.IIR_DEST_A0=val*4; break;
- case H_Reverb+22 : rvb.IIR_DEST_A1=val*4; break;
- case H_Reverb+24 : rvb.ACC_SRC_A0=val*4; break;
- case H_Reverb+26 : rvb.ACC_SRC_A1=val*4; break;
- case H_Reverb+28 : rvb.ACC_SRC_B0=val*4; break;
- case H_Reverb+30 : rvb.ACC_SRC_B1=val*4; break;
- case H_Reverb+32 : rvb.IIR_SRC_A0=val*4; break;
- case H_Reverb+34 : rvb.IIR_SRC_A1=val*4; break;
- case H_Reverb+36 : rvb.IIR_DEST_B0=val*4; break;
- case H_Reverb+38 : rvb.IIR_DEST_B1=val*4; break;
- case H_Reverb+40 : rvb.ACC_SRC_C0=val*4; break;
- case H_Reverb+42 : rvb.ACC_SRC_C1=val*4; break;
- case H_Reverb+44 : rvb.ACC_SRC_D0=val*4; break;
- case H_Reverb+46 : rvb.ACC_SRC_D1=val*4; break;
- case H_Reverb+48 : rvb.IIR_SRC_B1=val*4; break;
- case H_Reverb+50 : rvb.IIR_SRC_B0=val*4; break;
- case H_Reverb+52 : rvb.MIX_DEST_A0=val*4; break;
- case H_Reverb+54 : rvb.MIX_DEST_A1=val*4; break;
- case H_Reverb+56 : rvb.MIX_DEST_B0=val*4; break;
- case H_Reverb+58 : rvb.MIX_DEST_B1=val*4; break;
- case H_Reverb+60 : rvb.IN_COEF_L=(short)val; break;
- case H_Reverb+62 : rvb.IN_COEF_R=(short)val; break;
+ case H_Reverb+0 : rvb.FB_SRC_A=val*4; goto rvbd;
+ case H_Reverb+2 : rvb.FB_SRC_B=val*4; goto rvbd;
+ case H_Reverb+4 : rvb.IIR_ALPHA=(short)val; goto rvbd;
+ case H_Reverb+6 : rvb.ACC_COEF_A=(short)val; goto rvbd;
+ case H_Reverb+8 : rvb.ACC_COEF_B=(short)val; goto rvbd;
+ case H_Reverb+10 : rvb.ACC_COEF_C=(short)val; goto rvbd;
+ case H_Reverb+12 : rvb.ACC_COEF_D=(short)val; goto rvbd;
+ case H_Reverb+14 : rvb.IIR_COEF=(short)val; goto rvbd;
+ case H_Reverb+16 : rvb.FB_ALPHA=(short)val; goto rvbd;
+ case H_Reverb+18 : rvb.FB_X=(short)val; goto rvbd;
+ case H_Reverb+20 : rvb.IIR_DEST_A0=val*4; goto rvbd;
+ case H_Reverb+22 : rvb.IIR_DEST_A1=val*4; goto rvbd;
+ case H_Reverb+24 : rvb.ACC_SRC_A0=val*4; goto rvbd;
+ case H_Reverb+26 : rvb.ACC_SRC_A1=val*4; goto rvbd;
+ case H_Reverb+28 : rvb.ACC_SRC_B0=val*4; goto rvbd;
+ case H_Reverb+30 : rvb.ACC_SRC_B1=val*4; goto rvbd;
+ case H_Reverb+32 : rvb.IIR_SRC_A0=val*4; goto rvbd;
+ case H_Reverb+34 : rvb.IIR_SRC_A1=val*4; goto rvbd;
+ case H_Reverb+36 : rvb.IIR_DEST_B0=val*4; goto rvbd;
+ case H_Reverb+38 : rvb.IIR_DEST_B1=val*4; goto rvbd;
+ case H_Reverb+40 : rvb.ACC_SRC_C0=val*4; goto rvbd;
+ case H_Reverb+42 : rvb.ACC_SRC_C1=val*4; goto rvbd;
+ case H_Reverb+44 : rvb.ACC_SRC_D0=val*4; goto rvbd;
+ case H_Reverb+46 : rvb.ACC_SRC_D1=val*4; goto rvbd;
+ case H_Reverb+48 : rvb.IIR_SRC_B1=val*4; goto rvbd;
+ case H_Reverb+50 : rvb.IIR_SRC_B0=val*4; goto rvbd;
+ case H_Reverb+52 : rvb.MIX_DEST_A0=val*4; goto rvbd;
+ case H_Reverb+54 : rvb.MIX_DEST_A1=val*4; goto rvbd;
+ case H_Reverb+56 : rvb.MIX_DEST_B0=val*4; goto rvbd;
+ case H_Reverb+58 : rvb.MIX_DEST_B1=val*4; goto rvbd;
+ case H_Reverb+60 : rvb.IN_COEF_L=(short)val; goto rvbd;
+ case H_Reverb+62 : rvb.IN_COEF_R=(short)val; goto rvbd;
}
+ return;
- if ((r & ~0x3f) == H_Reverb)
- rvb.dirty = 1; // recalculate on next update
+upd_irq:
+ if (spu.spuCtrl & CTRL_IRQ)
+ schedule_next_irq();
+ return;
+
+rvbd:
+ rvb.dirty = 1; // recalculate on next update
}
////////////////////////////////////////////////////////////////////////
@@ -282,8 +305,8 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
case 12: // get adsr vol
{
const int ch=(r>>4)-0xc0;
- if(dwNewChannel&(1<<ch)) return 1; // we are started, but not processed? return 1
- if((dwChannelOn&(1<<ch)) && // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well
+ if(spu.dwNewChannel&(1<<ch)) return 1; // we are started, but not processed? return 1
+ if((spu.dwChannelOn&(1<<ch)) && // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well
!s_chan[ch].ADSRX.EnvelopeVol)
return 1;
return (unsigned short)(s_chan[ch].ADSRX.EnvelopeVol>>16);
@@ -292,7 +315,7 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
case 14: // get loop address
{
const int ch=(r>>4)-0xc0;
- return (unsigned short)((s_chan[ch].pLoop-spuMemC)>>3);
+ return (unsigned short)((s_chan[ch].pLoop-spu.spuMemC)>>3);
}
}
}
@@ -300,25 +323,22 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
switch(r)
{
case H_SPUctrl:
- return spuCtrl;
+ return spu.spuCtrl;
case H_SPUstat:
- return spuStat;
+ return spu.spuStat;
case H_SPUaddr:
- return (unsigned short)(spuAddr>>3);
+ return (unsigned short)(spu.spuAddr>>3);
case H_SPUdata:
{
- unsigned short s=spuMem[spuAddr>>1];
- spuAddr+=2;
- if(spuAddr>0x7ffff) spuAddr=0;
+ unsigned short s=spu.spuMem[spu.spuAddr>>1];
+ spu.spuAddr+=2;
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0;
return s;
}
- case H_SPUirqAddr:
- return spuIrq;
-
//case H_SPUIsOn1:
// return IsSoundOn(0,16);
@@ -327,7 +347,7 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
}
- return regArea[(r-0xc00)>>1];
+ return spu.regArea[(r-0xc00)>>1];
}
////////////////////////////////////////////////////////////////////////
@@ -345,13 +365,13 @@ static void SoundOn(int start,int end,unsigned short val)
// do this here, not in StartSound
// - fixes fussy timing issues
s_chan[ch].bStop=0;
- s_chan[ch].pCurr=spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned
- s_chan[ch].pLoop=spuMemC+((regAreaGet(ch,14)&~1)<<3);
+ s_chan[ch].pCurr=spu.spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned
+ s_chan[ch].pLoop=spu.spuMemC+((regAreaGet(ch,14)&~1)<<3);
s_chan[ch].prevflags=2;
- dwNewChannel|=(1<<ch); // bitfield for faster testing
- dwChannelOn|=1<<ch;
- dwChannelDead&=~(1<<ch);
+ spu.dwNewChannel|=(1<<ch);
+ spu.dwChannelOn|=1<<ch;
+ spu.dwChannelDead&=~(1<<ch);
}
}
}
@@ -371,7 +391,7 @@ static void SoundOff(int start,int end,unsigned short val)
// Jungle Book - Rhythm 'n Groove
// - turns off buzzing sound (loop hangs)
- dwNewChannel &= ~(1<<ch);
+ spu.dwNewChannel &= ~(1<<ch);
}
}
}
@@ -484,7 +504,8 @@ static void SetPitch(int ch,unsigned short val) // SET PITCH
s_chan[ch].iRawPitch=NP;
s_chan[ch].sinc=(NP<<4)|8;
- if(iUseInterpolation==1) s_chan[ch].SB[32]=1; // -> freq change in simple interpolation mode: set flag
+ s_chan[ch].sinc_inv=0;
+ if(spu_config.iUseInterpolation==1) s_chan[ch].SB[32]=1; // -> freq change in simple interpolation mode: set flag
}
////////////////////////////////////////////////////////////////////////
diff --git a/plugins/dfsound/registers.h b/plugins/dfsound/registers.h
index cb95bc1..3bca518 100644
--- a/plugins/dfsound/registers.h
+++ b/plugins/dfsound/registers.h
@@ -152,5 +152,5 @@
///////////////////////////////////////////////////////////
-void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val);
+void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val, unsigned int cycles);
diff --git a/plugins/dfsound/reverb.c b/plugins/dfsound/reverb.c
index ebb709b..bb5ee8e 100644
--- a/plugins/dfsound/reverb.c
+++ b/plugins/dfsound/reverb.c
@@ -27,24 +27,14 @@
#ifdef _IN_SPU
////////////////////////////////////////////////////////////////////////
-// globals
-////////////////////////////////////////////////////////////////////////
-
-// REVERB info and timing vars...
-
-int * sRVBPlay = 0;
-int * sRVBEnd = 0;
-int * sRVBStart = 0;
-
-////////////////////////////////////////////////////////////////////////
// START REVERB
////////////////////////////////////////////////////////////////////////
INLINE void StartREVERB(int ch)
{
- if(s_chan[ch].bReverb && (spuCtrl&0x80)) // reverb possible?
+ if(s_chan[ch].bReverb && (spu.spuCtrl&0x80)) // reverb possible?
{
- s_chan[ch].bRVBActive=!!iUseReverb;
+ s_chan[ch].bRVBActive=!!spu_config.iUseReverb;
}
else s_chan[ch].bRVBActive=0; // else -> no reverb
}
@@ -53,21 +43,9 @@ INLINE void StartREVERB(int ch)
// HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf
////////////////////////////////////////////////////////////////////////
-INLINE void InitREVERB(void)
-{
- memset(sRVBStart,0,NSSIZE*2*4);
-}
-
-////////////////////////////////////////////////////////////////////////
-// STORE REVERB
-////////////////////////////////////////////////////////////////////////
-
-INLINE void StoreREVERB(int ch,int ns,int l,int r)
+INLINE void InitREVERB(int ns_to)
{
- ns<<=1;
-
- sRVBStart[ns] +=l; // -> we mix all active reverb channels into an extra buffer
- sRVBStart[ns+1]+=r;
+ memset(spu.sRVBStart,0,ns_to*sizeof(spu.sRVBStart[0])*2);
}
////////////////////////////////////////////////////////////////////////
@@ -81,36 +59,36 @@ INLINE int rvb2ram_offs(int curr, int space, int iOff)
// get_buffer content helper: takes care about wraps
#define g_buffer(var) \
- ((int)(signed short)spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)])
+ ((int)(signed short)spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)])
// saturate iVal and store it as var
#define s_buffer(var, iVal) \
ssat32_to_16(iVal); \
- spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal
+ spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal
#define s_buffer1(var, iVal) \
ssat32_to_16(iVal); \
- spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal
+ spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal
////////////////////////////////////////////////////////////////////////
// portions based on spu2-x from PCSX2
-static void MixREVERB(void)
+static void MixREVERB(int ns_to)
{
int l_old = rvb.iRVBLeft;
int r_old = rvb.iRVBRight;
int curr_addr = rvb.CurrAddr;
int space = 0x40000 - rvb.StartAddr;
- int l, r, ns;
+ int l = 0, r = 0, ns;
- for (ns = 0; ns < NSSIZE*2; )
+ for (ns = 0; ns < ns_to * 2; )
{
int IIR_ALPHA = rvb.IIR_ALPHA;
int ACC0, ACC1, FB_A0, FB_A1, FB_B0, FB_B1;
int mix_dest_a0, mix_dest_a1, mix_dest_b0, mix_dest_b1;
- int input_L = sRVBStart[ns] * rvb.IN_COEF_L;
- int input_R = sRVBStart[ns+1] * rvb.IN_COEF_R;
+ int input_L = spu.sRVBStart[ns] * rvb.IN_COEF_L;
+ int input_R = spu.sRVBStart[ns+1] * rvb.IN_COEF_R;
int IIR_INPUT_A0 = ((g_buffer(IIR_SRC_A0) * rvb.IIR_COEF) + input_L) >> 15;
int IIR_INPUT_A1 = ((g_buffer(IIR_SRC_A1) * rvb.IIR_COEF) + input_R) >> 15;
@@ -180,15 +158,15 @@ static void MixREVERB(void)
rvb.CurrAddr = curr_addr;
}
-static void MixREVERB_off(void)
+static void MixREVERB_off(int ns_to)
{
int l_old = rvb.iRVBLeft;
int r_old = rvb.iRVBRight;
int curr_addr = rvb.CurrAddr;
int space = 0x40000 - rvb.StartAddr;
- int l, r, ns;
+ int l = 0, r = 0, ns;
- for (ns = 0; ns < NSSIZE*2; )
+ for (ns = 0; ns < ns_to * 2; )
{
l = (g_buffer(MIX_DEST_A0) + g_buffer(MIX_DEST_B0)) / 2;
r = (g_buffer(MIX_DEST_A1) + g_buffer(MIX_DEST_B1)) / 2;
@@ -258,7 +236,7 @@ static void prepare_offsets(void)
rvb.dirty = 0;
}
-INLINE void REVERBDo(void)
+INLINE void REVERBDo(int ns_to)
{
if (!rvb.StartAddr) // reverb is off
{
@@ -266,24 +244,24 @@ INLINE void REVERBDo(void)
return;
}
- if (spuCtrl & 0x80) // -> reverb on? oki
+ if (spu.spuCtrl & 0x80) // -> reverb on? oki
{
if (unlikely(rvb.dirty))
prepare_offsets();
- MixREVERB();
+ MixREVERB(ns_to);
}
else if (rvb.VolLeft || rvb.VolRight)
{
if (unlikely(rvb.dirty))
prepare_offsets();
- MixREVERB_off();
+ MixREVERB_off(ns_to);
}
else // -> reverb off
{
// reverb runs anyway
- rvb.CurrAddr += NSSIZE/2;
+ rvb.CurrAddr += ns_to / 2;
while (rvb.CurrAddr >= 0x40000)
rvb.CurrAddr -= 0x40000 - rvb.StartAddr;
}
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index 6cefd11..ca362b7 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -26,6 +26,7 @@
#include "registers.h"
#include "out.h"
#include "arm_features.h"
+#include "spu_config.h"
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -49,6 +50,9 @@
#define PSXCLK 33868800 /* 33.8688 MHz */
+// intended to be ~1 frame
+#define IRQ_NEAR_BLOCKS 32
+
/*
#if defined (USEMACOSX)
static char * libraryName = N_("Mac OS X Sound");
@@ -69,44 +73,14 @@ static char * libraryInfo = N_("P.E.Op.S. Sound Driver V1.7\nCoded by Pete B
// globals
-// psx buffer / addresses
-
-unsigned short regArea[10000];
-unsigned short spuMem[256*1024];
-unsigned char * spuMemC;
-unsigned char * pSpuIrq=0;
-unsigned char * pSpuBuffer;
-
-// user settings
-
-int iVolume=768; // 1024 is 1.0
-int iXAPitch=1;
-int iUseReverb=2;
-int iUseInterpolation=2;
+SPUInfo spu;
+SPUConfig spu_config;
// MAIN infos struct for each channel
SPUCHAN s_chan[MAXCHAN+1]; // channel + 1 infos (1 is security for fmod handling)
REVERBInfo rvb;
-unsigned int dwNoiseVal; // global noise generator
-unsigned int dwNoiseCount;
-
-unsigned short spuCtrl=0; // some vars to store psx reg infos
-unsigned short spuStat=0;
-unsigned short spuIrq=0;
-unsigned long spuAddr=0xffffffff; // address into spu mem
-int bSpuInit=0;
-int bSPUIsOpen=0;
-
-unsigned int dwNewChannel=0; // flags for faster testing, if new channel starts
-unsigned int dwChannelOn=0; // not silent channels
-unsigned int dwPendingChanOff=0;
-unsigned int dwChannelDead=0; // silent+not useful channels
-
-void (CALLBACK *irqCallback)(void)=0; // func of main emu, called on spu irq
-void (CALLBACK *cddavCallback)(unsigned short,unsigned short)=0;
-
// certain globals (were local before, but with the new timeproc I need em global)
static const int f[8][2] = { { 0, 0 },
@@ -114,18 +88,9 @@ static const int f[8][2] = { { 0, 0 },
{ 115, -52 },
{ 98, -55 },
{ 122, -60 } };
-int ChanBuf[NSSIZE+3];
-int SSumLR[(NSSIZE+3)*2];
+int ChanBuf[NSSIZE];
+int SSumLR[NSSIZE*2];
int iFMod[NSSIZE];
-int iCycle = 0;
-short * pS;
-
-static int decode_dirty_ch;
-int decode_pos;
-int had_dma;
-int lastch=-1; // last channel processed on spu irq in timer mode
-static int lastns=0; // last ns pos
-static int cycles_since_update;
#define CDDA_BUFFER_SIZE (16384 * sizeof(uint32_t)) // must be power of 2
@@ -243,7 +208,7 @@ INLINE void InterpolateDown(int ch)
////////////////////////////////////////////////////////////////////////
// helpers for gauss interpolation
-#define gval0 (((short*)(&s_chan[ch].SB[29]))[gpos])
+#define gval0 (((short*)(&s_chan[ch].SB[29]))[gpos&3])
#define gval(x) ((int)((short*)(&s_chan[ch].SB[29]))[(gpos+x)&3])
#include "gauss_i.h"
@@ -254,18 +219,18 @@ INLINE void InterpolateDown(int ch)
static void do_irq(void)
{
- //if(!(spuStat & STAT_IRQ))
+ //if(!(spu.spuStat & STAT_IRQ))
{
- spuStat |= STAT_IRQ; // asserted status?
- if(irqCallback) irqCallback();
+ spu.spuStat |= STAT_IRQ; // asserted status?
+ if(spu.irqCallback) spu.irqCallback();
}
}
static int check_irq(int ch, unsigned char *pos)
{
- if((spuCtrl & CTRL_IRQ) && pos == pSpuIrq)
+ if((spu.spuCtrl & CTRL_IRQ) && pos == spu.pSpuIrq)
{
- //printf("ch%d irq %04x\n", ch, pos - spuMemC);
+ //printf("ch%d irq %04x\n", ch, pos - spu.spuMemC);
do_irq();
return 1;
}
@@ -293,11 +258,11 @@ INLINE void StartSound(int ch)
s_chan[ch].SB[29]=0; // init our interpolation helpers
s_chan[ch].SB[30]=0;
- if(iUseInterpolation>=2) // gauss interpolation?
+ 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
- dwNewChannel&=~(1<<ch); // clear new channel bit
+ spu.dwNewChannel&=~(1<<ch); // clear new channel bit
}
////////////////////////////////////////////////////////////////////////
@@ -315,7 +280,7 @@ INLINE int FModChangeFrequency(int ch,int ns)
if(NP<0x1) NP=0x1;
sinc=NP<<4; // calc frequency
- if(iUseInterpolation==1) // freq change in simple interpolation mode
+ if(spu_config.iUseInterpolation==1) // freq change in simple interpolation mode
s_chan[ch].SB[32]=1;
iFMod[ns]=0;
@@ -332,7 +297,7 @@ INLINE void StoreInterpolationVal(int ch,int fa)
{
ssat32_to_16(fa);
- if(iUseInterpolation>=2) // gauss/cubic interpolation
+ if(spu_config.iUseInterpolation>=2) // gauss/cubic interpolation
{
int gpos = s_chan[ch].SB[28];
gval0 = fa;
@@ -340,7 +305,7 @@ INLINE void StoreInterpolationVal(int ch,int fa)
s_chan[ch].SB[28] = gpos;
}
else
- if(iUseInterpolation==1) // simple interpolation
+ 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'
@@ -360,7 +325,7 @@ INLINE int iGetInterpolationVal(int ch, int spos)
if(s_chan[ch].bFMod==2) return s_chan[ch].SB[29];
- switch(iUseInterpolation)
+ switch(spu_config.iUseInterpolation)
{
//--------------------------------------------------//
case 3: // cubic interpolation
@@ -448,7 +413,7 @@ static int decode_block(int ch)
int ret = 0;
start = s_chan[ch].pCurr; // set up the current pos
- if(start == spuMemC) // ?
+ if(start == spu.spuMemC) // ?
stop = 1;
if(s_chan[ch].prevflags&1) // 1: stop/loop
@@ -463,7 +428,7 @@ static int decode_block(int ch)
if(stop)
{
- dwChannelOn &= ~(1<<ch); // -> turn everything off
+ spu.dwChannelOn &= ~(1<<ch); // -> turn everything off
s_chan[ch].bStop = 1;
s_chan[ch].ADSRX.EnvelopeVol = 0;
}
@@ -485,8 +450,8 @@ static int decode_block(int ch)
ret |= check_irq(ch, start); // hack.. :(
}
- if (start - spuMemC >= 0x80000)
- start = spuMemC;
+ if (start - spu.spuMemC >= 0x80000)
+ start = spu.spuMemC;
s_chan[ch].pCurr = start; // store values for next cycle
s_chan[ch].prevflags = flags;
@@ -518,8 +483,48 @@ static int skip_block(int ch)
return ret;
}
+// if irq is going to trigger sooner than in upd_samples, set upd_samples
+static void scan_for_irq(int ch, unsigned int *upd_samples)
+{
+ int pos, sinc, sinc_inv, end;
+ unsigned char *block;
+ int flags;
+
+ block = s_chan[ch].pCurr;
+ pos = s_chan[ch].spos;
+ sinc = s_chan[ch].sinc;
+ end = pos + *upd_samples * sinc;
+
+ pos += (28 - s_chan[ch].iSBPos) << 16;
+ while (pos < end)
+ {
+ if (block == spu.pSpuIrq)
+ break;
+ flags = block[1];
+ block += 16;
+ if (flags & 1) { // 1: stop/loop
+ block = s_chan[ch].pLoop;
+ if (block == spu.pSpuIrq) // hack.. (see decode_block)
+ break;
+ }
+ pos += 28 << 16;
+ }
+
+ if (pos < end)
+ {
+ sinc_inv = s_chan[ch].sinc_inv;
+ if (sinc_inv == 0)
+ sinc_inv = s_chan[ch].sinc_inv = (0x80000000u / (uint32_t)sinc) << 1;
+
+ pos -= s_chan[ch].spos;
+ *upd_samples = (((uint64_t)pos * sinc_inv) >> 32) + 1;
+ //xprintf("ch%02d: irq sched: %3d %03d\n",
+ // ch, *upd_samples, *upd_samples * 60 * 263 / 44100);
+ }
+}
+
#define make_do_samples(name, fmod_code, interp_start, interp1_code, interp2_code, interp_end) \
-static int do_samples_##name(int ch, int ns, int ns_to) \
+static noinline int do_samples_##name(int ch, int ns, int ns_to) \
{ \
int sinc = s_chan[ch].sinc; \
int spos = s_chan[ch].spos; \
@@ -533,23 +538,23 @@ static int do_samples_##name(int ch, int ns, int ns_to) \
{ \
fmod_code; \
\
+ spos += sinc; \
while (spos >= 0x10000) \
{ \
- if(sbpos == 28) \
+ fa = SB[sbpos++]; \
+ if(sbpos >= 28) \
{ \
sbpos = 0; \
d = decode_block(ch); \
if(d) \
- ret = ns_to = ns + 1; \
+ ret = /*ns_to =*/ ns + 1; \
} \
\
- fa = SB[sbpos++]; \
interp1_code; \
spos -= 0x10000; \
} \
\
interp2_code; \
- spos += sinc; \
} \
\
s_chan[ch].sinc = sinc; \
@@ -585,7 +590,7 @@ make_do_samples(noint, , fa = s_chan[ch].SB[29], , ChanBuf[ns] = fa, s_chan[ch].
make_do_samples(simple, , ,
simple_interp_store, simple_interp_get, )
-static int do_samples_noise(int ch, int ns, int ns_to)
+static noinline int do_samples_noise(int ch, int ns, int ns_to)
{
int level, shift, bit;
int ret = -1, d;
@@ -600,23 +605,23 @@ static int do_samples_noise(int ch, int ns, int ns_to)
}
// modified from DrHell/shalma, no fraction
- level = (spuCtrl >> 10) & 0x0f;
+ level = (spu.spuCtrl >> 10) & 0x0f;
level = 0x8000 >> level;
for (; ns < ns_to; ns++)
{
- dwNoiseCount += 2;
- if (dwNoiseCount >= level)
+ spu.dwNoiseCount += 2;
+ if (spu.dwNoiseCount >= level)
{
- dwNoiseCount -= level;
- shift = (dwNoiseVal >> 10) & 0x1f;
+ spu.dwNoiseCount -= level;
+ shift = (spu.dwNoiseVal >> 10) & 0x1f;
bit = (0x69696969 >> shift) & 1;
- if (dwNoiseVal & 0x8000)
+ if (spu.dwNoiseVal & 0x8000)
bit ^= 1;
- dwNoiseVal = (dwNoiseVal << 1) | bit;
+ spu.dwNoiseVal = (spu.dwNoiseVal << 1) | bit;
}
- ChanBuf[ns] = (signed short)dwNoiseVal;
+ ChanBuf[ns] = (signed short)spu.dwNoiseVal;
}
return ret;
@@ -625,7 +630,7 @@ static int do_samples_noise(int ch, int ns, int ns_to)
#ifdef HAVE_ARMV5
// asm code; lv and rv must be 0-3fff
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);
+extern void mix_chan_rvb(int start, int count, int lv, int rv, int *rvb);
#else
static void mix_chan(int start, int count, int lv, int rv)
{
@@ -644,10 +649,10 @@ static void mix_chan(int start, int count, int lv, int rv)
}
}
-static void mix_chan_rvb(int start, int count, int lv, int rv)
+static void mix_chan_rvb(int start, int count, int lv, int rv, int *rvb)
{
int *dst = SSumLR + start * 2;
- int *drvb = sRVBStart + start * 2;
+ int *drvb = rvb + start * 2;
const int *src = ChanBuf + start;
int l, r;
@@ -667,11 +672,11 @@ static void mix_chan_rvb(int start, int count, int lv, int rv)
// 0x0800-0x0bff Voice 1
// 0x0c00-0x0fff Voice 3
-static void noinline do_decode_bufs(int which, int start, int count)
+static noinline void do_decode_bufs(int which, int start, int count)
{
const int *src = ChanBuf + start;
- unsigned short *dst = &spuMem[0x800/2 + which*0x400/2];
- int cursor = decode_pos + start;
+ unsigned short *dst = &spu.spuMem[0x800/2 + which*0x400/2];
+ int cursor = spu.decode_pos + start;
while (count-- > 0)
{
@@ -689,83 +694,111 @@ static void noinline do_decode_bufs(int which, int start, int count)
// basically the whole sound processing is done in this fat func!
////////////////////////////////////////////////////////////////////////
-static int do_samples(int forced_updates)
+void do_samples(unsigned int cycles_to)
{
- int volmult = iVolume;
- int ns,ns_from,ns_to;
+ const int ns_from = 0;
+ int ns,ns_to,ns_len;
+ int volmult = spu_config.iVolume;
int ch,d,silentch;
- int bIRQReturn=0;
+ int cycle_diff;
- // ok, at the beginning we are looking if there is
- // enuff free place in the dsound/oss buffer to
- // fill in new data, or if there is a new channel to start.
- // if not, we return until enuff free place is available
- // /a new channel gets started
+ cycle_diff = cycles_to - spu.cycles_played;
+ if (cycle_diff < -2*1048576 || cycle_diff > 2*1048576)
+ {
+ //xprintf("desync %u %d\n", cycles_to, cycle_diff);
+ spu.cycles_played = cycles_to;
+ return;
+ }
- if(!forced_updates && out_current->busy()) // still enuff data in sound buffer?
- return 0;
+ if (cycle_diff < 2 * 768)
+ return;
- while(!bIRQReturn)
- {
- ns_from=0;
- ns_to=NSSIZE;
- ch=0;
- if(lastch>=0) // will be -1 if no continue is pending
- {
- ch=lastch; ns_from=lastns; lastch=-1; // -> setup all kind of vars to continue
- }
+ ns_to = (cycle_diff / 768 + 1) & ~1;
+ if (ns_to > NSSIZE) {
+ // should never happen
+ //xprintf("ns_to oflow %d %d\n", ns_to, NSSIZE);
+ ns_to = NSSIZE;
+ }
+
+ //////////////////////////////////////////////////////
+ // special irq handling in the decode buffers (0x0000-0x1000)
+ // we know:
+ // the decode buffers are located in spu memory in the following way:
+ // 0x0000-0x03ff CD audio left
+ // 0x0400-0x07ff CD audio right
+ // 0x0800-0x0bff Voice 1
+ // 0x0c00-0x0fff Voice 3
+ // and decoded data is 16 bit for one sample
+ // we assume:
+ // even if voices 1/3 are off or no cd audio is playing, the internal
+ // play positions will move on and wrap after 0x400 bytes.
+ // Therefore: we just need a pointer from spumem+0 to spumem+3ff, and
+ // increase this pointer on each sample by 2 bytes. If this pointer
+ // (or 0x400 offsets of this pointer) hits the spuirq address, we generate
+ // an IRQ.
+
+ if (unlikely((spu.spuCtrl & CTRL_IRQ)
+ && spu.pSpuIrq && spu.pSpuIrq < spu.spuMemC+0x1000))
+ {
+ int irq_pos = (spu.pSpuIrq - spu.spuMemC) / 2 & 0x1ff;
+ int left = (irq_pos - spu.decode_pos) & 0x1ff;
+ if (0 < left && left <= ns_to)
+ {
+ //xprintf("decoder irq %x\n", spu.decode_pos);
+ do_irq();
+ }
+ }
- silentch=~(dwChannelOn|dwNewChannel);
+ InitREVERB(ns_to);
+
+ {
+ silentch=~(spu.dwChannelOn|spu.dwNewChannel);
//--------------------------------------------------//
//- main channel loop -//
//--------------------------------------------------//
{
- for(;ch<MAXCHAN;ch++) // loop em all... we will collect 1 ms of sound of each playing channel
+ for(ch=0;ch<MAXCHAN;ch++) // loop em all...
{
- if(dwNewChannel&(1<<ch)) StartSound(ch); // start new sound
- if(!(dwChannelOn&(1<<ch))) continue; // channel not playing? next
+ 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)
- d=do_samples_noise(ch, ns_from, ns_to);
- else if(s_chan[ch].bFMod==2 || (s_chan[ch].bFMod==0 && iUseInterpolation==0))
- d=do_samples_noint(ch, ns_from, ns_to);
- else if(s_chan[ch].bFMod==0 && iUseInterpolation==1)
- d=do_samples_simple(ch, ns_from, ns_to);
+ 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
- d=do_samples_default(ch, ns_from, ns_to);
- if(d>=0)
- {
- bIRQReturn=1;
- lastch=ch;
- lastns=ns_to=d;
- }
+ 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_to-ns_from);
- decode_dirty_ch |= 1<<ch;
+ 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, 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);
+ 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_to-ns_from,s_chan[ch].iLeftVolume,s_chan[ch].iRightVolume);
+ mix_chan(ns_from, ns_len, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume);
}
}
// advance "stopped" channels that can cause irqs
// (all chans are always playing on the real thing..)
- if(spuCtrl&CTRL_IRQ)
+ if(spu.spuCtrl&CTRL_IRQ)
for(ch=0;ch<MAXCHAN;ch++)
{
if(!(silentch&(1<<ch))) continue; // already handled
- if(dwChannelDead&(1<<ch)) continue;
- if(s_chan[ch].pCurr > pSpuIrq && s_chan[ch].pLoop > pSpuIrq)
+ 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);
@@ -773,12 +806,11 @@ static int do_samples(int forced_updates)
{
unsigned char *start = s_chan[ch].pCurr;
- // no need for bIRQReturn since the channel is silent
skip_block(ch);
- if(start == s_chan[ch].pCurr || start - spuMemC < 0x1000)
+ if(start == s_chan[ch].pCurr || start - spu.spuMemC < 0x1000)
{
// looping on self or stopped(?)
- dwChannelDead |= 1<<ch;
+ spu.dwChannelDead |= 1<<ch;
s_chan[ch].spos = 0;
break;
}
@@ -787,145 +819,113 @@ static int do_samples(int forced_updates)
}
}
- if(bIRQReturn) // special return for "spu irq - wait for cpu action"
- return 0;
-
- if(unlikely(silentch & decode_dirty_ch & (1<<1))) // must clear silent channel decode buffers
+ if(unlikely(silentch & spu.decode_dirty_ch & (1<<1))) // must clear silent channel decode buffers
{
- memset(&spuMem[0x800/2], 0, 0x400);
- decode_dirty_ch &= ~(1<<1);
+ memset(&spu.spuMem[0x800/2], 0, 0x400);
+ spu.decode_dirty_ch &= ~(1<<1);
}
- if(unlikely(silentch & decode_dirty_ch & (1<<3)))
+ if(unlikely(silentch & spu.decode_dirty_ch & (1<<3)))
{
- memset(&spuMem[0xc00/2], 0, 0x400);
- decode_dirty_ch &= ~(1<<3);
+ memset(&spu.spuMem[0xc00/2], 0, 0x400);
+ spu.decode_dirty_ch &= ~(1<<3);
}
//---------------------------------------------------//
- //- here we have another 1 ms of sound data
- //---------------------------------------------------//
// mix XA infos (if any)
- MixXA();
+ MixXA(ns_to);
///////////////////////////////////////////////////////
// mix all channels (including reverb) into one buffer
- if(iUseReverb)
- REVERBDo();
+ if(spu_config.iUseReverb)
+ REVERBDo(ns_to);
- if((spuCtrl&0x4000)==0) // muted? (rare, don't optimize for this)
+ if((spu.spuCtrl&0x4000)==0) // muted? (rare, don't optimize for this)
{
- memset(pS, 0, NSSIZE * 2 * sizeof(pS[0]));
- pS += NSSIZE*2;
+ memset(spu.pS, 0, ns_to * 2 * sizeof(spu.pS[0]));
+ spu.pS += ns_to * 2;
}
else
- for (ns = 0; ns < NSSIZE*2; )
+ for (ns = 0; ns < ns_to * 2; )
{
d = SSumLR[ns]; SSumLR[ns] = 0;
d = d * volmult >> 10;
ssat32_to_16(d);
- *pS++ = d;
+ *spu.pS++ = d;
ns++;
d = SSumLR[ns]; SSumLR[ns] = 0;
d = d * volmult >> 10;
ssat32_to_16(d);
- *pS++ = d;
+ *spu.pS++ = d;
ns++;
}
- cycles_since_update -= PSXCLK / 44100 * NSSIZE;
+ spu.cycles_played += ns_to * 768;
- //////////////////////////////////////////////////////
- // special irq handling in the decode buffers (0x0000-0x1000)
- // we know:
- // the decode buffers are located in spu memory in the following way:
- // 0x0000-0x03ff CD audio left
- // 0x0400-0x07ff CD audio right
- // 0x0800-0x0bff Voice 1
- // 0x0c00-0x0fff Voice 3
- // and decoded data is 16 bit for one sample
- // we assume:
- // even if voices 1/3 are off or no cd audio is playing, the internal
- // play positions will move on and wrap after 0x400 bytes.
- // Therefore: we just need a pointer from spumem+0 to spumem+3ff, and
- // increase this pointer on each sample by 2 bytes. If this pointer
- // (or 0x400 offsets of this pointer) hits the spuirq address, we generate
- // an IRQ. Only problem: the "wait for cpu" option is kinda hard to do here
- // in some of Peops timer modes. So: we ignore this option here (for now).
-
- if(unlikely((spuCtrl&CTRL_IRQ) && pSpuIrq && pSpuIrq<spuMemC+0x1000))
- {
- int irq_pos=(pSpuIrq-spuMemC)/2 & 0x1ff;
- if((decode_pos <= irq_pos && irq_pos < decode_pos+NSSIZE)
- || (decode_pos+NSSIZE > 0x200 && irq_pos < ((decode_pos+NSSIZE) & 0x1ff)))
- {
- //printf("decoder irq %x\n", decode_pos);
- do_irq();
- bIRQReturn = 1;
- }
- }
- decode_pos = (decode_pos + NSSIZE) & 0x1ff;
+ spu.decode_pos = (spu.decode_pos + ns_to) & 0x1ff;
+ }
+}
- InitREVERB();
+void schedule_next_irq(void)
+{
+ unsigned int upd_samples;
+ int ch;
- // feed the sound
- // wanna have around 1/60 sec (16.666 ms) updates
- if (iCycle++ >= 16/FRAG_MSECS)
- {
- out_current->feed(pSpuBuffer, (unsigned char *)pS - pSpuBuffer);
- pS = (short *)pSpuBuffer;
- iCycle = 0;
+ if (spu.scheduleCallback == NULL)
+ return;
- if(!forced_updates && out_current->busy())
- break;
- }
+ upd_samples = 44100 / 50;
- if(forced_updates > 0)
- {
- forced_updates--;
- if(forced_updates == 0 && out_current->busy())
- break;
- }
+ for (ch = 0; ch < MAXCHAN; ch++)
+ {
+ if (spu.dwChannelDead & (1 << ch))
+ continue;
+ if ((unsigned long)(spu.pSpuIrq - s_chan[ch].pCurr) > IRQ_NEAR_BLOCKS * 16
+ && (unsigned long)(spu.pSpuIrq - s_chan[ch].pLoop) > IRQ_NEAR_BLOCKS * 16)
+ continue;
- if(cycles_since_update <= -PSXCLK/60 / 4)
- break;
+ scan_for_irq(ch, &upd_samples);
}
- // this may cause desync, but help audio when the emu can't keep up..
- if(cycles_since_update < 0)
- cycles_since_update = 0;
+ if (unlikely(spu.pSpuIrq < spu.spuMemC + 0x1000))
+ {
+ int irq_pos = (spu.pSpuIrq - spu.spuMemC) / 2 & 0x1ff;
+ int left = (irq_pos - spu.decode_pos) & 0x1ff;
+ if (0 < left && left < upd_samples) {
+ //xprintf("decode: %3d (%3d/%3d)\n", left, spu.decode_pos, irq_pos);
+ upd_samples = left;
+ }
+ }
- return 0;
+ if (upd_samples < 44100 / 50)
+ spu.scheduleCallback(upd_samples * 768);
}
// SPU ASYNC... even newer epsxe func
// 1 time every 'cycle' cycles... harhar
-// rearmed: called every 2ms now
+// rearmed: called dynamically now
-void CALLBACK SPUasync(unsigned long cycle)
+void CALLBACK SPUasync(unsigned int cycle, unsigned int flags)
{
- int forced_updates = 0;
- int do_update = 0;
+ do_samples(cycle);
- if(!bSpuInit) return; // -> no init, no call
+ if (spu.spuCtrl & CTRL_IRQ)
+ schedule_next_irq();
- cycles_since_update += cycle;
+ if (flags & 1) {
+ out_current->feed(spu.pSpuBuffer, (unsigned char *)spu.pS - spu.pSpuBuffer);
+ spu.pS = (short *)spu.pSpuBuffer;
- if(dwNewChannel || had_dma)
- {
- forced_updates = 1;
- do_update = 1;
- had_dma = 0;
+ if (spu_config.iTempo) {
+ if (!out_current->busy())
+ // cause more samples to be generated
+ // (and break some games because of bad sync)
+ spu.cycles_played -= 44100 / 60 / 2 * 768;
}
-
- if(cycles_since_update > PSXCLK/60 * 5/4)
- do_update = 1;
-
- if(do_update)
- do_samples(forced_updates);
+ }
}
// SPU UPDATE... new epsxe func
@@ -939,7 +939,6 @@ void CALLBACK SPUasync(unsigned long cycle)
void CALLBACK SPUupdate(void)
{
- SPUasync(0);
}
// XA AUDIO
@@ -966,7 +965,7 @@ void ClearWorkingState(void)
{
memset(SSumLR,0,sizeof(SSumLR)); // init some mixing buffers
memset(iFMod,0,sizeof(iFMod));
- pS=(short *)pSpuBuffer; // setup soundbuffer pointer
+ spu.pS=(short *)spu.pSpuBuffer; // setup soundbuffer pointer
}
// SETUPSTREAMS: init most of the spu buffers
@@ -974,54 +973,46 @@ void SetupStreams(void)
{
int i;
- pSpuBuffer=(unsigned char *)malloc(32768); // alloc mixing buffer
+ spu.pSpuBuffer = (unsigned char *)malloc(32768); // alloc mixing buffer
+ spu.sRVBStart = (int *)malloc(NSSIZE*2*4); // alloc reverb buffer
+ memset(spu.sRVBStart,0,NSSIZE*2*4);
- if(iUseReverb==1) i=88200*2;
- else i=NSSIZE*2;
-
- sRVBStart = (int *)malloc(i*4); // alloc reverb buffer
- memset(sRVBStart,0,i*4);
- sRVBEnd = sRVBStart + i;
- sRVBPlay = sRVBStart;
-
- XAStart = // alloc xa buffer
+ spu.XAStart = // alloc xa buffer
(uint32_t *)malloc(44100 * sizeof(uint32_t));
- XAEnd = XAStart + 44100;
- XAPlay = XAStart;
- XAFeed = XAStart;
+ spu.XAEnd = spu.XAStart + 44100;
+ spu.XAPlay = spu.XAStart;
+ spu.XAFeed = spu.XAStart;
- CDDAStart = // alloc cdda buffer
+ spu.CDDAStart = // alloc cdda buffer
(uint32_t *)malloc(CDDA_BUFFER_SIZE);
- CDDAEnd = CDDAStart + 16384;
- CDDAPlay = CDDAStart;
- CDDAFeed = CDDAStart;
+ spu.CDDAEnd = spu.CDDAStart + 16384;
+ spu.CDDAPlay = spu.CDDAStart;
+ spu.CDDAFeed = spu.CDDAStart;
for(i=0;i<MAXCHAN;i++) // loop sound channels
{
-// we don't use mutex sync... not needed, would only
-// slow us down:
-// s_chan[i].hMutex=CreateMutex(NULL,FALSE,NULL);
s_chan[i].ADSRX.SustainLevel = 0xf; // -> init sustain
- s_chan[i].pLoop=spuMemC;
- s_chan[i].pCurr=spuMemC;
+ s_chan[i].ADSRX.SustainIncrease = 1;
+ s_chan[i].pLoop=spu.spuMemC;
+ s_chan[i].pCurr=spu.spuMemC;
}
ClearWorkingState();
- bSpuInit=1; // flag: we are inited
+ spu.bSpuInit=1; // flag: we are inited
}
// REMOVESTREAMS: free most buffer
void RemoveStreams(void)
{
- free(pSpuBuffer); // free mixing buffer
- pSpuBuffer = NULL;
- free(sRVBStart); // free reverb buffer
- sRVBStart = NULL;
- free(XAStart); // free XA buffer
- XAStart = NULL;
- free(CDDAStart); // free CDDA buffer
- CDDAStart = NULL;
+ free(spu.pSpuBuffer); // free mixing buffer
+ spu.pSpuBuffer = NULL;
+ free(spu.sRVBStart); // free reverb buffer
+ spu.sRVBStart = NULL;
+ free(spu.XAStart); // free XA buffer
+ spu.XAStart = NULL;
+ free(spu.CDDAStart); // free CDDA buffer
+ spu.CDDAStart = NULL;
}
// INIT/EXIT STUFF
@@ -1029,31 +1020,31 @@ void RemoveStreams(void)
// SPUINIT: this func will be called first by the main emu
long CALLBACK SPUinit(void)
{
- spuMemC = (unsigned char *)spuMem; // just small setup
+ spu.spuMemC = (unsigned char *)spu.spuMem; // just small setup
memset((void *)&rvb, 0, sizeof(REVERBInfo));
InitADSR();
- spuIrq = 0;
- spuAddr = 0xffffffff;
- spuMemC = (unsigned char *)spuMem;
- decode_pos = 0;
- memset((void *)s_chan, 0, (MAXCHAN + 1) * sizeof(SPUCHAN));
- pSpuIrq = 0;
- lastch = -1;
+ spu.spuAddr = 0xffffffff;
+ spu.decode_pos = 0;
+ memset((void *)s_chan, 0, sizeof(s_chan));
+ spu.pSpuIrq = 0;
SetupStreams(); // prepare streaming
+ if (spu_config.iVolume == 0)
+ spu_config.iVolume = 768; // 1024 is 1.0
+
return 0;
}
// SPUOPEN: called by main emu after init
long CALLBACK SPUopen(void)
{
- if (bSPUIsOpen) return 0; // security for some stupid main emus
+ if (spu.bSPUIsOpen) return 0; // security for some stupid main emus
SetupSound(); // setup sound (before init!)
- bSPUIsOpen = 1;
+ spu.bSPUIsOpen = 1;
return PSE_SPU_ERR_SUCCESS;
}
@@ -1061,9 +1052,9 @@ long CALLBACK SPUopen(void)
// SPUCLOSE: called before shutdown
long CALLBACK SPUclose(void)
{
- if (!bSPUIsOpen) return 0; // some security
+ if (!spu.bSPUIsOpen) return 0; // some security
- bSPUIsOpen = 0; // no more open
+ spu.bSPUIsOpen = 0; // no more open
out_current->finish(); // no more sound handling
@@ -1075,7 +1066,7 @@ long CALLBACK SPUshutdown(void)
{
SPUclose();
RemoveStreams(); // no more streaming
- bSpuInit=0;
+ spu.bSpuInit=0;
return 0;
}
@@ -1112,12 +1103,17 @@ void CALLBACK SPUabout(void)
// passes a callback that should be called on SPU-IRQ/cdda volume change
void CALLBACK SPUregisterCallback(void (CALLBACK *callback)(void))
{
- irqCallback = callback;
+ spu.irqCallback = callback;
}
void CALLBACK SPUregisterCDDAVolume(void (CALLBACK *CDDAVcallback)(unsigned short,unsigned short))
{
- cddavCallback = CDDAVcallback;
+ spu.cddavCallback = CDDAVcallback;
+}
+
+void CALLBACK SPUregisterScheduleCb(void (CALLBACK *callback)(unsigned int))
+{
+ spu.scheduleCallback = callback;
}
// COMMON PLUGIN INFO FUNCS
@@ -1150,18 +1146,18 @@ void spu_get_debug_info(int *chans_out, int *run_chans, int *fmod_chans_out, int
for(;ch<MAXCHAN;ch++)
{
- if (!(dwChannelOn & (1<<ch)))
+ if (!(spu.dwChannelOn & (1<<ch)))
continue;
if (s_chan[ch].bFMod == 2)
fmod_chans |= 1 << ch;
if (s_chan[ch].bNoise)
noise_chans |= 1 << ch;
- if((spuCtrl&CTRL_IRQ) && s_chan[ch].pCurr <= pSpuIrq && s_chan[ch].pLoop <= pSpuIrq)
+ if((spu.spuCtrl&CTRL_IRQ) && s_chan[ch].pCurr <= spu.pSpuIrq && s_chan[ch].pLoop <= spu.pSpuIrq)
irq_chans |= 1 << ch;
}
- *chans_out = dwChannelOn;
- *run_chans = ~dwChannelOn & ~dwChannelDead & irq_chans;
+ *chans_out = spu.dwChannelOn;
+ *run_chans = ~spu.dwChannelOn & ~spu.dwChannelDead & irq_chans;
*fmod_chans_out = fmod_chans;
*noise_chans_out = noise_chans;
}
diff --git a/plugins/dfsound/spu_config.h b/plugins/dfsound/spu_config.h
new file mode 100644
index 0000000..c6641be
--- /dev/null
+++ b/plugins/dfsound/spu_config.h
@@ -0,0 +1,12 @@
+// user settings
+
+typedef struct
+{
+ int iVolume;
+ int iXAPitch;
+ int iUseReverb;
+ int iUseInterpolation;
+ int iTempo;
+} SPUConfig;
+
+extern SPUConfig spu_config;
diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c
index e58bca2..704847b 100644
--- a/plugins/dfsound/xa.c
+++ b/plugins/dfsound/xa.c
@@ -26,24 +26,6 @@
// XA GLOBALS
////////////////////////////////////////////////////////////////////////
-xa_decode_t * xapGlobal=0;
-
-uint32_t * XAFeed = NULL;
-uint32_t * XAPlay = NULL;
-uint32_t * XAStart = NULL;
-uint32_t * XAEnd = NULL;
-
-uint32_t XARepeat = 0;
-uint32_t XALastVal = 0;
-
-uint32_t * CDDAFeed = NULL;
-uint32_t * CDDAPlay = NULL;
-uint32_t * CDDAStart = NULL;
-uint32_t * CDDAEnd = NULL;
-
-int iLeftXAVol = 32767;
-int iRightXAVol = 32767;
-
static int gauss_ptr = 0;
static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};
@@ -56,48 +38,48 @@ static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};
// MIX XA & CDDA
////////////////////////////////////////////////////////////////////////
-INLINE void MixXA(void)
+INLINE void MixXA(int ns_to)
{
int ns;
short l, r;
uint32_t v;
- int cursor = decode_pos;
+ int cursor = spu.decode_pos;
- if(XAPlay != XAFeed || XARepeat > 0)
+ if(spu.XAPlay != spu.XAFeed || spu.XARepeat > 0)
{
- if(XAPlay == XAFeed)
- XARepeat--;
+ if(spu.XAPlay == spu.XAFeed)
+ spu.XARepeat--;
- v = XALastVal;
- for(ns=0;ns<NSSIZE*2;)
+ v = spu.XALastVal;
+ for(ns = 0; ns < ns_to*2; )
{
- if(XAPlay != XAFeed) v=*XAPlay++;
- if(XAPlay == XAEnd) XAPlay=XAStart;
+ if(spu.XAPlay != spu.XAFeed) v=*spu.XAPlay++;
+ if(spu.XAPlay == spu.XAEnd) spu.XAPlay=spu.XAStart;
- l = ((int)(short)v * iLeftXAVol) >> 15;
- r = ((int)(short)(v >> 16) * iLeftXAVol) >> 15;
+ l = ((int)(short)v * spu.iLeftXAVol) >> 15;
+ r = ((int)(short)(v >> 16) * spu.iLeftXAVol) >> 15;
SSumLR[ns++] += l;
SSumLR[ns++] += r;
- spuMem[cursor] = v;
- spuMem[cursor + 0x400/2] = v >> 16;
+ spu.spuMem[cursor] = v;
+ spu.spuMem[cursor + 0x400/2] = v >> 16;
cursor = (cursor + 1) & 0x1ff;
}
- XALastVal = v;
+ spu.XALastVal = v;
}
- for(ns=0;ns<NSSIZE*2 && CDDAPlay!=CDDAFeed && (CDDAPlay!=CDDAEnd-1||CDDAFeed!=CDDAStart);)
+ for(ns = 0; ns < ns_to * 2 && spu.CDDAPlay!=spu.CDDAFeed && (spu.CDDAPlay!=spu.CDDAEnd-1||spu.CDDAFeed!=spu.CDDAStart);)
{
- v=*CDDAPlay++;
- if(CDDAPlay==CDDAEnd) CDDAPlay=CDDAStart;
+ v=*spu.CDDAPlay++;
+ if(spu.CDDAPlay==spu.CDDAEnd) spu.CDDAPlay=spu.CDDAStart;
- l = ((int)(short)v * iLeftXAVol) >> 15;
- r = ((int)(short)(v >> 16) * iLeftXAVol) >> 15;
+ l = ((int)(short)v * spu.iLeftXAVol) >> 15;
+ r = ((int)(short)(v >> 16) * spu.iLeftXAVol) >> 15;
SSumLR[ns++] += l;
SSumLR[ns++] += r;
- spuMem[cursor] = v;
- spuMem[cursor + 0x400/2] = v >> 16;
+ spu.spuMem[cursor] = v;
+ spu.spuMem[cursor + 0x400/2] = v >> 16;
cursor = (cursor + 1) & 0x1ff;
}
}
@@ -121,10 +103,10 @@ INLINE void FeedXA(xa_decode_t *xap)
{
int sinc,spos,i,iSize,iPlace,vl,vr;
- if(!bSPUIsOpen) return;
+ if(!spu.bSPUIsOpen) return;
- xapGlobal = xap; // store info for save states
- XARepeat = 100; // set up repeat
+ spu.xapGlobal = xap; // store info for save states
+ spu.XARepeat = 100; // set up repeat
#if 0//def XA_HACK
iSize=((45500*xap->nsamples)/xap->freq); // get size
@@ -133,13 +115,13 @@ INLINE void FeedXA(xa_decode_t *xap)
#endif
if(!iSize) return; // none? bye
- if(XAFeed<XAPlay) iPlace=XAPlay-XAFeed; // how much space in my buf?
- else iPlace=(XAEnd-XAFeed) + (XAPlay-XAStart);
+ if(spu.XAFeed<spu.XAPlay) iPlace=spu.XAPlay-spu.XAFeed; // how much space in my buf?
+ else iPlace=(spu.XAEnd-spu.XAFeed) + (spu.XAPlay-spu.XAStart);
if(iPlace==0) return; // no place at all
//----------------------------------------------------//
- if(iXAPitch) // pitch change option?
+ if(spu_config.iXAPitch) // pitch change option?
{
static DWORD dwLT=0;
static DWORD dwFPS=0;
@@ -185,12 +167,12 @@ INLINE void FeedXA(xa_decode_t *xap)
uint32_t * pS=(uint32_t *)xap->pcm;
uint32_t l=0;
- if(iXAPitch)
+ if(spu_config.iXAPitch)
{
int32_t l1,l2;short s;
for(i=0;i<iSize;i++)
{
- if(iUseInterpolation==2)
+ if(spu_config.iUseInterpolation==2)
{
while(spos>=0x10000L)
{
@@ -231,12 +213,12 @@ INLINE void FeedXA(xa_decode_t *xap)
ssat32_to_16(l2);
l=(l1&0xffff)|(l2<<16);
- *XAFeed++=l;
+ *spu.XAFeed++=l;
- if(XAFeed==XAEnd) XAFeed=XAStart;
- if(XAFeed==XAPlay)
+ if(spu.XAFeed==spu.XAEnd) spu.XAFeed=spu.XAStart;
+ if(spu.XAFeed==spu.XAPlay)
{
- if(XAPlay!=XAStart) XAFeed=XAPlay-1;
+ if(spu.XAPlay!=spu.XAStart) spu.XAFeed=spu.XAPlay-1;
break;
}
@@ -247,7 +229,7 @@ INLINE void FeedXA(xa_decode_t *xap)
{
for(i=0;i<iSize;i++)
{
- if(iUseInterpolation==2)
+ if(spu_config.iUseInterpolation==2)
{
while(spos>=0x10000L)
{
@@ -278,12 +260,12 @@ INLINE void FeedXA(xa_decode_t *xap)
}
}
- *XAFeed++=l;
+ *spu.XAFeed++=l;
- if(XAFeed==XAEnd) XAFeed=XAStart;
- if(XAFeed==XAPlay)
+ if(spu.XAFeed==spu.XAEnd) spu.XAFeed=spu.XAStart;
+ if(spu.XAFeed==spu.XAPlay)
{
- if(XAPlay!=XAStart) XAFeed=XAPlay-1;
+ if(spu.XAPlay!=spu.XAStart) spu.XAFeed=spu.XAPlay-1;
break;
}
@@ -296,12 +278,12 @@ INLINE void FeedXA(xa_decode_t *xap)
unsigned short * pS=(unsigned short *)xap->pcm;
uint32_t l;short s=0;
- if(iXAPitch)
+ if(spu_config.iXAPitch)
{
int32_t l1;
for(i=0;i<iSize;i++)
{
- if(iUseInterpolation==2)
+ if(spu_config.iUseInterpolation==2)
{
while(spos>=0x10000L)
{
@@ -330,12 +312,12 @@ INLINE void FeedXA(xa_decode_t *xap)
l1=(l1*iPlace)/iSize;
ssat32_to_16(l1);
l=(l1&0xffff)|(l1<<16);
- *XAFeed++=l;
+ *spu.XAFeed++=l;
- if(XAFeed==XAEnd) XAFeed=XAStart;
- if(XAFeed==XAPlay)
+ if(spu.XAFeed==spu.XAEnd) spu.XAFeed=spu.XAStart;
+ if(spu.XAFeed==spu.XAPlay)
{
- if(XAPlay!=XAStart) XAFeed=XAPlay-1;
+ if(spu.XAPlay!=spu.XAStart) spu.XAFeed=spu.XAPlay-1;
break;
}
@@ -346,7 +328,7 @@ INLINE void FeedXA(xa_decode_t *xap)
{
for(i=0;i<iSize;i++)
{
- if(iUseInterpolation==2)
+ if(spu_config.iUseInterpolation==2)
{
while(spos>=0x10000L)
{
@@ -372,12 +354,12 @@ INLINE void FeedXA(xa_decode_t *xap)
}
l &= 0xffff;
- *XAFeed++=(l|(l<<16));
+ *spu.XAFeed++=(l|(l<<16));
- if(XAFeed==XAEnd) XAFeed=XAStart;
- if(XAFeed==XAPlay)
+ if(spu.XAFeed==spu.XAEnd) spu.XAFeed=spu.XAStart;
+ if(spu.XAFeed==spu.XAPlay)
{
- if(XAPlay!=XAStart) XAFeed=XAPlay-1;
+ if(spu.XAPlay!=spu.XAStart) spu.XAFeed=spu.XAPlay-1;
break;
}
@@ -394,21 +376,21 @@ INLINE void FeedXA(xa_decode_t *xap)
INLINE int FeedCDDA(unsigned char *pcm, int nBytes)
{
int space;
- space=(CDDAPlay-CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1);
+ space=(spu.CDDAPlay-spu.CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1);
if(space<nBytes)
return 0x7761; // rearmed_wait
while(nBytes>0)
{
- if(CDDAFeed==CDDAEnd) CDDAFeed=CDDAStart;
- space=(CDDAPlay-CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1);
- if(CDDAFeed+space/4>CDDAEnd)
- space=(CDDAEnd-CDDAFeed)*4;
+ if(spu.CDDAFeed==spu.CDDAEnd) spu.CDDAFeed=spu.CDDAStart;
+ space=(spu.CDDAPlay-spu.CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1);
+ if(spu.CDDAFeed+space/4>spu.CDDAEnd)
+ space=(spu.CDDAEnd-spu.CDDAFeed)*4;
if(space>nBytes)
space=nBytes;
- memcpy(CDDAFeed,pcm,space);
- CDDAFeed+=space/4;
+ memcpy(spu.CDDAFeed,pcm,space);
+ spu.CDDAFeed+=space/4;
nBytes-=space;
pcm+=space;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 21:53:36 +0000