From 7508e75827626f77129cdf1cf6a86ba94e9b6971 Mon Sep 17 00:00:00 2001 From: Gabriel A Date: Thu, 16 May 2024 01:15:43 -0300 Subject: [PATCH] Should use Volume1 if no ramp --- .../Renderer/Dsp/Command/BiquadFilterAndMixCommand.cs | 5 ++--- .../Dsp/Command/MultiTapBiquadFilterAndMixCommand.cs | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterAndMixCommand.cs b/src/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterAndMixCommand.cs index 7947118eb0..106fc03573 100644 --- a/src/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterAndMixCommand.cs +++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterAndMixCommand.cs @@ -94,10 +94,9 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command BiquadFilterState.Span[0] = PreviousBiquadFilterState.Span[0]; } - float volume = Volume0; - if (HasVolumeRamp) { + float volume = Volume0; float ramp = (Volume1 - Volume0) / (int)context.SampleCount; State.Span[0].LastSamples[LastSampleIndex] = BiquadFilterHelper.ProcessBiquadFilterAndMixRamp( @@ -117,7 +116,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command outputBuffer, inputBuffer, context.SampleCount, - volume); + Volume1); } } } diff --git a/src/Ryujinx.Audio/Renderer/Dsp/Command/MultiTapBiquadFilterAndMixCommand.cs b/src/Ryujinx.Audio/Renderer/Dsp/Command/MultiTapBiquadFilterAndMixCommand.cs index 6c5e985ae1..e359371b4b 100644 --- a/src/Ryujinx.Audio/Renderer/Dsp/Command/MultiTapBiquadFilterAndMixCommand.cs +++ b/src/Ryujinx.Audio/Renderer/Dsp/Command/MultiTapBiquadFilterAndMixCommand.cs @@ -112,10 +112,9 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command UpdateState(BiquadFilterState0, PreviousBiquadFilterState0, NeedInitialization0); UpdateState(BiquadFilterState1, PreviousBiquadFilterState1, NeedInitialization1); - float volume = Volume0; - if (HasVolumeRamp) { + float volume = Volume0; float ramp = (Volume1 - Volume0) / (int)context.SampleCount; State.Span[0].LastSamples[LastSampleIndex] = BiquadFilterHelper.ProcessDoubleBiquadFilterAndMixRamp( @@ -139,7 +138,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command outputBuffer, inputBuffer, context.SampleCount, - volume); + Volume1); } } }