ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPU2: Reverb resampling, now upwards as well 

Using the same filter as the downsampling
This commit is contained in:
Ziemas 2021-02-15 05:37:25 +01:00 committed by refractionpcsx2
parent 390391e119
commit 599d25c59b
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pcsx2/SPU2/Reverb.cpp
View File

@ -92,7 +92,7 @@ static constexpr std::array<s32, NUM_TAPS> filter_coefs = {
-1, -1,
}; };
s32 V_Core::ReverbDownsample(bool right) s32 __forceinline V_Core::ReverbDownsample(bool right)
{ {
s32 out = 0; s32 out = 0;
@ -108,9 +108,25 @@ s32 V_Core::ReverbDownsample(bool right)
} }
s32 V_Core::ReverbUpsample() StereoOut32 __forceinline V_Core::ReverbUpsample()
{ {
return 0; s32 ls = 0, rs = 0;
for (u32 i = 0; i < NUM_TAPS; i++)
{
ls += RevbUpBuf[0][((RevbSampleBufPos - NUM_TAPS) + i) & 63] * filter_coefs[i];
}
for (u32 i = 0; i < NUM_TAPS; i++)
{
rs += RevbUpBuf[1][((RevbSampleBufPos - NUM_TAPS) + i) & 63] * filter_coefs[i];
}
ls >>= 14;
Clampify(ls, INT16_MIN, INT16_MAX);
rs >>= 14;
Clampify(rs, INT16_MIN, INT16_MAX);
return StereoOut32(ls, rs);
} }
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
@ -122,8 +138,6 @@ StereoOut32 V_Core::DoReverb(const StereoOut32& Input)
return StereoOut32::Empty; return StereoOut32::Empty;
} }
RevbSampleBufPos++;
RevbDownBuf[0][RevbSampleBufPos & 63] = Input.Left; RevbDownBuf[0][RevbSampleBufPos & 63] = Input.Left;
RevbDownBuf[1][RevbSampleBufPos & 63] = Input.Right; RevbDownBuf[1][RevbSampleBufPos & 63] = Input.Right;
@ -205,7 +219,10 @@ StereoOut32 V_Core::DoReverb(const StereoOut32& Input)
_spu2mem[apf2_dst] = clamp_mix(apf2); _spu2mem[apf2_dst] = clamp_mix(apf2);
} }
(R ? LastEffect.Right : LastEffect.Left) = -clamp_mix(out); RevbUpBuf[0][RevbSampleBufPos & 63] = R ? 0 : clamp_mix(out);
RevbUpBuf[1][RevbSampleBufPos & 63] = R ? clamp_mix(out) : 0;
return LastEffect; RevbSampleBufPos++;
return ReverbUpsample();
} }

2
pcsx2/SPU2/defs.h
View File

@ -497,7 +497,7 @@ struct V_Core
s32 RevbGetIndexer(s32 offset); s32 RevbGetIndexer(s32 offset);
s32 ReverbDownsample(bool right); s32 ReverbDownsample(bool right);
s32 ReverbUpsample(); StereoOut32 ReverbUpsample();
StereoOut32 ReadInput(); StereoOut32 ReadInput();
StereoOut32 ReadInput_HiFi(); StereoOut32 ReadInput_HiFi();