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

Merge pull request #13441 from jordan-woyak/wm-speaker-cleanup

Browse Source 
WiimoteEmu: Eliminate dynamic memory allocation in speaker data decoding.
This commit is contained in:
JMC47 2025-03-18 16:23:50 -04:00 committed by GitHub
commit 18979129f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/HW/WiimoteCommon/WiimoteReport.h
View File

@ -149,11 +149,12 @@ static_assert(sizeof(OutputReportReadData) == 6, "Wrong size");
struct OutputReportSpeakerData
{
static constexpr OutputReportID REPORT_ID = OutputReportID::SpeakerData;
static constexpr size_t DATA_SIZE = 20;
u8 rumble : 1;
u8 : 2;
u8 length : 5;
u8 data[20];
std::array<u8, DATA_SIZE> data;
};
static_assert(sizeof(OutputReportSpeakerData) == 21, "Wrong size");

2
Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
View File

@ -390,7 +390,7 @@ void Wiimote::HandleSpeakerData(const WiimoteCommon::OutputReportSpeakerData& rp
{
// Speaker data reports result in a write to the speaker hardware at offset 0x00.
m_i2c_bus.BusWrite(SpeakerLogic::I2C_ADDR, SpeakerLogic::SPEAKER_DATA_OFFSET, rpt.length,
rpt.data);
std::data(rpt.data));
}
}

12
Source/Core/Core/HW/WiimoteEmu/Speaker.cpp
View File

@ -3,14 +3,17 @@
#include "Core/HW/WiimoteEmu/Speaker.h"
#include <memory>
#include <cassert>
#include "AudioCommon/AudioCommon.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Core/ConfigManager.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/System.h"
#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
@ -62,8 +65,9 @@ void SpeakerLogic::SpeakerData(const u8* data, int length, float speaker_pan)
// Even if volume is zero we process samples to maintain proper decoder state.
// TODO consider using static max size instead of new
std::unique_ptr<s16[]> samples(new s16[length * 2]);
// Potentially 40 resulting samples.
std::array<s16, WiimoteCommon::OutputReportSpeakerData::DATA_SIZE * 2> samples;
assert(length * 2 <= samples.size());
unsigned int sample_rate_dividend, sample_length;
u8 volume_divisor;
@ -130,7 +134,7 @@ void SpeakerLogic::SpeakerData(const u8* data, int length, float speaker_pan)
// ADPCM sample rate is thought to be x2.(3000 x2 = 6000).
const unsigned int sample_rate = sample_rate_dividend / reg_data.sample_rate;
sound_stream->GetMixer()->PushWiimoteSpeakerSamples(
samples.get(), sample_length, Mixer::FIXED_SAMPLE_RATE_DIVIDEND / (sample_rate * 2));
samples.data(), sample_length, Mixer::FIXED_SAMPLE_RATE_DIVIDEND / (sample_rate * 2));
}
void SpeakerLogic::Reset()