// will be included from spu.c\r
#ifdef _IN_SPU\r
\r
-////////////////////////////////////////////////////////////////////////\r
-// globals\r
-////////////////////////////////////////////////////////////////////////\r
-\r
-// REVERB info and timing vars...\r
-\r
-int * sRVBPlay = 0;\r
-int * sRVBEnd = 0;\r
-int * sRVBStart = 0;\r
-\r
////////////////////////////////////////////////////////////////////////\r
// START REVERB\r
////////////////////////////////////////////////////////////////////////\r
\r
INLINE void StartREVERB(int ch)\r
{\r
- if(s_chan[ch].bReverb && (spuCtrl&0x80)) // reverb possible?\r
+ if(s_chan[ch].bReverb && (spu.spuCtrl&0x80)) // reverb possible?\r
{\r
- s_chan[ch].bRVBActive=!!iUseReverb;\r
+ s_chan[ch].bRVBActive=!!spu_config.iUseReverb;\r
}\r
else s_chan[ch].bRVBActive=0; // else -> no reverb\r
}\r
// HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf\r
////////////////////////////////////////////////////////////////////////\r
\r
-INLINE void InitREVERB(void)\r
+INLINE void InitREVERB(int ns_to)\r
{\r
- memset(sRVBStart,0,NSSIZE*2*4);\r
-}\r
-\r
-////////////////////////////////////////////////////////////////////////\r
-// STORE REVERB\r
-////////////////////////////////////////////////////////////////////////\r
-\r
-INLINE void StoreREVERB(int ch,int ns,int l,int r)\r
-{\r
- ns<<=1;\r
-\r
- sRVBStart[ns] +=l; // -> we mix all active reverb channels into an extra buffer\r
- sRVBStart[ns+1]+=r;\r
+ memset(spu.sRVBStart,0,ns_to*sizeof(spu.sRVBStart[0])*2);\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
\r
// get_buffer content helper: takes care about wraps\r
#define g_buffer(var) \\r
- ((int)(signed short)spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)])\r
+ ((int)(signed short)spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)])\r
\r
// saturate iVal and store it as var\r
#define s_buffer(var, iVal) \\r
ssat32_to_16(iVal); \\r
- spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal\r
+ spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal\r
\r
#define s_buffer1(var, iVal) \\r
ssat32_to_16(iVal); \\r
- spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal\r
+ spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal\r
\r
////////////////////////////////////////////////////////////////////////\r
\r
// portions based on spu2-x from PCSX2\r
-static void MixREVERB(void)\r
+static void MixREVERB(int ns_to)\r
{\r
int l_old = rvb.iRVBLeft;\r
int r_old = rvb.iRVBRight;\r
int curr_addr = rvb.CurrAddr;\r
int space = 0x40000 - rvb.StartAddr;\r
- int l, r, ns;\r
+ int l = 0, r = 0, ns;\r
\r
- for (ns = 0; ns < NSSIZE*2; )\r
+ for (ns = 0; ns < ns_to * 2; )\r
{\r
int IIR_ALPHA = rvb.IIR_ALPHA;\r
int ACC0, ACC1, FB_A0, FB_A1, FB_B0, FB_B1;\r
int mix_dest_a0, mix_dest_a1, mix_dest_b0, mix_dest_b1;\r
\r
- int input_L = sRVBStart[ns] * rvb.IN_COEF_L;\r
- int input_R = sRVBStart[ns+1] * rvb.IN_COEF_R;\r
+ int input_L = spu.sRVBStart[ns] * rvb.IN_COEF_L;\r
+ int input_R = spu.sRVBStart[ns+1] * rvb.IN_COEF_R;\r
\r
int IIR_INPUT_A0 = ((g_buffer(IIR_SRC_A0) * rvb.IIR_COEF) + input_L) >> 15;\r
int IIR_INPUT_A1 = ((g_buffer(IIR_SRC_A1) * rvb.IIR_COEF) + input_R) >> 15;\r
s_buffer(MIX_DEST_B0, mix_dest_b0);\r
s_buffer(MIX_DEST_B1, mix_dest_b1);\r
\r
- l = (mix_dest_a0 + mix_dest_b0) / 3;\r
- r = (mix_dest_a1 + mix_dest_b1) / 3;\r
+ l = (mix_dest_a0 + mix_dest_b0) / 2;\r
+ r = (mix_dest_a1 + mix_dest_b1) / 2;\r
+\r
+ l = (l * rvb.VolLeft) >> 15; // 15?\r
+ r = (r * rvb.VolRight) >> 15;\r
+\r
+ SSumLR[ns++] += (l + l_old) / 2;\r
+ SSumLR[ns++] += (r + r_old) / 2;\r
+ SSumLR[ns++] += l;\r
+ SSumLR[ns++] += r;\r
+\r
+ l_old = l;\r
+ r_old = r;\r
+\r
+ curr_addr++;\r
+ if (curr_addr >= 0x40000) curr_addr = rvb.StartAddr;\r
+ }\r
\r
- l = (l * rvb.VolLeft) >> 14;\r
- r = (r * rvb.VolRight) >> 14;\r
+ rvb.iRVBLeft = l;\r
+ rvb.iRVBRight = r;\r
+ rvb.CurrAddr = curr_addr;\r
+}\r
+\r
+static void MixREVERB_off(int ns_to)\r
+{\r
+ int l_old = rvb.iRVBLeft;\r
+ int r_old = rvb.iRVBRight;\r
+ int curr_addr = rvb.CurrAddr;\r
+ int space = 0x40000 - rvb.StartAddr;\r
+ int l = 0, r = 0, ns;\r
+\r
+ for (ns = 0; ns < ns_to * 2; )\r
+ {\r
+ l = (g_buffer(MIX_DEST_A0) + g_buffer(MIX_DEST_B0)) / 2;\r
+ r = (g_buffer(MIX_DEST_A1) + g_buffer(MIX_DEST_B1)) / 2;\r
+\r
+ l = (l * rvb.VolLeft) >> 15;\r
+ r = (r * rvb.VolRight) >> 15;\r
\r
SSumLR[ns++] += (l + l_old) / 2;\r
SSumLR[ns++] += (r + r_old) / 2;\r
rvb.dirty = 0;\r
}\r
\r
-INLINE void REVERBDo(void)\r
+INLINE void REVERBDo(int ns_to)\r
{\r
if (!rvb.StartAddr) // reverb is off\r
{\r
return;\r
}\r
\r
- if (spuCtrl & 0x80) // -> reverb on? oki\r
+ if (spu.spuCtrl & 0x80) // -> reverb on? oki\r
+ {\r
+ if (unlikely(rvb.dirty))\r
+ prepare_offsets();\r
+\r
+ MixREVERB(ns_to);\r
+ }\r
+ else if (rvb.VolLeft || rvb.VolRight)\r
{\r
- if (rvb.dirty)\r
+ if (unlikely(rvb.dirty))\r
prepare_offsets();\r
\r
- MixREVERB();\r
+ MixREVERB_off(ns_to);\r
}\r
else // -> reverb off\r
{\r
- // supposedly runs anyway?\r
- rvb.CurrAddr += NSSIZE/2;\r
+ // reverb runs anyway\r
+ rvb.CurrAddr += ns_to / 2;\r
while (rvb.CurrAddr >= 0x40000)\r
rvb.CurrAddr -= 0x40000 - rvb.StartAddr;\r
}\r