artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix logic error & scale sample volume based on voice volume

Browse source
This commit is contained in:
David Marcec 2020-04-22 14:36:08 +10:00 committed by bunnei
parent c4e7ec7a99
commit 16c0373adc
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/audio_core/audio_renderer.cpp
View file

@ -315,8 +315,8 @@ void AudioRenderer::VoiceState::RefreshBuffer(Core::Memory::Memory& memory,
sample *= voice_resources[0]->mix_volumes[0]; sample *= voice_resources[0]->mix_volumes[0];
} }
samples[index * 2] = static_cast<s16>(sample); samples[index * 2] = static_cast<s16>(sample * info.volume);
samples[index * 2 + 1] = static_cast<s16>(sample); samples[index * 2 + 1] = static_cast<s16>(sample * info.volume);
} }
break; break;
} }
@ -336,11 +336,11 @@ void AudioRenderer::VoiceState::RefreshBuffer(Core::Memory::Memory& memory,
} }
if (voice_resources[1]->in_use) { if (voice_resources[1]->in_use) {
sample_l *= voice_resources[1]->mix_volumes[1]; sample_r *= voice_resources[1]->mix_volumes[1];
} }
samples[index_l] = static_cast<s16>(sample_l); samples[index_l] = static_cast<s16>(sample_l * info.volume);
samples[index_r] = static_cast<s16>(sample_r); samples[index_r] = static_cast<s16>(sample_r * info.volume);
} }
break; break;
} }
@ -371,8 +371,10 @@ void AudioRenderer::VoiceState::RefreshBuffer(Core::Memory::Memory& memory,
BR *= voice_resources[5]->mix_volumes[5]; BR *= voice_resources[5]->mix_volumes[5];
} }
samples[index * 2] = static_cast<s16>(0.3694f * FL + 0.2612f * FC + 0.3694f * BL); samples[index * 2] =
samples[index * 2 + 1] = static_cast<s16>(0.3694f * FR + 0.2612f * FC + 0.3694f * BR); static_cast<s16>((0.3694f * FL + 0.2612f * FC + 0.3694f * BL) * info.volume);
samples[index * 2 + 1] =
static_cast<s16>((0.3694f * FR + 0.2612f * FC + 0.3694f * BR) * info.volume);
} }
break; break;
} }