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 --- .../Server/Upsampler/UpsamplerManager.cs | 101 --------------------- .../Server/Upsampler/UpsamplerState.cs | 80 ---------------- 2 files changed, 181 deletions(-) delete mode 100644 Ryujinx.Audio.Renderer/Server/Upsampler/UpsamplerManager.cs delete mode 100644 Ryujinx.Audio.Renderer/Server/Upsampler/UpsamplerState.cs (limited to 'Ryujinx.Audio.Renderer/Server/Upsampler') diff --git a/Ryujinx.Audio.Renderer/Server/Upsampler/UpsamplerManager.cs b/Ryujinx.Audio.Renderer/Server/Upsampler/UpsamplerManager.cs deleted file mode 100644 index fd396d9f..00000000 --- a/Ryujinx.Audio.Renderer/Server/Upsampler/UpsamplerManager.cs +++ /dev/null @@ -1,101 +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; - -namespace Ryujinx.Audio.Renderer.Server.Upsampler -{ - /// - /// Upsampler manager. - /// - public class UpsamplerManager - { - /// - /// Work buffer for upsampler. - /// - private Memory _upSamplerWorkBuffer; - - /// - /// Global lock of the object. - /// - private object Lock = new object(); - - /// - /// The upsamplers instances. - /// - private UpsamplerState[] _upsamplers; - - /// - /// The count of upsamplers. - /// - private uint _count; - - /// - /// Create a new . - /// - /// Work buffer for upsampler. - /// The count of upsamplers. - public UpsamplerManager(Memory upSamplerWorkBuffer, uint count) - { - _upSamplerWorkBuffer = upSamplerWorkBuffer; - _count = count; - - _upsamplers = new UpsamplerState[_count]; - } - - /// - /// Allocate a new . - /// - /// A new or null if out of memory. - public UpsamplerState Allocate() - { - int workBufferOffset = 0; - - lock (Lock) - { - for (int i = 0; i < _count; i++) - { - if (_upsamplers[i] == null) - { - _upsamplers[i] = new UpsamplerState(this, i, _upSamplerWorkBuffer.Slice(workBufferOffset, RendererConstants.UpSampleEntrySize), RendererConstants.TargetSampleCount); - - return _upsamplers[i]; - } - - workBufferOffset += RendererConstants.UpSampleEntrySize; - } - } - - return null; - } - - /// - /// Free a at the given index. - /// - /// The index of the to free. - public void Free(int index) - { - lock (Lock) - { - Debug.Assert(_upsamplers[index] != null); - - _upsamplers[index] = null; - } - } - } -} diff --git a/Ryujinx.Audio.Renderer/Server/Upsampler/UpsamplerState.cs b/Ryujinx.Audio.Renderer/Server/Upsampler/UpsamplerState.cs deleted file mode 100644 index 8ea55384..00000000 --- a/Ryujinx.Audio.Renderer/Server/Upsampler/UpsamplerState.cs +++ /dev/null @@ -1,80 +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; - -namespace Ryujinx.Audio.Renderer.Server.Upsampler -{ - /// - /// Server state for a upsampling. - /// - public class UpsamplerState - { - /// - /// The output buffer containing the target samples. - /// - public Memory OutputBuffer { get; } - - /// - /// The target sample count. - /// - public uint SampleCount { get; } - - /// - /// The index of the . (used to free it) - /// - private int _index; - - /// - /// The . - /// - private UpsamplerManager _manager; - - /// - /// The source sample count. - /// - public uint SourceSampleCount; - - /// - /// The input buffer indices of the buffers holding the samples that need upsampling. - /// - public ushort[] InputBufferIndices; - - /// - /// Create a new . - /// - /// The upsampler manager. - /// The index of the . (used to free it) - /// The output buffer used to contain the target samples. - /// The target sample count. - public UpsamplerState(UpsamplerManager manager, int index, Memory outputBuffer, uint sampleCount) - { - _manager = manager; - _index = index; - OutputBuffer = outputBuffer; - SampleCount = sampleCount; - } - - /// - /// Release the . - /// - public void Release() - { - _manager.Free(_index); - } - } -} -- cgit v1.2.3