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

SPU2: Clamp output to 32767 instead of 32512 

Another air-ism which doesn't make much sense.
This commit is contained in:
Stenzek 2023-01-18 21:25:45 +10:00 committed by refractionpcsx2
parent 76fa37019e
commit 0b87cfc7d4
2 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcsx2/SPU2/Mixer.cpp
View File

@ -46,30 +46,14 @@ static __forceinline s32 MulShr32(s32 srcval, s32 mulval)
return (s64)srcval * mulval >> 32; return (s64)srcval * mulval >> 32;
} }
__forceinline s32 clamp_mix(s32 x, u8 bitshift) __forceinline s32 clamp_mix(s32 x)
{ {
assert(bitshift <= 15); return std::clamp(x, -0x8000, 0x7fff);
return std::clamp(x, -(0x8000 << bitshift), 0x7fff << bitshift);
} }
#if _MSC_VER __forceinline StereoOut32 clamp_mix(StereoOut32 sample)
__forceinline
// Without the keyword static, gcc compilation fails on the inlining...
// Unfortunately the function is also used in Reverb.cpp. In order to keep the code
// clean we just disable it.
// We will need link-time code generation / Whole Program optimization to do a clean
// inline. Gcc 4.5 has the experimental options -flto, -fwhopr and -fwhole-program to
// do it but it still experimental...
#endif
StereoOut32
clamp_mix(const StereoOut32& sample, u8 bitshift)
{ {
// We should clampify between -0x8000 and 0x7fff, however some audio output return StereoOut32(clamp_mix(sample.Left), clamp_mix(sample.Right));
// modules or sound drivers could (will :p) overshoot with that. So giving it a small safety.
return StereoOut32(
std::clamp(sample.Left, -(0x7f00 << bitshift), 0x7f00 << bitshift),
std::clamp(sample.Right, -(0x7f00 << bitshift), 0x7f00 << bitshift));
} }
static void __forceinline XA_decode_block(s16* buffer, const s16* block, s32& prev1, s32& prev2) static void __forceinline XA_decode_block(s16* buffer, const s16* block, s32& prev1, s32& prev2)

5
pcsx2/SPU2/Mixer.h
View File

@ -62,6 +62,5 @@ struct StereoOut32
}; };
extern void Mix(); extern void Mix();
extern s32 clamp_mix(s32 x, u8 bitshift = 0); extern s32 clamp_mix(s32 x);
extern StereoOut32 clamp_mix(StereoOut32 sample);
extern StereoOut32 clamp_mix(const StereoOut32& sample, u8 bitshift = 0);