diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/EdgeMatrix.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/EdgeMatrix.cs index 1916f2eeb5..3f87ae04f1 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/EdgeMatrix.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/EdgeMatrix.cs @@ -1,4 +1,4 @@ -using Ryujinx.HLE.Utilities; +using Ryujinx.Common; namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager { @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager { public static int GetWorkBufferSize(int totalMixCount) { - int size = IntUtils.AlignUp(totalMixCount * totalMixCount, AudioRendererConsts.BufferAlignment); + int size = BitUtils.AlignUp(totalMixCount * totalMixCount, AudioRendererConsts.BufferAlignment); if (size < 0) { diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/NodeStates.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/NodeStates.cs index 68cd89150c..7ae9aeea50 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/NodeStates.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/NodeStates.cs @@ -1,4 +1,4 @@ -using Ryujinx.HLE.Utilities; +using Ryujinx.Common; namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager { @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager { public static long GetWorkBufferSize(int totalMixCount) { - int size = IntUtils.AlignUp(totalMixCount, AudioRendererConsts.BufferAlignment); + int size = BitUtils.AlignUp(totalMixCount, AudioRendererConsts.BufferAlignment); if (size < 0) { diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/SplitterContext.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/SplitterContext.cs index 7d5e660bc3..e46af4432d 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/SplitterContext.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/SplitterContext.cs @@ -1,4 +1,4 @@ -using Ryujinx.HLE.Utilities; +using Ryujinx.Common; namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager { @@ -16,7 +16,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager if (!behaviorInfo.IsSplitterBugFixed()) { - size += IntUtils.AlignUp(4 * parameters.SplitterDestinationDataCount, 16); + size += BitUtils.AlignUp(4 * parameters.SplitterDestinationDataCount, 16); } return size; diff --git a/Ryujinx.HLE/HOS/Services/Audio/IAudioRendererManager.cs b/Ryujinx.HLE/HOS/Services/Audio/IAudioRendererManager.cs index d1a62e91ca..563ba7e151 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/IAudioRendererManager.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/IAudioRendererManager.cs @@ -1,7 +1,7 @@ using Ryujinx.Audio; +using Ryujinx.Common; using Ryujinx.Common.Logging; using Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager; -using Ryujinx.HLE.Utilities; namespace Ryujinx.HLE.HOS.Services.Audio { @@ -44,13 +44,13 @@ namespace Ryujinx.HLE.HOS.Services.Audio int totalMixCount = parameters.SubMixCount + 1; - size = IntUtils.AlignUp(parameters.MixBufferCount * 4, AudioRendererConsts.BufferAlignment) + + size = BitUtils.AlignUp(parameters.MixBufferCount * 4, AudioRendererConsts.BufferAlignment) + parameters.SubMixCount * 0x400 + totalMixCount * 0x940 + parameters.VoiceCount * 0x3F0 + - IntUtils.AlignUp(totalMixCount * 8, 16) + - IntUtils.AlignUp(parameters.VoiceCount * 8, 16) + - IntUtils.AlignUp(((parameters.SinkCount + parameters.SubMixCount) * 0x3C0 + parameters.SampleCount * 4) * + BitUtils.AlignUp(totalMixCount * 8, 16) + + BitUtils.AlignUp(parameters.VoiceCount * 8, 16) + + BitUtils.AlignUp(((parameters.SinkCount + parameters.SubMixCount) * 0x3C0 + parameters.SampleCount * 4) * (parameters.MixBufferCount + 6), AudioRendererConsts.BufferAlignment) + (parameters.SinkCount + parameters.SubMixCount) * 0x2C0 + (parameters.EffectCount + parameters.VoiceCount * 4) * 0x30 + @@ -58,7 +58,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio if (behaviorInfo.IsSplitterSupported()) { - size += IntUtils.AlignUp(NodeStates.GetWorkBufferSize(totalMixCount) + EdgeMatrix.GetWorkBufferSize(totalMixCount), 16); + size += BitUtils.AlignUp(NodeStates.GetWorkBufferSize(totalMixCount) + EdgeMatrix.GetWorkBufferSize(totalMixCount), 16); } size = parameters.SinkCount * 0x170 + @@ -82,7 +82,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio size += 0x1807E; } - size = IntUtils.AlignUp(size, 0x1000); + size = BitUtils.AlignUp(size, 0x1000); context.ResponseData.Write(size);