SPU: Clamp before applying main volume not after

Fixes popping in Monkey Magic.
This commit is contained in:
Connor McLaughlin
2020-05-12 02:15:16 +10:00
parent 81f297456c
commit 634880b5e3
2 changed files with 9 additions and 8 deletions

View File

@ -331,9 +331,9 @@ private:
};
};
static constexpr s16 Clamp16(s32 value)
static constexpr s32 Clamp16(s32 value)
{
return (value < -0x8000) ? -0x8000 : (value > 0x7FFF) ? 0x7FFF : static_cast<s16>(value);
return (value < -0x8000) ? -0x8000 : (value > 0x7FFF) ? 0x7FFF : value;
}
static constexpr s32 ApplyVolume(s32 sample, s16 volume) { return (sample * s32(volume)) >> 15; }