Merge pull request #6073 from dolphin-emu/delroth-fix-6069

Fix sample wrapping with new DSP ADPCM decoding
dolphin-emu · Sep 18, 2017 · c50848b · c50848b
2 parents 7552539 + 3f481a7
commit c50848b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Core/Core/DSP/DSPAccelerator.cpp b/Source/Core/Core/DSP/DSPAccelerator.cpp
@@ -120,8 +120,8 @@ u16 ReadAccelerator(u32 start_address, u32 end_address, u32* current_address, u1
     if (temp >= 8)
       temp -= 16;
 
-    val = (scale * temp) + ((0x400 + coef1 * *yn1 + coef2 * *yn2) >> 11);
-    val = MathUtil::Clamp<s16>(val, -0x7FFF, 0x7FFF);
+    s32 val32 = (scale * temp) + ((0x400 + coef1 * *yn1 + coef2 * *yn2) >> 11);
+    val = static_cast<s16>(MathUtil::Clamp<s32>(val32, -0x7FFF, 0x7FFF));
 
     *yn2 = *yn1;
     *yn1 = val;