VERY experimental Nintendo Switch 2 emulator
C++
[audio_core] Fix broken biquad effect (#3225)
MaranBrb95c4d2d5d0c
diff --git a/src/audio_core/renderer/command/command_buffer.cpp b/src/audio_core/renderer/command/command_buffer.cppindex 804aba438d..66f78f26b4 100644--- a/src/audio_core/renderer/command/command_buffer.cpp+++ b/src/audio_core/renderer/command/command_buffer.cpp@@ -272,35 +272,31 @@ void CommandBuffer::GenerateBiquadFilterCommand(const s32 node_id, EffectInfoBaseffect_info.GetStateBuffer() + channel * sizeof(VoiceState::BiquadFilterState))};if (behavior->IsEffectInfoVersion2Supported()) {- const auto& p{+ const auto& parameter{*reinterpret_cast<BiquadFilterInfo::ParameterVersion2*>(effect_info.GetParameter())};- if (!IsChannelCountValid(p.channel_count) || channel < 0 || channel >= p.channel_count) {- return;- }-- cmd.input = buffer_offset + p.inputs[channel];- cmd.output = buffer_offset + p.outputs[channel];+ if (parameter.state <= EffectInfoBase::ParameterState::Updated && IsChannelCountValid(parameter.channel_count) && channel >= 0 && channel < parameter.channel_count) {+ cmd.input = buffer_offset + parameter.inputs[channel];+ cmd.output = buffer_offset + parameter.outputs[channel];- // Convert float coefficients to Q2.14 fixed-point as expected by the legacy DSP path.- cmd.biquad.b[0] = ToQ14Clamped(p.b[0]);- cmd.biquad.b[1] = ToQ14Clamped(p.b[1]);- cmd.biquad.b[2] = ToQ14Clamped(p.b[2]);- cmd.biquad.a[0] = ToQ14Clamped(p.a[0]);- cmd.biquad.a[1] = ToQ14Clamped(p.a[1]);+ // Convert float coefficients to Q2.14 fixed-point as expected by the legacy DSP path.+ cmd.biquad.b[0] = ToQ14Clamped(parameter.b[0]);+ cmd.biquad.b[1] = ToQ14Clamped(parameter.b[1]);+ cmd.biquad.b[2] = ToQ14Clamped(parameter.b[2]);+ cmd.biquad.a[0] = ToQ14Clamped(parameter.a[0]);+ cmd.biquad.a[1] = ToQ14Clamped(parameter.a[1]);+ }} else {- const auto& p{+ const auto& parameter{*reinterpret_cast<BiquadFilterInfo::ParameterVersion1*>(effect_info.GetParameter())};- if (!IsChannelCountValid(p.channel_count) || channel < 0 || channel >= p.channel_count) {- return;- }-- cmd.input = buffer_offset + p.inputs[channel];- cmd.output = buffer_offset + p.outputs[channel];+ if (IsChannelCountValid(parameter.channel_count) && channel >= 0 && channel < parameter.channel_count) {+ cmd.input = buffer_offset + parameter.inputs[channel];+ cmd.output = buffer_offset + parameter.outputs[channel];- cmd.biquad.b = p.b;- cmd.biquad.a = p.a;+ cmd.biquad.b = parameter.b;+ cmd.biquad.a = parameter.a;+ }}// Effects always use the fixed-point coefficient path on the DSP.diff --git a/src/audio_core/renderer/command/command_generator.cpp b/src/audio_core/renderer/command/command_generator.cppindex bec6abbaf9..29d7c11d16 100644--- a/src/audio_core/renderer/command/command_generator.cpp+++ b/src/audio_core/renderer/command/command_generator.cpp@@ -374,8 +374,10 @@ void CommandGenerator::GenerateBiquadFilterEffectCommand(const s16 buffer_offsetLOG_ERROR(Service_Audio, "Biquad filter parameter is null");return;}- param_state = parameter->state;- channel_count = parameter->channel_count;+ if (parameter->state <= EffectInfoBase::ParameterState::Updated) {+ param_state = parameter->state;+ channel_count = parameter->channel_count;+ }} else {const auto* parameter =reinterpret_cast<const BiquadFilterInfo::ParameterVersion1*>(effect_info.GetParameter());