The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 15:01:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mixer: Use smaller array for PushWiimoteSpeakerSamples

Browse Source
This commit is contained in:
Pokechu22 2022-09-08 11:32:44 -07:00
parent 2dfe91336a
commit abb59a781a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/AudioCommon/Mixer.cpp
View File

@ -282,9 +282,11 @@ void Mixer::PushStreamingSamples(const short* samples, unsigned int num_samples)
void Mixer::PushWiimoteSpeakerSamples(const short* samples, unsigned int num_samples, void Mixer::PushWiimoteSpeakerSamples(const short* samples, unsigned int num_samples,
unsigned int sample_rate_divisor) 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<short, MAX_SPEAKER_SAMPLES * 2> samples_stereo;
if (num_samples < MAX_SAMPLES) if (num_samples <= MAX_SPEAKER_SAMPLES)
{ {
m_wiimote_speaker_mixer.SetInputSampleRateDivisor(sample_rate_divisor); 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]; 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);
} }
} }