spu: get rid of pCurr -1, pass right chans to silent handler

[pcsx_rearmed.git] / plugins / dfsound / spu.c

diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index 791b27e..b866cff 100644 (file)
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -108,9 +108,10 @@ int             bSPUIsOpen=0;
 
 static pthread_t thread = (pthread_t)-1;               // thread id (linux)
 
-unsigned long dwNewChannel=0;                          // flags for faster testing, if new channel starts
-unsigned long dwChannelOn=0;
-unsigned long dwPendingChanOff=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;
@@ -122,8 +123,8 @@ static const int f[8][2] = {   {    0,  0  },
                         {  115, -52 },
                         {   98, -55 },
                         {  122, -60 } };
-int ChanBuf[NSSIZE];
-int SSumLR[NSSIZE*2];
+int ChanBuf[NSSIZE+3];
+int SSumLR[(NSSIZE+3)*2];
 int iFMod[NSSIZE];
 int iCycle = 0;
 short * pS;
@@ -453,14 +454,12 @@ static int decode_block(int ch)
  int ret = 0;
 
  start=s_chan[ch].pCurr;                   // set up the current pos
- if(start == (unsigned char*)-1 ||         // special "stop" sign
-    (dwPendingChanOff&(1<<ch)))
+ if(dwPendingChanOff&(1<<ch))
  {
   dwChannelOn&=~(1<<ch);                   // -> turn everything off
   dwPendingChanOff&=~(1<<ch);
   s_chan[ch].bStop=1;
   s_chan[ch].ADSRX.EnvelopeVol=0;
-  return 0;                                // -> and done for this channel
  }
 
  //////////////////////////////////////////// irq check
@@ -495,8 +494,11 @@ static int decode_block(int ch)
   start = s_chan[ch].pLoop;
  }
 
- if (start - spuMemC >= 0x80000)
-  start = (unsigned char*)-1;
+ if (start - spuMemC >= 0x80000) {
+  // most likely wrong
+  start = spuMemC;
+  printf("ch%d oflow\n", ch);
+ }
 
  s_chan[ch].pCurr = start;                 // store values for next cycle
 
@@ -635,6 +637,49 @@ static int do_samples_noise(int ch, int ns, int ns_to)
  return -1;
 }
 
+#ifdef __arm__
+// asm code
+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);
+#else
+static void mix_chan(int start, int count, int lv, int rv)
+{
+ int *dst = SSumLR + start * 2;
+ const int *src = ChanBuf + start;
+ int l, r;
+
+ while (count--)
+  {
+   int sval = *src++;
+
+   l = (sval * lv) >> 14;
+   r = (sval * rv) >> 14;
+   *dst++ += l;
+   *dst++ += r;
+  }
+}
+
+static void mix_chan_rvb(int start, int count, int lv, int rv)
+{
+ int *dst = SSumLR + start * 2;
+ int *drvb = sRVBStart + start * 2;
+ const int *src = ChanBuf + start;
+ int l, r;
+
+ while (count--)
+  {
+   int sval = *src++;
+
+   l = (sval * lv) >> 14;
+   r = (sval * rv) >> 14;
+   *dst++ += l;
+   *dst++ += r;
+   *drvb++ += l;
+   *drvb++ += r;
+  }
+}
+#endif
+
 ////////////////////////////////////////////////////////////////////////
 // MAIN SPU FUNCTION
 // here is the main job handler... thread, timer or direct func call
@@ -654,7 +699,7 @@ static void *MAINThread(void *arg)
 {
  int volmult = iVolume;
  int ns,ns_from,ns_to;
- int ch,d;
+ int ch,d,silentch;
  int bIRQReturn=0;
 
  while(!bEndThread)                                    // until we are shutting down
@@ -694,6 +739,8 @@ static void *MAINThread(void *arg)
      ch=lastch; ns_from=lastns; lastch=-1;             // -> setup all kind of vars to continue
     }
 
+   silentch=~(dwChannelOn|dwNewChannel);
+
    //--------------------------------------------------//
    //- main channel loop                              -// 
    //--------------------------------------------------//
@@ -719,36 +766,18 @@ static void *MAINThread(void *arg)
          bIRQReturn=1;
          lastch=ch; 
          lastns=ns_to=d;
+         if(d==0)
+          break;
         }
 
        MixADSR(ch, ns_from, ns_to);
 
        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);
        else
-        {
-         int lv=s_chan[ch].iLeftVolume;
-         int rv=s_chan[ch].iRightVolume;
-
-         for(ns=ns_from;ns<ns_to;ns++)
-          {
-           int sval = ChanBuf[ns];
-           int l, r;
-
-           //////////////////////////////////////////////
-           // ok, left/right sound volume (psx volume goes from 0 ... 0x3fff)
-
-           l=(sval*lv)>>14;
-           r=(sval*rv)>>14;
-           SSumLR[ns*2]  +=l;
-           SSumLR[ns*2+1]+=r;
-
-           //////////////////////////////////////////////
-           // now let us store sound data for reverb    
-
-           if(s_chan[ch].bRVBActive) StoreREVERB(ch,ns,l,r);
-          }
-        }
+        mix_chan(ns_from,ns_to-ns_from,s_chan[ch].iLeftVolume,s_chan[ch].iRightVolume);
       }
     }
 
@@ -757,9 +786,8 @@ static void *MAINThread(void *arg)
     if(!bIRQReturn && (spuCtrl&CTRL_IRQ))
      for(ch=0;ch<MAXCHAN;ch++)
       {
-       if(dwChannelOn&(1<<ch)) continue;               // already handled
-       if(s_chan[ch].pCurr == (unsigned char *)-1)
-        continue;
+       if(!(silentch&(1<<ch))) continue;               // already handled
+       if(dwChannelDead&(1<<ch)) continue;
        if(s_chan[ch].pCurr > pSpuIrq && s_chan[ch].pLoop > pSpuIrq)
         continue;
 
@@ -771,11 +799,12 @@ static void *MAINThread(void *arg)
         {
          unsigned char *start=s_chan[ch].pCurr;
 
-         bIRQReturn |= skip_block(ch);
+         // no need for bIRQReturn since the channel is silent
+         iSpuAsyncWait |= skip_block(ch);
          if(start == s_chan[ch].pCurr)
           {
            // looping on self
-           s_chan[ch].pCurr=(unsigned char *)-1;
+           dwChannelDead|=1<<ch;
            break;
           }
 
@@ -1161,9 +1190,9 @@ char * SPUgetLibInfos(void)
 */
 
 // debug
-void spu_get_debug_info(int *chans_out, int *fmod_chans_out, int *noise_chans_out)
+void spu_get_debug_info(int *chans_out, int *run_chans, int *fmod_chans_out, int *noise_chans_out)
 {
- int ch = 0, fmod_chans = 0, noise_chans = 0;
+ int ch = 0, fmod_chans = 0, noise_chans = 0, irq_chans = 0;
 
  for(;ch<MAXCHAN;ch++)
  {
@@ -1173,9 +1202,12 @@ void spu_get_debug_info(int *chans_out, int *fmod_chans_out, int *noise_chans_ou
    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)
+   irq_chans |= 1 << ch;
  }
 
  *chans_out = dwChannelOn;
+ *run_chans = ~dwChannelOn & ~dwChannelDead & irq_chans;
  *fmod_chans_out = fmod_chans;
  *noise_chans_out = noise_chans;
 }