aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Audio.Renderer/Dsp/Command/AuxiliaryBufferCommand.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/AuxiliaryBufferCommand.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/AuxiliaryBufferCommand.cs')
-rw-r--r--Ryujinx.Audio.Renderer/Dsp/Command/AuxiliaryBufferCommand.cs205
1 files changed, 0 insertions, 205 deletions
diff --git a/Ryujinx.Audio.Renderer/Dsp/Command/AuxiliaryBufferCommand.cs b/Ryujinx.Audio.Renderer/Dsp/Command/AuxiliaryBufferCommand.cs
deleted file mode 100644
index 5ff3a6b4..00000000
--- a/Ryujinx.Audio.Renderer/Dsp/Command/AuxiliaryBufferCommand.cs
+++ /dev/null
@@ -1,205 +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.Common;
-using Ryujinx.Memory;
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using static Ryujinx.Audio.Renderer.Dsp.State.AuxiliaryBufferHeader;
-using CpuAddress = System.UInt64;
-
-namespace Ryujinx.Audio.Renderer.Dsp.Command
-{
- public class AuxiliaryBufferCommand : ICommand
- {
- public bool Enabled { get; set; }
-
- public int NodeId { get; }
-
- public CommandType CommandType => CommandType.AuxiliaryBuffer;
-
- public ulong EstimatedProcessingTime { get; set; }
-
- public uint InputBufferIndex { get; }
- public uint OutputBufferIndex { get; }
-
- public AuxiliaryBufferAddresses BufferInfo { get; }
-
- public CpuAddress InputBuffer { get; }
- public CpuAddress OutputBuffer { get; }
- public uint CountMax { get; }
- public uint UpdateCount { get; }
- public uint WriteOffset { get; }
-
- public bool IsEffectEnabled { get; }
-
- public AuxiliaryBufferCommand(uint bufferOffset, byte inputBufferOffset, byte outputBufferOffset,
- ref AuxiliaryBufferAddresses sendBufferInfo, bool isEnabled, uint countMax,
- CpuAddress outputBuffer, CpuAddress inputBuffer, uint updateCount, uint writeOffset, int nodeId)
- {
- Enabled = true;
- NodeId = nodeId;
- InputBufferIndex = bufferOffset + inputBufferOffset;
- OutputBufferIndex = bufferOffset + outputBufferOffset;
- BufferInfo = sendBufferInfo;
- InputBuffer = inputBuffer;
- OutputBuffer = outputBuffer;
- CountMax = countMax;
- UpdateCount = updateCount;
- WriteOffset = writeOffset;
- IsEffectEnabled = isEnabled;
- }
-
- private uint Read(IVirtualMemoryManager memoryManager, ulong bufferAddress, uint countMax, Span<int> outBuffer, uint count, uint readOffset, uint updateCount)
- {
- if (countMax == 0 || bufferAddress == 0)
- {
- return 0;
- }
-
- uint targetReadOffset = readOffset + AuxiliaryBufferInfo.GetReadOffset(memoryManager, BufferInfo.ReturnBufferInfo);
-
- if (targetReadOffset > countMax)
- {
- return 0;
- }
-
- uint remaining = count;
-
- uint outBufferOffset = 0;
-
- while (remaining != 0)
- {
- uint countToWrite = Math.Min(countMax - targetReadOffset, remaining);
-
- memoryManager.Read(bufferAddress + targetReadOffset * sizeof(int), MemoryMarshal.Cast<int, byte>(outBuffer.Slice((int)outBufferOffset, (int)countToWrite)));
-
- targetReadOffset = (targetReadOffset + countToWrite) % countMax;
- remaining -= countToWrite;
- outBufferOffset += countToWrite;
- }
-
- if (updateCount != 0)
- {
- uint newReadOffset = (AuxiliaryBufferInfo.GetReadOffset(memoryManager, BufferInfo.ReturnBufferInfo) + updateCount) % countMax;
-
- AuxiliaryBufferInfo.SetReadOffset(memoryManager, BufferInfo.ReturnBufferInfo, newReadOffset);
- }
-
- return count;
- }
-
- private uint Write(IVirtualMemoryManager memoryManager, ulong outBufferAddress, uint countMax, ReadOnlySpan<int> buffer, uint count, uint writeOffset, uint updateCount)
- {
- if (countMax == 0 || outBufferAddress == 0)
- {
- return 0;
- }
-
- uint targetWriteOffset = writeOffset + AuxiliaryBufferInfo.GetWriteOffset(memoryManager, BufferInfo.SendBufferInfo);
-
- if (targetWriteOffset > countMax)
- {
- return 0;
- }
-
- uint remaining = count;
-
- uint inBufferOffset = 0;
-
- while (remaining != 0)
- {
- uint countToWrite = Math.Min(countMax - targetWriteOffset, remaining);
-
- memoryManager.Write(outBufferAddress + targetWriteOffset * sizeof(int), MemoryMarshal.Cast<int, byte>(buffer.Slice((int)inBufferOffset, (int)countToWrite)));
-
- targetWriteOffset = (targetWriteOffset + countToWrite) % countMax;
- remaining -= countToWrite;
- inBufferOffset += countToWrite;
- }
-
- if (updateCount != 0)
- {
- uint newWriteOffset = (AuxiliaryBufferInfo.GetWriteOffset(memoryManager, BufferInfo.SendBufferInfo) + updateCount) % countMax;
-
- AuxiliaryBufferInfo.SetWriteOffset(memoryManager, BufferInfo.SendBufferInfo, newWriteOffset);
- }
-
- return count;
- }
-
- public void Process(CommandList context)
- {
- Span<float> inputBuffer = context.GetBuffer((int)InputBufferIndex);
- Span<float> outputBuffer = context.GetBuffer((int)OutputBufferIndex);
-
- if (IsEffectEnabled)
- {
- Span<int> inputBufferInt = MemoryMarshal.Cast<float, int>(inputBuffer);
- Span<int> outputBufferInt = MemoryMarshal.Cast<float, int>(outputBuffer);
-
- // Convert input data to the target format for user (int)
- DataSourceHelper.ToInt(inputBufferInt, inputBuffer, outputBuffer.Length);
-
- // Send the input to the user
- Write(context.MemoryManager, OutputBuffer, CountMax, inputBufferInt, context.SampleCount, WriteOffset, UpdateCount);
-
- // Convert back to float just in case it's reused
- DataSourceHelper.ToFloat(inputBuffer, inputBufferInt, inputBuffer.Length);
-
- // Retrieve the input from user
- uint readResult = Read(context.MemoryManager, InputBuffer, CountMax, outputBufferInt, context.SampleCount, WriteOffset, UpdateCount);
-
- // Convert the outputBuffer back to the target format of the renderer (float)
- DataSourceHelper.ToFloat(outputBuffer, outputBufferInt, outputBuffer.Length);
-
- if (readResult != context.SampleCount)
- {
- outputBuffer.Slice((int)readResult, (int)context.SampleCount - (int)readResult).Fill(0);
- }
- }
- else
- {
- ZeroFill(context.MemoryManager, BufferInfo.SendBufferInfo, Unsafe.SizeOf<AuxiliaryBufferInfo>());
- ZeroFill(context.MemoryManager, BufferInfo.ReturnBufferInfo, Unsafe.SizeOf<AuxiliaryBufferInfo>());
-
- if (InputBufferIndex != OutputBufferIndex)
- {
- inputBuffer.CopyTo(outputBuffer);
- }
- }
- }
-
- private static void ZeroFill(IVirtualMemoryManager memoryManager, ulong address, int size)
- {
- ulong endAddress = address + (ulong)size;
-
- while (address + 7UL < endAddress)
- {
- memoryManager.Write(address, 0UL);
- address += 8;
- }
-
- while (address < endAddress)
- {
- memoryManager.Write(address, (byte)0);
- address++;
- }
- }
- }
-}