aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Audio.Renderer/Server/Effect/AuxiliaryBufferEffect.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/Server/Effect/AuxiliaryBufferEffect.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/Server/Effect/AuxiliaryBufferEffect.cs')
-rw-r--r--Ryujinx.Audio.Renderer/Server/Effect/AuxiliaryBufferEffect.cs92
1 files changed, 0 insertions, 92 deletions
diff --git a/Ryujinx.Audio.Renderer/Server/Effect/AuxiliaryBufferEffect.cs b/Ryujinx.Audio.Renderer/Server/Effect/AuxiliaryBufferEffect.cs
deleted file mode 100644
index df82945b..00000000
--- a/Ryujinx.Audio.Renderer/Server/Effect/AuxiliaryBufferEffect.cs
+++ /dev/null
@@ -1,92 +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.Audio.Renderer.Dsp.State;
-using Ryujinx.Audio.Renderer.Parameter;
-using Ryujinx.Audio.Renderer.Parameter.Effect;
-using Ryujinx.Audio.Renderer.Server.MemoryPool;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-using DspAddress = System.UInt64;
-
-namespace Ryujinx.Audio.Renderer.Server.Effect
-{
- /// <summary>
- /// Server state for an auxiliary buffer effect.
- /// </summary>
- public class AuxiliaryBufferEffect : BaseEffect
- {
- /// <summary>
- /// The auxiliary buffer parameter.
- /// </summary>
- public AuxiliaryBufferParameter Parameter;
-
- /// <summary>
- /// Auxiliary buffer state.
- /// </summary>
- public AuxiliaryBufferAddresses State;
-
- public override EffectType TargetEffectType => EffectType.AuxiliaryBuffer;
-
- public override DspAddress GetWorkBuffer(int index)
- {
- return WorkBuffers[index].GetReference(true);
- }
-
- public override void Update(out BehaviourParameter.ErrorInfo updateErrorInfo, ref EffectInParameter parameter, PoolMapper mapper)
- {
- Debug.Assert(IsTypeValid(ref parameter));
-
- UpdateParameterBase(ref parameter);
-
- Parameter = MemoryMarshal.Cast<byte, AuxiliaryBufferParameter>(parameter.SpecificData)[0];
- IsEnabled = parameter.IsEnabled;
-
- updateErrorInfo = new BehaviourParameter.ErrorInfo();
-
- if (BufferUnmapped || parameter.IsNew)
- {
- ulong bufferSize = (ulong)Unsafe.SizeOf<int>() * Parameter.BufferStorageSize + (ulong)Unsafe.SizeOf<AuxiliaryBufferHeader>() * 2;
-
- bool sendBufferUnmapped = !mapper.TryAttachBuffer(out updateErrorInfo, ref WorkBuffers[0], Parameter.SendBufferInfoAddress, bufferSize);
- bool returnBufferUnmapped = !mapper.TryAttachBuffer(out updateErrorInfo, ref WorkBuffers[1], Parameter.ReturnBufferInfoAddress, bufferSize);
-
- BufferUnmapped = sendBufferUnmapped && returnBufferUnmapped;
-
- if (!BufferUnmapped)
- {
- DspAddress sendDspAddress = WorkBuffers[0].GetReference(false);
- DspAddress returnDspAddress = WorkBuffers[1].GetReference(false);
-
- State.SendBufferInfo = sendDspAddress + (uint)Unsafe.SizeOf<AuxiliaryBufferHeader>();
- State.SendBufferInfoBase = sendDspAddress + (uint)Unsafe.SizeOf<AuxiliaryBufferHeader>() * 2;
-
- State.ReturnBufferInfo = returnDspAddress + (uint)Unsafe.SizeOf<AuxiliaryBufferHeader>();
- State.ReturnBufferInfoBase = returnDspAddress + (uint)Unsafe.SizeOf<AuxiliaryBufferHeader>() * 2;
- }
- }
- }
-
- public override void UpdateForCommandGeneration()
- {
- UpdateUsageStateForCommandGeneration();
- }
- }
-}