ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8927 from Filoppi/wiimote-pan-fix 

Fixed volume of emulated wii mote speakers not being native.
This commit is contained in:
Léo Lam 2020-10-21 21:02:39 +02:00 committed by GitHub
parent 97de366b0f cf8b52735f
commit fd5f9f4c26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,16 +128,21 @@ void SpeakerLogic::SpeakerData(const u8* data, int length, float speaker_pan)
} }
// SetWiimoteSpeakerVolume expects values from 0 to 255. // SetWiimoteSpeakerVolume expects values from 0 to 255.
// Multiply by 256, cast to int, and clamp to 255 for a uniform conversion. // Multiply by 256, floor to int, and clamp to 255 for a uniformly mapped conversion.
const double volume = float(reg_data.volume) / volume_divisor * 256; const double volume = float(reg_data.volume) * 256.f / volume_divisor;
// Speaker pan using "Constant Power Pan Law" // This used the "Constant Power Pan Law", but it is undesirable
const double pan_prime = MathUtil::PI * (speaker_pan + 1) / 4; // if the pan is 0, and it implied that the loudness of a wiimote speaker
// is equal to the loudness of your device speakers, which isn't true at all.
// This way, if the pan is 0, it's like if it is not there.
// We should play the samples from the wiimote at the native volume they came with,
// because you can lower their volume from the Wii settings and because they are
// already extremely low quality, so any additional quality loss isn't welcome.
speaker_pan = std::clamp(speaker_pan, -1.f, 1.f);
const u32 l_volume = std::min(u32(std::min(1.f - speaker_pan, 1.f) * volume), 255u);
const u32 r_volume = std::min(u32(std::min(1.f + speaker_pan, 1.f) * volume), 255u);
const auto left_volume = std::min(int(std::cos(pan_prime) * volume), 255); g_sound_stream->GetMixer()->SetWiimoteSpeakerVolume(l_volume, r_volume);
const auto right_volume = std::min(int(std::sin(pan_prime) * volume), 255);
g_sound_stream->GetMixer()->SetWiimoteSpeakerVolume(left_volume, right_volume);
// ADPCM sample rate is thought to be x2.(3000 x2 = 6000). // ADPCM sample rate is thought to be x2.(3000 x2 = 6000).
const unsigned int sample_rate = sample_rate_dividend / reg_data.sample_rate; const unsigned int sample_rate = sample_rate_dividend / reg_data.sample_rate;