From abb59a781aebf89cb3d808826ffc146e0a5d34ea Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Thu, 8 Sep 2022 11:32:44 -0700 Subject: [PATCH 1/2] Mixer: Use smaller array for PushWiimoteSpeakerSamples --- Source/Core/AudioCommon/Mixer.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index 5baa02d25e..2609ff89a5 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -282,9 +282,11 @@ void Mixer::PushStreamingSamples(const short* samples, unsigned int num_samples) void Mixer::PushWiimoteSpeakerSamples(const short* samples, unsigned int num_samples, unsigned int sample_rate_divisor) { - short samples_stereo[MAX_SAMPLES * 2]; + // Max 20 bytes/speaker report, may be 4-bit ADPCM so multiply by 2 + static constexpr u32 MAX_SPEAKER_SAMPLES = 20 * 2; + std::array samples_stereo; - if (num_samples < MAX_SAMPLES) + if (num_samples <= MAX_SPEAKER_SAMPLES) { m_wiimote_speaker_mixer.SetInputSampleRateDivisor(sample_rate_divisor); @@ -294,7 +296,7 @@ void Mixer::PushWiimoteSpeakerSamples(const short* samples, unsigned int num_sam samples_stereo[i * 2 + 1] = samples[i]; } - m_wiimote_speaker_mixer.PushSamples(samples_stereo, num_samples); + m_wiimote_speaker_mixer.PushSamples(samples_stereo.data(), num_samples); } } From 72de74d4fc81bf5cc2ed0b3a9a3c6c43856c0c5e Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Wed, 24 Aug 2022 17:22:39 -0700 Subject: [PATCH 2/2] Mixer: Add assertions regarding num_samples versus buffer length --- Source/Core/AudioCommon/Mixer.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index 2609ff89a5..ccec2db5c9 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -167,6 +167,11 @@ unsigned int Mixer::Mix(short* samples, unsigned int num_samples) unsigned int available_samples = std::min(m_dma_mixer.AvailableSamples(), m_streaming_mixer.AvailableSamples()); + ASSERT_MSG(AUDIO, available_samples <= MAX_SAMPLES, + "Audio stretching would overflow m_scratch_buffer: min({}, {}) -> {} > {} ({})", + m_dma_mixer.AvailableSamples(), m_streaming_mixer.AvailableSamples(), + available_samples, MAX_SAMPLES, num_samples); + m_scratch_buffer.fill(0); m_dma_mixer.Mix(m_scratch_buffer.data(), available_samples, false, emulation_speed, @@ -213,10 +218,15 @@ unsigned int Mixer::MixSurround(float* samples, unsigned int num_samples) // Mix() may also use m_scratch_buffer internally, but is safe because it alternates reads // and writes. + ASSERT_MSG(AUDIO, needed_frames <= MAX_SAMPLES, + "needed_frames would overflow m_scratch_buffer: {} -> {} > {}", num_samples, + needed_frames, MAX_SAMPLES); size_t available_frames = Mix(m_scratch_buffer.data(), static_cast(needed_frames)); if (available_frames != needed_frames) { - ERROR_LOG_FMT(AUDIO, "Error decoding surround frames."); + ERROR_LOG_FMT(AUDIO, + "Error decoding surround frames: needed {} frames for {} samples but got {}", + needed_frames, num_samples, available_frames); return 0; } @@ -286,6 +296,9 @@ void Mixer::PushWiimoteSpeakerSamples(const short* samples, unsigned int num_sam static constexpr u32 MAX_SPEAKER_SAMPLES = 20 * 2; std::array samples_stereo; + ASSERT_MSG(AUDIO, num_samples <= MAX_SPEAKER_SAMPLES, + "num_samples would overflow samples_stereo: {} > {}", num_samples, + MAX_SPEAKER_SAMPLES); if (num_samples <= MAX_SPEAKER_SAMPLES) { m_wiimote_speaker_mixer.SetInputSampleRateDivisor(sample_rate_divisor);