spu: do adsr on whole buffer

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

diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index f9c13d4..79e534c 100644 (file)
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -108,6 +108,7 @@ static const int f[8][2] = {   {    0,  0  },
                         {  115, -52 },
                         {   98, -55 },
                         {  122, -60 } };
+int ChanBuf[NSSIZE];
 int SSumLR[NSSIZE*2];
 int iFMod[NSSIZE];
 int iCycle = 0;
@@ -597,8 +598,6 @@ static void *MAINThread(void *arg)
 
        for(ns=ns_from;ns<ns_to;ns++)                   // loop until 1 ms of data is reached
         {
-         int sval;
-
          if(!(dwChannelOn&(1<<ch))) break;             // something turned ch off (adsr or flags)
 
          if(s_chan[ch].bFMod==1 && iFMod[ns])          // fmod freq channel
@@ -628,12 +627,23 @@ static void *MAINThread(void *arg)
          if(s_chan[ch].bNoise)
               fa=iGetNoiseVal(ch);                     // get noise val
          else fa=iGetInterpolationVal(ch);             // get sample val
+         ChanBuf[ns]=fa;
+
+         ////////////////////////////////////////////////
+         // ok, go on until 1 ms data of this channel is collected
+
+         s_chan[ch].spos += s_chan[ch].sinc;
+ENDX: ;
+        }
 
-         sval = (MixADSR(ch) * fa) / 1024;  // mix adsr
+       MixADSR(ch, ns_from, ns_to);
+
+       if(s_chan[ch].bFMod==2)                         // fmod freq channel
+        memcpy(iFMod, ChanBuf, sizeof(iFMod));
+       else for(ns=ns_from;ns<ns_to;ns++)
+        {
+         int sval = ChanBuf[ns];
 
-         if(s_chan[ch].bFMod==2)                       // fmod freq channel
-          iFMod[ns]=sval;                              // -> store 1T sample data, use that to do fmod on next channel
-         else                                          // no fmod freq channel
           {
            //////////////////////////////////////////////
            // ok, left/right sound volume (psx volume goes from 0 ... 0x3fff)
@@ -646,15 +656,56 @@ static void *MAINThread(void *arg)
 
            if(s_chan[ch].bRVBActive) StoreREVERB(ch,ns,sval);
           }
+        }
+      }
+    }
 
-         ////////////////////////////////////////////////
-         // ok, go on until 1 ms data of this channel is collected
+    // advance "stopped" channels that can cause irqs
+    // (all chans are always playing on the real thing..)
+    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(s_chan[ch].pCurr > pSpuIrq && s_chan[ch].pLoop > pSpuIrq)
+        continue;
 
-         s_chan[ch].spos += s_chan[ch].sinc;
+       if(s_chan[ch].iActFreq!=s_chan[ch].iUsedFreq)   // new psx frequency?
+         VoiceChangeFrequency(ch);
+
+       s_chan[ch].spos += s_chan[ch].sinc * NSSIZE;
+       while(s_chan[ch].spos >= 28 * 0x10000)
+        {
+         unsigned char *start=s_chan[ch].pCurr;
+         int flags = start[1];
+
+         // Tron Bonne hack, probably wrong (could be wrong memory contents..)
+         if(flags & ~7) flags = 0;
+
+         if(start == pSpuIrq)
+          {
+           do_irq();
+           bIRQReturn = 1;
+          }
+         else if((flags & 1) && start == s_chan[ch].pLoop)
+          {
+           // looping on self
+           s_chan[ch].pCurr=(unsigned char *)-1;
+           break;
+          }
+
+         if((flags&4) && !s_chan[ch].bIgnoreLoop)
+          s_chan[ch].pLoop=start;
+
+         s_chan[ch].pCurr += 16;
+
+         if(flags & 1)
+          s_chan[ch].pCurr = s_chan[ch].pLoop;
+
+         s_chan[ch].spos -= 28 * 0x10000;
         }
-ENDX: ;
       }
-    }
 
     if(bIRQReturn && iSPUIRQWait)                      // special return for "spu irq - wait for cpu action"
      {
@@ -1028,4 +1079,24 @@ char * SPUgetLibInfos(void)
 }
 */
 
+// debug
+void spu_get_debug_info(int *chans_out, int *fmod_chans_out, int *noise_chans_out)
+{
+ int ch = 0, fmod_chans = 0, noise_chans = 0;
+
+ for(;ch<MAXCHAN;ch++)
+ {
+  if (!(dwChannelOn & (1<<ch)))
+   continue;
+  if (s_chan[ch].bFMod == 2)
+   fmod_chans |= 1 << ch;
+  if (s_chan[ch].bNoise)
+   noise_chans |= 1 << ch;
+ }
+
+ *chans_out = dwChannelOn;
+ *fmod_chans_out = fmod_chans;
+ *noise_chans_out = noise_chans;
+}
+
 // vim:shiftwidth=1:expandtab