aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Audio.Renderer/Dsp/Command/CommandList.cs
diff options
context:
space:
mode:
authorMary <me@thog.eu>2021-02-26 01:11:56 +0100
committerGitHub <noreply@github.com>2021-02-26 01:11:56 +0100
commitf556c80d0230056335632b60c71f1567e177239e (patch)
tree748aa6be62b93a8e941e25dbd83f39e1dbb37035 /Ryujinx.Audio.Renderer/Dsp/Command/CommandList.cs
parent1c49089ff00fc87dc4872f135dc6a0d36169a970 (diff)
Haydn: Part 1 (#2007)
* Haydn: Part 1 Based on my reverse of audio 11.0.0. As always, core implementation under LGPLv3 for the same reasons as for Amadeus. This place the bases of a more flexible audio system while making audout & audin accurate. This have the following improvements: - Complete reimplementation of audout and audin. - Audin currently only have a dummy backend. - Dramatically reduce CPU usage by up to 50% in common cases (SoundIO and OpenAL). - Audio Renderer now can output to 5.1 devices when supported. - Audio Renderer init its backend on demand instead of keeping two up all the time. - All backends implementation are now in their own project. - Ryujinx.Audio.Renderer was renamed Ryujinx.Audio and was refactored because of this. As a note, games having issues with OpenAL haven't improved and will not because of OpenAL design (stopping when buffers finish playing causing possible audio "pops" when buffers are very small). * Update for latest hexkyz's edits on Switchbrew * audren: Rollback channel configuration changes * Address gdkchan's comments * Fix typo in OpenAL backend driver * Address last comments * Fix a nit * Address gdkchan's comments
Diffstat (limited to 'Ryujinx.Audio.Renderer/Dsp/Command/CommandList.cs')
-rw-r--r--Ryujinx.Audio.Renderer/Dsp/Command/CommandList.cs124
1 files changed, 0 insertions, 124 deletions
diff --git a/Ryujinx.Audio.Renderer/Dsp/Command/CommandList.cs b/Ryujinx.Audio.Renderer/Dsp/Command/CommandList.cs
deleted file mode 100644
index bcc2cd11..00000000
--- a/Ryujinx.Audio.Renderer/Dsp/Command/CommandList.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-// Copyright (c) 2019-2021 Ryujinx
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-//
-
-using Ryujinx.Audio.Renderer.Integration;
-using Ryujinx.Audio.Renderer.Server;
-using Ryujinx.Common;
-using Ryujinx.Common.Logging;
-using Ryujinx.Memory;
-using System;
-using System.Collections.Generic;
-
-namespace Ryujinx.Audio.Renderer.Dsp.Command
-{
- public class CommandList
- {
- public ulong StartTime { get; private set; }
- public ulong EndTime { get; private set; }
- public uint SampleCount { get; }
- public uint SampleRate { get; }
-
- public Memory<float> Buffers { get; }
- public uint BufferCount { get; }
-
- public List<ICommand> Commands { get; }
-
- public IVirtualMemoryManager MemoryManager { get; }
-
- public HardwareDevice OutputDevice { get; private set; }
-
- public CommandList(AudioRenderSystem renderSystem) : this(renderSystem.MemoryManager,
- renderSystem.GetMixBuffer(),
- renderSystem.GetSampleCount(),
- renderSystem.GetSampleRate(),
- renderSystem.GetMixBufferCount(),
- renderSystem.GetVoiceChannelCountMax())
- {
- }
-
- public CommandList(IVirtualMemoryManager memoryManager, Memory<float> mixBuffer, uint sampleCount, uint sampleRate, uint mixBufferCount, uint voiceChannelCountMax)
- {
- SampleCount = sampleCount;
- SampleRate = sampleRate;
- BufferCount = mixBufferCount + voiceChannelCountMax;
- Buffers = mixBuffer;
- Commands = new List<ICommand>();
- MemoryManager = memoryManager;
- }
-
- public void AddCommand(ICommand command)
- {
- Commands.Add(command);
- }
-
- public void AddCommand<T>(T command) where T : unmanaged, ICommand
- {
- throw new NotImplementedException();
- }
-
- public Memory<float> GetBufferMemory(int index)
- {
- return Buffers.Slice(index * (int)SampleCount, (int)SampleCount);
- }
-
- public Span<float> GetBuffer(int index)
- {
- return Buffers.Span.Slice(index * (int)SampleCount, (int)SampleCount);
- }
-
- public ulong GetTimeElapsedSinceDspStartedProcessing()
- {
- return (ulong)PerformanceCounter.ElapsedNanoseconds - StartTime;
- }
-
- public void Process(HardwareDevice outputDevice)
- {
- OutputDevice = outputDevice;
-
- StartTime = (ulong)PerformanceCounter.ElapsedNanoseconds;
-
- foreach (ICommand command in Commands)
- {
- if (command.Enabled)
- {
- bool shouldMeter = command.ShouldMeter();
-
- long startTime = 0;
-
- if (shouldMeter)
- {
- startTime = PerformanceCounter.ElapsedNanoseconds;
- }
-
- command.Process(this);
-
- if (shouldMeter)
- {
- ulong effectiveElapsedTime = (ulong)(PerformanceCounter.ElapsedNanoseconds - startTime);
-
- if (effectiveElapsedTime > command.EstimatedProcessingTime)
- {
- Logger.Warning?.Print(LogClass.AudioRenderer, $"Command {command.GetType().Name} took {effectiveElapsedTime}ns (expected {command.EstimatedProcessingTime}ns)");
- }
- }
- }
- }
-
- EndTime = (ulong)PerformanceCounter.ElapsedNanoseconds;
- }
- }
-}