SoundEffectManager: Fix buffer overallocation in upmix/shift path

5 months ago · 63f5a6a5bc
parent da339e4776
commit 63f5a6a5bc
1 changed files with 3 additions and 4 deletions
--- a/src/core/sound_effect_manager.cpp
+++ b/src/core/sound_effect_manager.cpp
@ -857,10 +857,9 @@ u32 SoundEffectManager::ReadEntryFrames(PlayingResampledEffect& effect, AudioStr
      const bool needs_shift = (effect->reader.GetBitsPerSample() != 16);
      if (needs_upmix || needs_shift)
      {
-        u32 required_buffer_space = ((ResampledStreamedEffect::INPUT_BUFFER_SIZE * effect->reader.GetNumChannels() *
-                                      effect->reader.GetBytesPerFrame()) +
-                                     (sizeof(s16) - 1)) /
-                                    sizeof(s16);
+        u32 required_buffer_space =
+          ((ResampledStreamedEffect::INPUT_BUFFER_SIZE * effect->reader.GetBytesPerFrame()) + (sizeof(s16) - 1)) /
+          sizeof(s16);

        // use second half of buffer as scratch when doing both
        if (needs_upmix && needs_shift)