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

Normalize audio when downmixing to avoid clipping (#6867) 

* Normalize audio when downmixing to avoid clipping

Idea came from this topic:
https://hydrogenaud.io/index.php?topic=104214.msg855199#msg855199

Fixes very loud audio in Motorstorm (and probably other games
when playing over headphones/stereo speakers with
Downmix to Stereo option enabled)
This commit is contained in:
arabek 2019-10-25 11:56:47 +02:00 committed by Ivan
parent 6944e180c8
commit 63a0b97dd1
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rpcs3/Emu/Cell/Modules/cellAudio.cpp
View File

@ -754,7 +754,9 @@ void cell_audio_thread::mix(float *out_buffer, s32 offset)
if (port.state != audio_port_state::started) continue;
auto buf = port.get_vm_ptr(offset);
static const float k = 1.0f;
static const float k = 1.f;
static const float minus_3db = 0.707f; /* value taken from
https://www.dolby.com/us/en/technologies/a-guide-to-dolby-metadata.pdf */
float& m = port.level;
// part of cellAudioSetPortLevel functionality
@ -835,9 +837,10 @@ void cell_audio_thread::mix(float *out_buffer, s32 offset)
if constexpr (DownmixToStereo)
{
const float mid = (center + low_freq) * 0.708f;
out_buffer[out + 0] = (left + rear_left + side_left + mid) * k;
out_buffer[out + 1] = (right + rear_right + side_right + mid) * k;
const float mid = center * minus_3db; /* don't mix in the lfe as per
dolby specification */
out_buffer[out + 0] = (left + rear_left + (side_left * minus_3db) + mid) * k;
out_buffer[out + 1] = (right + rear_right + (side_right * minus_3db) + mid) * k;
}
else
{
@ -870,9 +873,9 @@ void cell_audio_thread::mix(float *out_buffer, s32 offset)
if constexpr (DownmixToStereo)
{
const float mid = (center + low_freq) * 0.708f;
out_buffer[out + 0] += (left + rear_left + side_left + mid) * k;
out_buffer[out + 1] += (right + rear_right + side_right + mid) * k;
const float mid = center * minus_3db;
out_buffer[out + 0] += (left + rear_left + (side_left * minus_3db) + mid) * k;
out_buffer[out + 1] += (right + rear_right + (side_right * minus_3db) + mid) * k;
}
else
{