diff options
Diffstat (limited to 'src/Ryujinx.Tests/Audio/Renderer')
7 files changed, 35 insertions, 53 deletions
diff --git a/src/Ryujinx.Tests/Audio/Renderer/Dsp/ResamplerTests.cs b/src/Ryujinx.Tests/Audio/Renderer/Dsp/ResamplerTests.cs index 364837ee..0624f340 100644 --- a/src/Ryujinx.Tests/Audio/Renderer/Dsp/ResamplerTests.cs +++ b/src/Ryujinx.Tests/Audio/Renderer/Dsp/ResamplerTests.cs @@ -1,14 +1,7 @@ using NUnit.Framework; using Ryujinx.Audio.Renderer.Dsp; using Ryujinx.Audio.Renderer.Parameter; -using Ryujinx.Audio.Renderer.Server.Upsampler; using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.CompilerServices; -using System.Text; -using System.Threading.Tasks; namespace Ryujinx.Tests.Audio.Renderer.Dsp { @@ -41,8 +34,8 @@ namespace Ryujinx.Tests.Audio.Renderer.Dsp /// <param name="quality">The resampler quality to use</param> private static void DoResamplingTest(int inputRate, int outputRate, VoiceInParameter.SampleRateConversionQuality quality) { - float inputSampleRate = (float)inputRate; - float outputSampleRate = (float)outputRate; + float inputSampleRate = inputRate; + float outputSampleRate = outputRate; int inputSampleCount = inputRate; int outputSampleCount = outputRate; short[] inputBuffer = new short[inputSampleCount + 100]; // add some safety buffer at the end @@ -50,7 +43,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Dsp for (int sample = 0; sample < inputBuffer.Length; sample++) { // 440 hz sine wave with amplitude = 0.5f at input sample rate - inputBuffer[sample] = (short)(32767 * MathF.Sin((440 / inputSampleRate) * (float)sample * MathF.PI * 2f) * 0.5f); + inputBuffer[sample] = (short)(32767 * MathF.Sin((440 / inputSampleRate) * sample * MathF.PI * 2f) * 0.5f); } float fraction = 0; @@ -70,14 +63,14 @@ namespace Ryujinx.Tests.Audio.Renderer.Dsp { VoiceInParameter.SampleRateConversionQuality.High => 3, VoiceInParameter.SampleRateConversionQuality.Default => 1, - _ => 0 + _ => 0, }; for (int sample = 0; sample < outputSampleCount; sample++) { outputBuffer[sample] /= 32767; // 440 hz sine wave with amplitude = 0.5f at output sample rate - expectedOutput[sample] = MathF.Sin((440 / outputSampleRate) * (float)(sample + delay) * MathF.PI * 2f) * 0.5f; + expectedOutput[sample] = MathF.Sin((440 / outputSampleRate) * (sample + delay) * MathF.PI * 2f) * 0.5f; float thisDelta = Math.Abs(expectedOutput[sample] - outputBuffer[sample]); // Ensure no discontinuities @@ -85,7 +78,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Dsp sumDifference += thisDelta; } - sumDifference = sumDifference / (float)outputSampleCount; + sumDifference /= outputSampleCount; // Expect the output to be 99% similar to the expected resampled sine wave Assert.IsTrue(sumDifference < 0.01f); } diff --git a/src/Ryujinx.Tests/Audio/Renderer/Dsp/UpsamplerTests.cs b/src/Ryujinx.Tests/Audio/Renderer/Dsp/UpsamplerTests.cs index 2018752b..9b01b3ca 100644 --- a/src/Ryujinx.Tests/Audio/Renderer/Dsp/UpsamplerTests.cs +++ b/src/Ryujinx.Tests/Audio/Renderer/Dsp/UpsamplerTests.cs @@ -1,14 +1,7 @@ using NUnit.Framework; using Ryujinx.Audio.Renderer.Dsp; -using Ryujinx.Audio.Renderer.Parameter; using Ryujinx.Audio.Renderer.Server.Upsampler; using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.CompilerServices; -using System.Text; -using System.Threading.Tasks; namespace Ryujinx.Tests.Audio.Renderer.Dsp { @@ -17,7 +10,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Dsp [Test] public void TestUpsamplerConsistency() { - UpsamplerBufferState bufferState = new UpsamplerBufferState(); + UpsamplerBufferState bufferState = new(); int inputBlockSize = 160; int numInputSamples = 32000; int numOutputSamples = 48000; @@ -28,14 +21,14 @@ namespace Ryujinx.Tests.Audio.Renderer.Dsp for (int sample = 0; sample < inputBuffer.Length; sample++) { // 440 hz sine wave with amplitude = 0.5f at input sample rate - inputBuffer[sample] = MathF.Sin((440 / inputSampleRate) * (float)sample * MathF.PI * 2f) * 0.5f; + inputBuffer[sample] = MathF.Sin((440 / inputSampleRate) * sample * MathF.PI * 2f) * 0.5f; } int inputIdx = 0; int outputIdx = 0; while (inputIdx + inputBlockSize < numInputSamples) { - int outputBufLength = (int)Math.Round((float)(inputIdx + inputBlockSize) * outputSampleRate / inputSampleRate) - outputIdx; + int outputBufLength = (int)Math.Round((inputIdx + inputBlockSize) * outputSampleRate / inputSampleRate) - outputIdx; UpsamplerHelper.Upsample( outputBuffer.AsSpan(outputIdx), inputBuffer.AsSpan(inputIdx), @@ -52,11 +45,11 @@ namespace Ryujinx.Tests.Audio.Renderer.Dsp for (int sample = 0; sample < numOutputSamples; sample++) { // 440 hz sine wave with amplitude = 0.5f at output sample rate with an offset of 15 - expectedOutput[sample] = MathF.Sin((440 / outputSampleRate) * (float)(sample - 15) * MathF.PI * 2f) * 0.5f; + expectedOutput[sample] = MathF.Sin((440 / outputSampleRate) * (sample - 15) * MathF.PI * 2f) * 0.5f; sumDifference += Math.Abs(expectedOutput[sample] - outputBuffer[sample]); } - sumDifference = sumDifference / (float)expectedOutput.Length; + sumDifference /= expectedOutput.Length; // Expect the output to be 98% similar to the expected resampled sine wave Assert.IsTrue(sumDifference < 0.02f); } diff --git a/src/Ryujinx.Tests/Audio/Renderer/Parameter/Effect/CompressorParameterTests.cs b/src/Ryujinx.Tests/Audio/Renderer/Parameter/Effect/CompressorParameterTests.cs index 24b834fc..016338dc 100644 --- a/src/Ryujinx.Tests/Audio/Renderer/Parameter/Effect/CompressorParameterTests.cs +++ b/src/Ryujinx.Tests/Audio/Renderer/Parameter/Effect/CompressorParameterTests.cs @@ -13,4 +13,3 @@ namespace Ryujinx.Tests.Audio.Renderer.Parameter.Effect } } } - diff --git a/src/Ryujinx.Tests/Audio/Renderer/Parameter/Effect/LimiterParameterTests.cs b/src/Ryujinx.Tests/Audio/Renderer/Parameter/Effect/LimiterParameterTests.cs index 8512ebd4..e176cc62 100644 --- a/src/Ryujinx.Tests/Audio/Renderer/Parameter/Effect/LimiterParameterTests.cs +++ b/src/Ryujinx.Tests/Audio/Renderer/Parameter/Effect/LimiterParameterTests.cs @@ -13,4 +13,3 @@ namespace Ryujinx.Tests.Audio.Renderer.Parameter.Effect } } } - diff --git a/src/Ryujinx.Tests/Audio/Renderer/Parameter/Effect/LimiterStatisticsTests.cs b/src/Ryujinx.Tests/Audio/Renderer/Parameter/Effect/LimiterStatisticsTests.cs index 43645ae4..13ad34eb 100644 --- a/src/Ryujinx.Tests/Audio/Renderer/Parameter/Effect/LimiterStatisticsTests.cs +++ b/src/Ryujinx.Tests/Audio/Renderer/Parameter/Effect/LimiterStatisticsTests.cs @@ -13,4 +13,3 @@ namespace Ryujinx.Tests.Audio.Renderer.Parameter.Effect } } } - diff --git a/src/Ryujinx.Tests/Audio/Renderer/Server/BehaviourContextTests.cs b/src/Ryujinx.Tests/Audio/Renderer/Server/BehaviourContextTests.cs index df946a12..55758188 100644 --- a/src/Ryujinx.Tests/Audio/Renderer/Server/BehaviourContextTests.cs +++ b/src/Ryujinx.Tests/Audio/Renderer/Server/BehaviourContextTests.cs @@ -8,7 +8,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestCheckFeature() { - int latestRevision = BehaviourContext.BaseRevisionMagic + BehaviourContext.LastRevision; + int latestRevision = BehaviourContext.BaseRevisionMagic + BehaviourContext.LastRevision; int previousRevision = BehaviourContext.BaseRevisionMagic + (BehaviourContext.LastRevision - 1); int invalidRevision = BehaviourContext.BaseRevisionMagic + (BehaviourContext.LastRevision + 1); @@ -22,7 +22,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestsMemoryPoolForceMappingEnabled() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision1); @@ -36,7 +36,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision1() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision1); @@ -62,7 +62,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision2() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision2); @@ -88,7 +88,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision3() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision3); @@ -114,7 +114,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision4() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision4); @@ -140,7 +140,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision5() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision5); @@ -166,7 +166,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision6() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision6); @@ -192,7 +192,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision7() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision7); @@ -218,7 +218,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision8() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision8); @@ -244,7 +244,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision9() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision9); @@ -270,7 +270,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision10() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision10); @@ -293,4 +293,4 @@ namespace Ryujinx.Tests.Audio.Renderer.Server Assert.AreEqual(2, behaviourContext.GetPerformanceMetricsDataFormat()); } } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Tests/Audio/Renderer/Server/PoolMapperTests.cs b/src/Ryujinx.Tests/Audio/Renderer/Server/PoolMapperTests.cs index d2c2e6cb..4c931d9e 100644 --- a/src/Ryujinx.Tests/Audio/Renderer/Server/PoolMapperTests.cs +++ b/src/Ryujinx.Tests/Audio/Renderer/Server/PoolMapperTests.cs @@ -15,13 +15,13 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestInitializeSystemPool() { - PoolMapper poolMapper = new PoolMapper(DummyProcessHandle, true); + PoolMapper poolMapper = new(DummyProcessHandle, true); MemoryPoolState memoryPoolDsp = MemoryPoolState.Create(MemoryPoolState.LocationType.Dsp); MemoryPoolState memoryPoolCpu = MemoryPoolState.Create(MemoryPoolState.LocationType.Cpu); const CpuAddress CpuAddress = 0x20000; const DspAddress DspAddress = CpuAddress; // TODO: DSP LLE - const ulong CpuSize = 0x1000; + const ulong CpuSize = 0x1000; Assert.IsFalse(poolMapper.InitializeSystemPool(ref memoryPoolCpu, CpuAddress, CpuSize)); Assert.IsTrue(poolMapper.InitializeSystemPool(ref memoryPoolDsp, CpuAddress, CpuSize)); @@ -34,7 +34,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestGetProcessHandle() { - PoolMapper poolMapper = new PoolMapper(DummyProcessHandle, true); + PoolMapper poolMapper = new(DummyProcessHandle, true); MemoryPoolState memoryPoolDsp = MemoryPoolState.Create(MemoryPoolState.LocationType.Dsp); MemoryPoolState memoryPoolCpu = MemoryPoolState.Create(MemoryPoolState.LocationType.Cpu); @@ -45,13 +45,13 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestMappings() { - PoolMapper poolMapper = new PoolMapper(DummyProcessHandle, true); + PoolMapper poolMapper = new(DummyProcessHandle, true); MemoryPoolState memoryPoolDsp = MemoryPoolState.Create(MemoryPoolState.LocationType.Dsp); MemoryPoolState memoryPoolCpu = MemoryPoolState.Create(MemoryPoolState.LocationType.Cpu); const CpuAddress CpuAddress = 0x20000; const DspAddress DspAddress = CpuAddress; // TODO: DSP LLE - const ulong CpuSize = 0x1000; + const ulong CpuSize = 0x1000; memoryPoolDsp.SetCpuAddress(CpuAddress, CpuSize); memoryPoolCpu.SetCpuAddress(CpuAddress, CpuSize); @@ -72,10 +72,10 @@ namespace Ryujinx.Tests.Audio.Renderer.Server { const CpuAddress CpuAddress = 0x20000; const DspAddress DspAddress = CpuAddress; // TODO: DSP LLE - const ulong CpuSize = 0x1000; + const ulong CpuSize = 0x1000; - const int MemoryPoolStateArraySize = 0x10; - const CpuAddress CpuAddressRegionEnding = CpuAddress * MemoryPoolStateArraySize; + const int MemoryPoolStateArraySize = 0x10; + const CpuAddress CpuAddressRegionEnding = CpuAddress * MemoryPoolStateArraySize; MemoryPoolState[] memoryPoolStateArray = new MemoryPoolState[MemoryPoolStateArraySize]; @@ -85,13 +85,12 @@ namespace Ryujinx.Tests.Audio.Renderer.Server memoryPoolStateArray[i].SetCpuAddress(CpuAddress + (ulong)i * CpuSize, CpuSize); } - ErrorInfo errorInfo; AddressInfo addressInfo = AddressInfo.Create(); - PoolMapper poolMapper = new PoolMapper(DummyProcessHandle, true); + PoolMapper poolMapper = new(DummyProcessHandle, true); - Assert.IsTrue(poolMapper.TryAttachBuffer(out errorInfo, ref addressInfo, 0, 0)); + Assert.IsTrue(poolMapper.TryAttachBuffer(out ErrorInfo errorInfo, ref addressInfo, 0, 0)); Assert.AreEqual(ResultCode.InvalidAddressInfo, errorInfo.ErrorCode); Assert.AreEqual(0, errorInfo.ExtraErrorInfo); @@ -105,7 +104,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server poolMapper = new PoolMapper(DummyProcessHandle, false); - Assert.IsFalse(poolMapper.TryAttachBuffer(out errorInfo, ref addressInfo, 0, 0)); + Assert.IsFalse(poolMapper.TryAttachBuffer(out _, ref addressInfo, 0, 0)); addressInfo.ForceMappedDspAddress = 0; |