RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-26 04:32:35 +01:00
Code Issues Releases Wiki Activity

cellAudio: use downmix formula based on documentation

Browse Source
This commit is contained in:
Megamouse 2020-06-01 15:12:56 +02:00
parent d9e3f0ccfa
commit 5269b69bc5
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -785,7 +785,7 @@ void cell_audio_thread::mix(float *out_buffer, s32 offset)
auto buf = port.get_vm_ptr(offset);
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
static constexpr float minus_3db = 0.707f; // value taken from https://www.dolby.com/us/en/technologies/a-guide-to-dolby-metadata.pdf
float m = master_volume;
// part of cellAudioSetPortLevel functionality
@ -868,9 +868,10 @@ void cell_audio_thread::mix(float *out_buffer, s32 offset)
if constexpr (DownmixToStereo)
{
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;
// Don't mix in the lfe as per dolby specification and based on documentation
const float mid = center * 0.5;
out_buffer[out + 0] = left * minus_3db + mid + side_left * 0.5 + rear_left * 0.5;
out_buffer[out + 1] = right * minus_3db + mid + side_right * 0.5 + rear_right * 0.5;
}
else
{
@ -903,9 +904,10 @@ void cell_audio_thread::mix(float *out_buffer, s32 offset)
if constexpr (DownmixToStereo)
{
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;
// Don't mix in the lfe as per dolby specification and based on documentation
const float mid = center * 0.5;
out_buffer[out + 0] += left * minus_3db + mid + side_left * 0.5 + rear_left * 0.5;
out_buffer[out + 1] += right * minus_3db + mid + side_right * 0.5 + rear_right * 0.5;
}
else
{