* *
***************************************************************************/
-#if !defined(_WIN32) && !defined(NO_OS)
-#include <sys/time.h> // gettimeofday in xa.c
-#define THREAD_ENABLED 1
-#endif
#include "stdafx.h"
#define _IN_SPU
static int check_irq(int ch, unsigned char *pos)
{
- if((spu.spuCtrl & CTRL_IRQ) && pos == spu.pSpuIrq)
+ if((spu.spuCtrl & (CTRL_ON|CTRL_IRQ)) == (CTRL_ON|CTRL_IRQ) && pos == spu.pSpuIrq)
{
//printf("ch%d irq %04x\n", ch, pos - spu.spuMemC);
do_irq();
return 0;
}
+void check_irq_io(unsigned int addr)
+{
+ unsigned int irq_addr = regAreaGet(H_SPUirqAddr) << 3;
+ //addr &= ~7; // ?
+ if((spu.spuCtrl & (CTRL_ON|CTRL_IRQ)) == (CTRL_ON|CTRL_IRQ) && addr == irq_addr)
+ {
+ //printf("io irq %04x\n", irq_addr);
+ do_irq();
+ }
+}
+
////////////////////////////////////////////////////////////////////////
// START SOUND... called by main thread to setup a new sound on a channel
////////////////////////////////////////////////////////////////////////
StartADSR(ch);
StartREVERB(ch);
- s_chan->prevflags=2;
- s_chan->iSBPos=27;
- s_chan->spos=0;
+ s_chan->prevflags = 2;
+ s_chan->iSBPos = 27;
+ s_chan->spos = 0;
+ s_chan->bStarting = 1;
- s_chan->pCurr = spu.spuMemC+((regAreaGet(ch,6)&~1)<<3);
+ s_chan->pCurr = spu.spuMemC + ((regAreaGetCh(ch, 6) & ~1) << 3);
spu.dwNewChannel&=~(1<<ch); // clear new channel bit
- spu.dwChannelOn|=1<<ch;
spu.dwChannelDead&=~(1<<ch);
+ spu.dwChannelsAudible|=1<<ch;
}
static void StartSound(int ch)
if(NP<0x1) NP=0x1;
sinc=NP<<4; // calc frequency
- if(spu_config.iUseInterpolation==1) // freq change in simple interpolation mode
- SB[32]=1;
iFMod[ns]=0;
+ SB[32]=1; // reset interpolation
return sinc;
}
int vl, vr;int gpos;
vl = (spos >> 6) & ~3;
gpos = SB[28];
- vr=(gauss[vl]*(int)gval0)&~2047;
- vr+=(gauss[vl+1]*gval(1))&~2047;
- vr+=(gauss[vl+2]*gval(2))&~2047;
- vr+=(gauss[vl+3]*gval(3))&~2047;
- fa = vr>>11;
+ vr=(gauss[vl]*(int)gval0) >> 15;
+ vr+=(gauss[vl+1]*gval(1)) >> 15;
+ vr+=(gauss[vl+2]*gval(2)) >> 15;
+ vr+=(gauss[vl+3]*gval(3)) >> 15;
+ fa = vr;
} break;
//--------------------------------------------------//
case 1: // simple interpolation
int ret = 0;
start = s_chan->pCurr; // set up the current pos
- if (start == spu.spuMemC) // ?
+ if (start - spu.spuMemC < 0x1000) { // ?
+ //log_unhandled("ch%02d plays decode bufs @%05lx\n",
+ // ch, (long)(start - spu.spuMemC));
ret = 1;
+ }
if (s_chan->prevflags & 1) // 1: stop/loop
{
start = s_chan->pLoop;
}
- else
- check_irq(ch, start); // hack, see check_irq below..
+
+ check_irq(ch, start);
predict_nr = start[0];
shift_factor = predict_nr & 0xf;
decode_block_data(SB, start + 2, predict_nr, shift_factor);
flags = start[1];
- if (flags & 4 && (!s_chan->bIgnoreLoop))
+ if (flags & 4 && !s_chan->bIgnoreLoop)
s_chan->pLoop = start; // loop adress
start += 16;
- if (flags & 1) { // 1: stop/loop
- start = s_chan->pLoop;
- check_irq(ch, start); // hack.. :(
- }
-
- if (start - spu.spuMemC >= 0x80000)
- start = spu.spuMemC;
-
s_chan->pCurr = start; // store values for next cycle
s_chan->prevflags = flags;
+ s_chan->bStarting = 0;
return ret;
}
start = s_chan->pLoop;
}
- else
- check_irq(ch, start);
+
+ check_irq(ch, start);
flags = start[1];
- if (flags & 4)
+ if (flags & 4 && !s_chan->bIgnoreLoop)
s_chan->pLoop = start;
start += 16;
- if (flags & 1) {
- start = s_chan->pLoop;
- check_irq(ch, start);
- }
-
s_chan->pCurr = start;
s_chan->prevflags = flags;
+ s_chan->bStarting = 0;
return ret;
}
pos = s_chan->spos;
sinc = s_chan->sinc;
end = pos + *upd_samples * sinc;
+ if (s_chan->prevflags & 1) // 1: stop/loop
+ block = s_chan->pLoop;
pos += (28 - s_chan->iSBPos) << 16;
while (pos < end)
block += 16;
if (flags & 1) { // 1: stop/loop
block = s_chan->pLoop;
- if (block == spu.pSpuIrq) // hack.. (see decode_block)
- break;
}
pos += 28 << 16;
}
StartSound(ch);
}
- mask = spu.dwChannelOn & 0xffffff;
+ mask = spu.dwChannelsAudible & 0xffffff;
for (ch = 0; mask != 0; ch++, mask >>= 1) // loop em all...
{
if (!(mask & 1)) continue; // channel not playing? next
s_chan = &spu.s_chan[ch];
SB = spu.SB + ch * SB_SIZE;
sinc = s_chan->sinc;
+ if (spu.s_chan[ch].bNewPitch)
+ SB[32] = 1; // reset interpolation
+ spu.s_chan[ch].bNewPitch = 0;
if (s_chan->bNoise)
d = do_samples_noise(ch, ns_to);
d = do_samples_default(decode_block, NULL, ch, ns_to,
SB, sinc, &s_chan->spos, &s_chan->iSBPos);
- d = MixADSR(&s_chan->ADSRX, d);
- if (d < ns_to) {
- spu.dwChannelOn &= ~(1 << ch);
- s_chan->ADSRX.EnvelopeVol = 0;
- memset(&ChanBuf[d], 0, (ns_to - d) * sizeof(ChanBuf[0]));
+ if (!s_chan->bStarting) {
+ d = MixADSR(&s_chan->ADSRX, d);
+ if (d < ns_to) {
+ spu.dwChannelsAudible &= ~(1 << ch);
+ s_chan->ADSRX.State = ADSR_RELEASE;
+ s_chan->ADSRX.EnvelopeVol = 0;
+ memset(&ChanBuf[d], 0, (ns_to - d) * sizeof(ChanBuf[0]));
+ }
}
if (ch == 1 || ch == 3)
mix_chan(spu.SSumLR, ns_to, s_chan->iLeftVolume, s_chan->iRightVolume);
}
+ MixXA(spu.SSumLR, RVB, ns_to, spu.decode_pos);
+
if (spu.rvb->StartAddr) {
if (do_rvb)
REVERBDo(spu.SSumLR, RVB, ns_to, spu.rvb->CurrAddr);
// optional worker thread handling
-#if defined(THREAD_ENABLED) || defined(WANT_THREAD_CODE)
+#if P_HAVE_PTHREAD || defined(WANT_THREAD_CODE)
// worker thread state
static struct spu_worker {
int sinc;
int start;
int loop;
- int ns_to;
short vol_l;
short vol_r;
+ unsigned short ns_to;
+ unsigned short bNoise:1;
+ unsigned short bFMod:2;
+ unsigned short bRVBActive:1;
+ unsigned short bNewPitch:1;
ADSRInfoEx adsr;
- // might also want to add fmod flags..
} ch[24];
int SSumLR[NSSIZE * 2];
} i[4];
StartSoundMain(ch);
}
- mask = work->channels_on = spu.dwChannelOn & 0xffffff;
+ mask = work->channels_on = spu.dwChannelsAudible & 0xffffff;
spu.decode_dirty_ch |= mask & 0x0a;
for (ch = 0; mask != 0; ch++, mask >>= 1)
work->ch[ch].vol_r = s_chan->iRightVolume;
work->ch[ch].start = s_chan->pCurr - spu.spuMemC;
work->ch[ch].loop = s_chan->pLoop - spu.spuMemC;
+ work->ch[ch].bNoise = s_chan->bNoise;
+ work->ch[ch].bFMod = s_chan->bFMod;
+ work->ch[ch].bRVBActive = s_chan->bRVBActive;
+ work->ch[ch].bNewPitch = s_chan->bNewPitch;
if (s_chan->prevflags & 1)
work->ch[ch].start = work->ch[ch].loop;
d = do_samples_skip(ch, ns_to);
work->ch[ch].ns_to = d;
- // note: d is not accurate on skip
- d = SkipADSR(&s_chan->ADSRX, d);
- if (d < ns_to) {
- spu.dwChannelOn &= ~(1 << ch);
- s_chan->ADSRX.EnvelopeVol = 0;
+ if (!s_chan->bStarting) {
+ // note: d is not accurate on skip
+ d = SkipADSR(&s_chan->ADSRX, d);
+ if (d < ns_to) {
+ spu.dwChannelsAudible &= ~(1 << ch);
+ s_chan->ADSRX.State = ADSR_RELEASE;
+ s_chan->ADSRX.EnvelopeVol = 0;
+ }
}
+ s_chan->bNewPitch = 0;
}
work->rvb_addr = 0;
static void do_channel_work(struct work_item *work)
{
unsigned int mask;
- unsigned int decode_dirty_ch = 0;
- const SPUCHAN *s_chan;
int *SB, sinc, spos, sbpos;
int d, ch, ns_to;
sbpos = work->ch[ch].sbpos;
sinc = work->ch[ch].sinc;
- s_chan = &spu.s_chan[ch];
SB = spu.SB + ch * SB_SIZE;
+ if (work->ch[ch].bNewPitch)
+ SB[32] = 1; // reset interpolation
- if (s_chan->bNoise)
+ if (work->ch[ch].bNoise)
do_lsfr_samples(d, work->ctrl, &spu.dwNoiseCount, &spu.dwNoiseVal);
- else if (s_chan->bFMod == 2
- || (s_chan->bFMod == 0 && spu_config.iUseInterpolation == 0))
+ else if (work->ch[ch].bFMod == 2
+ || (work->ch[ch].bFMod == 0 && spu_config.iUseInterpolation == 0))
do_samples_noint(decode_block_work, work, ch, d, SB, sinc, &spos, &sbpos);
- else if (s_chan->bFMod == 0 && spu_config.iUseInterpolation == 1)
+ else if (work->ch[ch].bFMod == 0 && spu_config.iUseInterpolation == 1)
do_samples_simple(decode_block_work, work, ch, d, SB, sinc, &spos, &sbpos);
else
do_samples_default(decode_block_work, work, ch, d, SB, sinc, &spos, &sbpos);
}
if (ch == 1 || ch == 3)
- {
- do_decode_bufs(spu.spuMem, ch/2, ns_to, work->decode_pos);
- decode_dirty_ch |= 1 << ch;
- }
+ do_decode_bufs(spu.spuMem, ch/2, ns_to, work->decode_pos);
- if (s_chan->bFMod == 2) // fmod freq channel
+ if (work->ch[ch].bFMod == 2) // fmod freq channel
memcpy(iFMod, &ChanBuf, ns_to * sizeof(iFMod[0]));
- if (s_chan->bRVBActive && work->rvb_addr)
+ if (work->ch[ch].bRVBActive && work->rvb_addr)
mix_chan_rvb(work->SSumLR, ns_to,
work->ch[ch].vol_l, work->ch[ch].vol_r, RVB);
else
work = &worker->i[worker->i_reaped & WORK_I_MASK];
thread_work_wait_sync(work, force);
+ MixXA(work->SSumLR, RVB, work->ns_to, work->decode_pos);
do_samples_finish(work->SSumLR, work->ns_to,
work->channels_silent, work->decode_pos);
static const void * const worker = NULL;
-#endif // THREAD_ENABLED
+#endif // P_HAVE_PTHREAD || defined(WANT_THREAD_CODE)
////////////////////////////////////////////////////////////////////////
// MAIN SPU FUNCTION
return;
}
- silentch = ~(spu.dwChannelOn | spu.dwNewChannel) & 0xffffff;
+ silentch = ~(spu.dwChannelsAudible | spu.dwNewChannel) & 0xffffff;
do_direct |= (silentch == 0xffffff);
if (worker != NULL)
do_irq();
}
}
+ if (!spu.cycles_dma_end || (int)(spu.cycles_dma_end - cycles_to) < 0) {
+ spu.cycles_dma_end = 0;
+ check_irq_io(spu.spuAddr);
+ }
if (unlikely(spu.rvb->dirty))
REVERBPrep();
}
else {
queue_channel_work(ns_to, silentch);
+ //sync_worker_thread(1); // uncomment for debug
}
// advance "stopped" channels that can cause irqs
spu.cycles_played += ns_to * 768;
spu.decode_pos = (spu.decode_pos + ns_to) & 0x1ff;
+#if 0
+ static int ccount; static time_t ctime; ccount++;
+ if (time(NULL) != ctime)
+ { printf("%d\n", ccount); ccount = 0; ctime = time(NULL); }
+#endif
}
static void do_samples_finish(int *SSumLR, int ns_to,
int silentch, int decode_pos)
{
- int volmult = spu_config.iVolume;
+ int vol_l = ((int)regAreaGet(H_SPUmvolL) << 17) >> 17;
+ int vol_r = ((int)regAreaGet(H_SPUmvolR) << 17) >> 17;
int ns;
int d;
spu.decode_dirty_ch &= ~(1<<3);
}
- MixXA(SSumLR, ns_to, decode_pos);
-
- if((spu.spuCtrl&0x4000)==0) // muted? (rare, don't optimize for this)
+ vol_l = vol_l * spu_config.iVolume >> 10;
+ vol_r = vol_r * spu_config.iVolume >> 10;
+
+ if (!(spu.spuCtrl & CTRL_MUTE) || !(vol_l | vol_r))
{
+ // muted? (rare)
memset(spu.pS, 0, ns_to * 2 * sizeof(spu.pS[0]));
+ memset(SSumLR, 0, ns_to * 2 * sizeof(SSumLR[0]));
spu.pS += ns_to * 2;
}
else
for (ns = 0; ns < ns_to * 2; )
{
d = SSumLR[ns]; SSumLR[ns] = 0;
- d = d * volmult >> 10;
+ d = d * vol_l >> 14;
ssat32_to_16(d);
*spu.pS++ = d;
ns++;
d = SSumLR[ns]; SSumLR[ns] = 0;
- d = d * volmult >> 10;
+ d = d * vol_r >> 14;
ssat32_to_16(d);
*spu.pS++ = d;
ns++;
if ((unsigned long)(spu.pSpuIrq - spu.s_chan[ch].pCurr) > IRQ_NEAR_BLOCKS * 16
&& (unsigned long)(spu.pSpuIrq - spu.s_chan[ch].pLoop) > IRQ_NEAR_BLOCKS * 16)
continue;
+ if (spu.s_chan[ch].sinc == 0)
+ continue;
scan_for_irq(ch, &upd_samples);
}
void CALLBACK SPUasync(unsigned int cycle, unsigned int flags)
{
- do_samples(cycle, spu_config.iUseFixedUpdates);
+ do_samples(cycle, 0);
if (spu.spuCtrl & CTRL_IRQ)
schedule_next_irq();
// XA AUDIO
-void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap)
+void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap, unsigned int cycle, int is_start)
{
if(!xap) return;
- if(!xap->freq) return; // no xa freq ? bye
+ if(!xap->freq) return; // no xa freq ? bye
+
+ if (is_start)
+ do_samples(cycle, 1); // catch up to prevent source underflows later
- FeedXA(xap); // call main XA feeder
+ FeedXA(xap); // call main XA feeder
+ spu.xapGlobal = xap; // store info for save states
}
// CDDA AUDIO
-int CALLBACK SPUplayCDDAchannel(short *pcm, int nbytes)
+int CALLBACK SPUplayCDDAchannel(short *pcm, int nbytes, unsigned int cycle, int is_start)
{
if (!pcm) return -1;
if (nbytes<=0) return -1;
- return FeedCDDA((unsigned char *)pcm, nbytes);
+ if (is_start)
+ do_samples(cycle, 1); // catch up to prevent source underflows later
+
+ FeedCDDA((unsigned char *)pcm, nbytes);
+ return 0;
}
// to be called after state load
spu.XAFeed = spu.XAStart;
spu.CDDAStart = malloc(CDDA_BUFFER_SIZE); // alloc cdda buffer
- spu.CDDAEnd = spu.CDDAStart + 16384;
+ spu.CDDAEnd = spu.CDDAStart + CDDA_BUFFER_SIZE / sizeof(uint32_t);
spu.CDDAPlay = spu.CDDAStart;
spu.CDDAFeed = spu.CDDAStart;
/* special code for TI C64x DSP */
#include "spu_c64x.c"
-#elif defined(THREAD_ENABLED)
+#elif P_HAVE_PTHREAD
#include <pthread.h>
#include <semaphore.h>
worker = NULL;
}
-#else // if !THREAD_ENABLED
+#else // if !P_HAVE_PTHREAD
static void init_spu_thread(void)
{
{
int i;
+ memset(&spu, 0, sizeof(spu));
spu.spuMemC = calloc(1, 512 * 1024);
InitADSR();
return 0;
}
-// SPUTEST: we don't test, we are always fine ;)
-long CALLBACK SPUtest(void)
-{
- return 0;
-}
-
-// SPUCONFIGURE: call config dialog
-long CALLBACK SPUconfigure(void)
-{
-#ifdef _MACOSX
- DoConfiguration();
-#else
-// StartCfgTool("CFG");
-#endif
- return 0;
-}
-
-// SPUABOUT: show about window
-void CALLBACK SPUabout(void)
-{
-#ifdef _MACOSX
- DoAbout();
-#else
-// StartCfgTool("ABOUT");
-#endif
-}
-
// SETUP CALLBACKS
// this functions will be called once,
// passes a callback that should be called on SPU-IRQ/cdda volume change
for(;ch<MAXCHAN;ch++)
{
- if (!(spu.dwChannelOn & (1<<ch)))
+ if (!(spu.dwChannelsAudible & (1<<ch)))
continue;
if (spu.s_chan[ch].bFMod == 2)
fmod_chans |= 1 << ch;
irq_chans |= 1 << ch;
}
- *chans_out = spu.dwChannelOn;
- *run_chans = ~spu.dwChannelOn & ~spu.dwChannelDead & irq_chans;
+ *chans_out = spu.dwChannelsAudible;
+ *run_chans = ~spu.dwChannelsAudible & ~spu.dwChannelDead & irq_chans;
*fmod_chans_out = fmod_chans;
*noise_chans_out = noise_chans;
}
notaz.gp2x.de / pcsx_rearmed.git / blobdiff