From f556c80d0230056335632b60c71f1567e177239e Mon Sep 17 00:00:00 2001 From: Mary Date: Fri, 26 Feb 2021 01:11:56 +0100 Subject: 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 --- .../Utils/AudioProcessorMemoryManager.cs | 75 -------- Ryujinx.Audio.Renderer/Utils/BitArray.cs | 120 ------------- Ryujinx.Audio.Renderer/Utils/FileHardwareDevice.cs | 105 ------------ Ryujinx.Audio.Renderer/Utils/Mailbox.cs | 72 -------- Ryujinx.Audio.Renderer/Utils/SpanIOHelper.cs | 188 --------------------- Ryujinx.Audio.Renderer/Utils/SpanMemoryManager.cs | 60 ------- .../Utils/SplitterHardwareDevice.cs | 64 ------- 7 files changed, 684 deletions(-) delete mode 100644 Ryujinx.Audio.Renderer/Utils/AudioProcessorMemoryManager.cs delete mode 100644 Ryujinx.Audio.Renderer/Utils/BitArray.cs delete mode 100644 Ryujinx.Audio.Renderer/Utils/FileHardwareDevice.cs delete mode 100644 Ryujinx.Audio.Renderer/Utils/Mailbox.cs delete mode 100644 Ryujinx.Audio.Renderer/Utils/SpanIOHelper.cs delete mode 100644 Ryujinx.Audio.Renderer/Utils/SpanMemoryManager.cs delete mode 100644 Ryujinx.Audio.Renderer/Utils/SplitterHardwareDevice.cs (limited to 'Ryujinx.Audio.Renderer/Utils') diff --git a/Ryujinx.Audio.Renderer/Utils/AudioProcessorMemoryManager.cs b/Ryujinx.Audio.Renderer/Utils/AudioProcessorMemoryManager.cs deleted file mode 100644 index 99cbfcdc..00000000 --- a/Ryujinx.Audio.Renderer/Utils/AudioProcessorMemoryManager.cs +++ /dev/null @@ -1,75 +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 . -// - -using System.Runtime.CompilerServices; - -using DspAddress = System.UInt64; -using CpuAddress = System.UInt64; - -namespace Ryujinx.Audio.Renderer.Utils -{ - /// - /// The memory management - /// - /// This is stub for the most part but is kept to permit LLE if wanted. - static class AudioProcessorMemoryManager - { - /// - /// Map the given to the address space. - /// - /// The process owning the CPU memory. - /// The to map. - /// The size of the CPU memory region to map. - /// The address on the address space. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static DspAddress Map(uint processHandle, CpuAddress cpuAddress, ulong size) - { - return cpuAddress; - } - - /// - /// Unmap the given from the address space. - /// - /// The process owning the CPU memory. - /// The to unmap. - /// The size of the CPU memory region to unmap. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void Unmap(uint processHandle, CpuAddress cpuAddress, ulong size) - { - } - - /// - /// Invalidate the data cache at the given address. - /// - /// The base DSP address to invalidate - /// The size of the DSP memory region to invalidate. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void InvalidateDspCache(DspAddress address, ulong size) - { - } - - /// - /// Invalidate the CPU data cache at the given address. - /// - /// The base to invalidate - /// The size of the CPU memory region to invalidate. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void InvalidateDataCache(CpuAddress address, ulong size) - { - } - } -} diff --git a/Ryujinx.Audio.Renderer/Utils/BitArray.cs b/Ryujinx.Audio.Renderer/Utils/BitArray.cs deleted file mode 100644 index 6109dd01..00000000 --- a/Ryujinx.Audio.Renderer/Utils/BitArray.cs +++ /dev/null @@ -1,120 +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 . -// - -using System; -using System.Runtime.CompilerServices; - -namespace Ryujinx.Audio.Renderer.Utils -{ - /// - /// A simple bit array implementation backed by a . - /// - public class BitArray - { - /// - /// The backing storage of the . - /// - private Memory _storage; - - /// - /// Create a new from . - /// - /// The backing storage of the . - public BitArray(Memory storage) - { - _storage = storage; - } - - /// - /// Get the byte position of a given bit index. - /// - /// A bit index. - /// The byte position of a given bit index. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static int ToPosition(int index) => index / 8; - - /// - /// Get the bit position of a given bit index inside a byte. - /// - /// A bit index. - /// The bit position of a given bit index inside a byte. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static int ToBitPosition(int index) => index % 8; - - /// - /// Test if the bit at the given index is set. - /// - /// A bit index. - /// Return true if the bit at the given index is set - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public bool Test(int index) - { - ulong mask = 1ul << ToBitPosition(index); - - return (_storage.Span[ToPosition(index)] & mask) == mask; - } - - /// - /// Set the bit at the given index. - /// - /// A bit index. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void Set(int index) - { - Set(index, true); - } - - /// - /// Reset the bit at the given index. - /// - /// A bit index. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void Reset(int index) - { - Set(index, false); - } - - /// - /// Set a bit value at the given index. - /// - /// A bit index. - /// The new bit value. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void Set(int index, bool value) - { - byte mask = (byte)(1 << ToBitPosition(index)); - - if (value) - { - _storage.Span[ToPosition(index)] |= mask; - } - else - { - _storage.Span[ToPosition(index)] &= (byte)~mask; - } - } - - /// - /// Reset all bits in the storage. - /// - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void Reset() - { - _storage.Span.Fill(0); - } - } -} diff --git a/Ryujinx.Audio.Renderer/Utils/FileHardwareDevice.cs b/Ryujinx.Audio.Renderer/Utils/FileHardwareDevice.cs deleted file mode 100644 index d5cbb8df..00000000 --- a/Ryujinx.Audio.Renderer/Utils/FileHardwareDevice.cs +++ /dev/null @@ -1,105 +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 . -// - -using Ryujinx.Audio.Renderer.Integration; -using System; -using System.IO; -using System.Runtime.InteropServices; -using System.Text; - -namespace Ryujinx.Audio.Renderer.Utils -{ - /// - /// A that outputs to a wav file. - /// - public class FileHardwareDevice : HardwareDevice - { - private FileStream _stream; - private uint _channelCount; - private uint _sampleRate; - - private const int HeaderSize = 44; - - public FileHardwareDevice(string path, uint channelCount, uint sampleRate) - { - _stream = File.OpenWrite(path); - _channelCount = channelCount; - _sampleRate = sampleRate; - - _stream.Seek(HeaderSize, SeekOrigin.Begin); - } - - private void UpdateHeader() - { - var writer = new BinaryWriter(_stream); - - long currentPos = writer.Seek(0, SeekOrigin.Current); - - writer.Seek(0, SeekOrigin.Begin); - - writer.Write(Encoding.ASCII.GetBytes("RIFF")); - writer.Write((int)(writer.BaseStream.Length - 8)); - writer.Write(Encoding.ASCII.GetBytes("WAVE")); - writer.Write(Encoding.ASCII.GetBytes("fmt ")); - writer.Write(16); - writer.Write((short)1); - writer.Write((short)GetChannelCount()); - writer.Write(GetSampleRate()); - writer.Write(GetSampleRate() * GetChannelCount() * sizeof(short)); - writer.Write((short)(GetChannelCount() * sizeof(short))); - writer.Write((short)(sizeof(short) * 8)); - writer.Write(Encoding.ASCII.GetBytes("data")); - writer.Write((int)(writer.BaseStream.Length - HeaderSize)); - - writer.Seek((int)currentPos, SeekOrigin.Begin); - } - - public void AppendBuffer(ReadOnlySpan data, uint channelCount) - { - _stream.Write(MemoryMarshal.Cast(data)); - - UpdateHeader(); - _stream.Flush(); - } - - public uint GetChannelCount() - { - return _channelCount; - } - - public uint GetSampleRate() - { - return _sampleRate; - } - - public void Dispose() - { - Dispose(true); - } - - protected virtual void Dispose(bool disposing) - { - if (disposing) - { - _stream?.Flush(); - _stream?.Dispose(); - - _stream = null; - } - } - } -} diff --git a/Ryujinx.Audio.Renderer/Utils/Mailbox.cs b/Ryujinx.Audio.Renderer/Utils/Mailbox.cs deleted file mode 100644 index a32de870..00000000 --- a/Ryujinx.Audio.Renderer/Utils/Mailbox.cs +++ /dev/null @@ -1,72 +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 . -// - -using System; -using System.Collections.Concurrent; - -namespace Ryujinx.Audio.Renderer.Utils -{ - /// - /// A simple generic message queue for unmanaged types. - /// - /// The target unmanaged type used - public class Mailbox : IDisposable where T : unmanaged - { - private BlockingCollection _messageQueue; - private BlockingCollection _responseQueue; - - public Mailbox() - { - _messageQueue = new BlockingCollection(1); - _responseQueue = new BlockingCollection(1); - } - - public void SendMessage(T data) - { - _messageQueue.Add(data); - } - - public void SendResponse(T data) - { - _responseQueue.Add(data); - } - - public T ReceiveMessage() - { - return _messageQueue.Take(); - } - - public T ReceiveResponse() - { - return _responseQueue.Take(); - } - - public void Dispose() - { - Dispose(true); - } - - protected virtual void Dispose(bool disposing) - { - if (disposing) - { - _messageQueue.Dispose(); - _responseQueue.Dispose(); - } - } - } -} diff --git a/Ryujinx.Audio.Renderer/Utils/SpanIOHelper.cs b/Ryujinx.Audio.Renderer/Utils/SpanIOHelper.cs deleted file mode 100644 index 70a2fce6..00000000 --- a/Ryujinx.Audio.Renderer/Utils/SpanIOHelper.cs +++ /dev/null @@ -1,188 +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 . -// - -using System; -using System.Diagnostics; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -namespace Ryujinx.Audio.Renderer.Utils -{ - /// - /// Helper for IO operations on and . - /// - public static class SpanIOHelper - { - /// - /// Write the given data to the given backing and move cursor after the written data. - /// - /// The data type. - /// The backing to store the data. - /// The data to write to the backing . - public static void Write(ref Memory backingMemory, ref T data) where T : unmanaged - { - int size = Unsafe.SizeOf(); - - if (size > backingMemory.Length) - { - throw new ArgumentOutOfRangeException(); - } - - MemoryMarshal.Write(backingMemory.Span.Slice(0, size), ref data); - - backingMemory = backingMemory.Slice(size); - } - - /// - /// Write the given data to the given backing and move cursor after the written data. - /// - /// The data type. - /// The backing to store the data. - /// The data to write to the backing . - public static void Write(ref Span backingMemory, ref T data) where T : unmanaged - { - int size = Unsafe.SizeOf(); - - if (size > backingMemory.Length) - { - throw new ArgumentOutOfRangeException(); - } - - MemoryMarshal.Write(backingMemory.Slice(0, size), ref data); - - backingMemory = backingMemory.Slice(size); - } - - /// - /// Get a out of a and move cursor after T size. - /// - /// The data type. - /// The backing to get a from. - /// A from backing . - public static Span GetWriteRef(ref Memory backingMemory) where T : unmanaged - { - int size = Unsafe.SizeOf(); - - if (size > backingMemory.Length) - { - throw new ArgumentOutOfRangeException(); - } - - Span result = MemoryMarshal.Cast(backingMemory.Span.Slice(0, size)); - - backingMemory = backingMemory.Slice(size); - - return result; - } - - /// - /// Get a out of a backingMemory and move cursor after T size. - /// - /// The data type. - /// The backing to get a from. - /// A from backing . - public static Span GetWriteRef(ref Span backingMemory) where T : unmanaged - { - int size = Unsafe.SizeOf(); - - if (size > backingMemory.Length) - { - throw new ArgumentOutOfRangeException(); - } - - Span result = MemoryMarshal.Cast(backingMemory.Slice(0, size)); - - backingMemory = backingMemory.Slice(size); - - return result; - } - - /// - /// Read data from the given backing and move cursor after the read data. - /// - /// The data type. - /// The backing to read data from. - /// Return the read data. - public static T Read(ref ReadOnlyMemory backingMemory) where T : unmanaged - { - int size = Unsafe.SizeOf(); - - if (size > backingMemory.Length) - { - throw new ArgumentOutOfRangeException(); - } - - T result = MemoryMarshal.Read(backingMemory.Span.Slice(0, size)); - - backingMemory = backingMemory.Slice(size); - - return result; - } - - /// - /// Read data from the given backing and move cursor after the read data. - /// - /// The data type. - /// The backing to read data from. - /// Return the read data. - public static T Read(ref ReadOnlySpan backingMemory) where T : unmanaged - { - int size = Unsafe.SizeOf(); - - if (size > backingMemory.Length) - { - throw new ArgumentOutOfRangeException(); - } - - T result = MemoryMarshal.Read(backingMemory.Slice(0, size)); - - backingMemory = backingMemory.Slice(size); - - return result; - } - - /// - /// Extract a at the given index. - /// - /// The data type. - /// The to extract the data from. - /// The id in the provided memory. - /// The max allowed count. (for bound checking of the id in debug mode) - /// a at the given id. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static Memory GetMemory(Memory memory, int id, uint count) where T : unmanaged - { - Debug.Assert(id >= 0 && id < count); - - return memory.Slice(id, 1); - } - - /// - /// Extract a ref T at the given index. - /// - /// The data type. - /// The to extract the data from. - /// The id in the provided memory. - /// The max allowed count. (for bound checking of the id in debug mode) - /// a ref T at the given id. - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static ref T GetFromMemory(Memory memory, int id, uint count) where T : unmanaged - { - return ref GetMemory(memory, id, count).Span[0]; - } - } -} diff --git a/Ryujinx.Audio.Renderer/Utils/SpanMemoryManager.cs b/Ryujinx.Audio.Renderer/Utils/SpanMemoryManager.cs deleted file mode 100644 index 102a9f95..00000000 --- a/Ryujinx.Audio.Renderer/Utils/SpanMemoryManager.cs +++ /dev/null @@ -1,60 +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 . -// - -using System; -using System.Buffers; -using System.Runtime.InteropServices; - -namespace Ryujinx.Audio.Renderer.Utils -{ - public sealed unsafe class SpanMemoryManager : MemoryManager - where T : unmanaged - { - private readonly T* _pointer; - private readonly int _length; - - public SpanMemoryManager(Span span) - { - fixed (T* ptr = &MemoryMarshal.GetReference(span)) - { - _pointer = ptr; - _length = span.Length; - } - } - - public override Span GetSpan() => new Span(_pointer, _length); - - public override MemoryHandle Pin(int elementIndex = 0) - { - if (elementIndex < 0 || elementIndex >= _length) - { - throw new ArgumentOutOfRangeException(nameof(elementIndex)); - } - - return new MemoryHandle(_pointer + elementIndex); - } - - public override void Unpin() { } - - protected override void Dispose(bool disposing) { } - - public static Memory Cast(Memory memory) where TFrom : unmanaged - { - return new SpanMemoryManager(MemoryMarshal.Cast(memory.Span)).Memory; - } - } -} diff --git a/Ryujinx.Audio.Renderer/Utils/SplitterHardwareDevice.cs b/Ryujinx.Audio.Renderer/Utils/SplitterHardwareDevice.cs deleted file mode 100644 index f23bde8a..00000000 --- a/Ryujinx.Audio.Renderer/Utils/SplitterHardwareDevice.cs +++ /dev/null @@ -1,64 +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 . -// - -using Ryujinx.Audio.Renderer.Integration; -using System; - -namespace Ryujinx.Audio.Renderer.Utils -{ - public class SplitterHardwareDevice : HardwareDevice - { - private HardwareDevice _baseDevice; - private HardwareDevice _secondaryDevice; - - public SplitterHardwareDevice(HardwareDevice baseDevice, HardwareDevice secondaryDevice) - { - _baseDevice = baseDevice; - _secondaryDevice = secondaryDevice; - } - - public void AppendBuffer(ReadOnlySpan data, uint channelCount) - { - _baseDevice.AppendBuffer(data, channelCount); - _secondaryDevice?.AppendBuffer(data, channelCount); - } - - public uint GetChannelCount() - { - return _baseDevice.GetChannelCount(); - } - - public uint GetSampleRate() - { - return _baseDevice.GetSampleRate(); - } - - public void Dispose() - { - Dispose(true); - } - - protected virtual void Dispose(bool disposing) - { - if (disposing) - { - _baseDevice.Dispose(); - _secondaryDevice?.Dispose(); - } - } - } -} -- cgit v1.2.3