SDK20 and REV15 support (ryubing/ryujinx!50)

See merge request ryubing/ryujinx!50

src/Ryujinx.Audio/Renderer/Parameter/AudioRendererConfiguration.cs

@@ -1,3 +1,4 @@
+using Ryujinx.Audio.Renderer.Server;
 using Ryujinx.Audio.Renderer.Server.Types;
 using System.Runtime.InteropServices;
 
@@ -93,7 +94,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// <summary>
         /// The user audio revision
         /// </summary>
-        /// <seealso cref="Server.BehaviourContext"/>
+        /// <seealso cref="BehaviourInfo"/>
         public int Revision;
     }
 }

src/Ryujinx.Audio/Renderer/Parameter/BiquadFilterParameter1.cs

@@ -7,7 +7,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
     /// Biquad filter parameters.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Size = 0xC, Pack = 1)]
-    public struct BiquadFilterParameter
+    public struct BiquadFilterParameter1
     {
         /// <summary>
         /// Set to true if the biquad filter is active.

src/Ryujinx.Audio/Renderer/Parameter/BiquadFilterParameter2.cs

@@ -0,0 +1,36 @@
+using Ryujinx.Common.Memory;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.Audio.Renderer.Parameter
+{
+    /// <summary>
+    /// Biquad filter parameters.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Size = 0x18, Pack = 1)]
+    public struct BiquadFilterParameter2
+    {
+        /// <summary>
+        /// Set to true if the biquad filter is active.
+        /// </summary>
+        [MarshalAs(UnmanagedType.I1)]
+        public bool Enable;
+
+        /// <summary>
+        /// Reserved/padding.
+        /// </summary>
+        private readonly byte _reserved1;
+        private readonly byte _reserved2;
+        private readonly byte _reserved3;
+
+        /// <summary>
+        /// Biquad filter numerator (b0, b1, b2).
+        /// </summary>
+        public Array3<float> Numerator;
+
+        /// <summary>
+        /// Biquad filter denominator (a1, a2).
+        /// </summary>
+        /// <remarks>a0 = 1</remarks>
+        public Array2<float> Denominator;
+    }
+}

src/Ryujinx.Audio/Renderer/Parameter/Effect/BiquadFilterEffectParameter1.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
     /// <see cref="IEffectInParameter.SpecificData"/> for <see cref="Common.EffectType.BiquadFilter"/>.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct BiquadFilterEffectParameter
+    public struct BiquadFilterEffectParameter1
     {
         /// <summary>
         /// The input channel indices that will be used by the <see cref="Dsp.AudioProcessor"/>.

src/Ryujinx.Audio/Renderer/Parameter/Effect/BiquadFilterEffectParameter2.cs

@@ -0,0 +1,49 @@
+using Ryujinx.Audio.Renderer.Server.Effect;
+using Ryujinx.Common.Memory;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.Audio.Renderer.Parameter.Effect
+{
+    /// <summary>
+    /// <see cref="IEffectInParameter.SpecificData"/> for <see cref="Common.EffectType.BiquadFilter"/>.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    public struct BiquadFilterEffectParameter2
+    {
+        /// <summary>
+        /// The input channel indices that will be used by the <see cref="Dsp.AudioProcessor"/>.
+        /// </summary>
+        public Array6<byte> Input;
+
+        /// <summary>
+        /// The output channel indices that will be used by the <see cref="Dsp.AudioProcessor"/>.
+        /// </summary>
+        public Array6<byte> Output;
+
+        /// <summary>
+        /// Biquad filter numerator (b0, b1, b2).
+        /// </summary>
+        public Array3<float> Numerator;
+
+        /// <summary>
+        /// Biquad filter denominator (a1, a2).
+        /// </summary>
+        /// <remarks>a0 = 1</remarks>
+        public Array2<float> Denominator;
+
+        /// <summary>
+        /// The total channel count used.
+        /// </summary>
+        public byte ChannelCount;
+
+        /// <summary>
+        /// The current usage status of the effect on the client side.
+        /// </summary>
+        public UsageState Status;
+        
+        /// <summary>
+        /// Reserved/unused.
+        /// </summary>
+        private readonly ushort _reserved;
+    }
+}

src/Ryujinx.Audio/Renderer/Parameter/EffectInParameterVersion3.cs

@@ -0,0 +1,97 @@
+using Ryujinx.Audio.Renderer.Common;
+using Ryujinx.Common.Utilities;
+using System;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.Audio.Renderer.Parameter
+{
+    /// <summary>
+    /// Input information for an effect version 2. (added with REV9)
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    public struct EffectInParameterVersion3 : IEffectInParameter
+    {
+        /// <summary>
+        /// Type of the effect.
+        /// </summary>
+        public EffectType Type;
+
+        /// <summary>
+        /// Set to true if the effect is new.
+        /// </summary>
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsNew;
+
+        /// <summary>
+        /// Set to true if the effect must be active.
+        /// </summary>
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsEnabled;
+
+        /// <summary>
+        /// Reserved/padding.
+        /// </summary>
+        private readonly byte _reserved1;
+
+        /// <summary>
+        /// The target mix id of the effect.
+        /// </summary>
+        public int MixId;
+
+        /// <summary>
+        /// Address of the processing workbuffer.
+        /// </summary>
+        /// <remarks>This is additional data that could be required by the effect processing.</remarks>
+        public ulong BufferBase;
+
+        /// <summary>
+        /// Size of the processing workbuffer.
+        /// </summary>
+        /// <remarks>This is additional data that could be required by the effect processing.</remarks>
+        public ulong BufferSize;
+
+        /// <summary>
+        /// Position of the effect while processing effects.
+        /// </summary>
+        public uint ProcessingOrder;
+
+        /// <summary>
+        /// Reserved/padding.
+        /// </summary>
+        private readonly uint _reserved2;
+
+        /// <summary>
+        /// Specific data storage.
+        /// </summary>
+        private SpecificDataStruct _specificDataStart;
+
+        [StructLayout(LayoutKind.Sequential, Size = 0xA0, Pack = 1)]
+        private struct SpecificDataStruct { }
+
+        public Span<byte> SpecificData => SpanHelpers.AsSpan<SpecificDataStruct, byte>(ref _specificDataStart);
+
+        readonly EffectType IEffectInParameter.Type => Type;
+
+        readonly bool IEffectInParameter.IsNew => IsNew;
+
+        readonly bool IEffectInParameter.IsEnabled => IsEnabled;
+
+        readonly int IEffectInParameter.MixId => MixId;
+
+        readonly ulong IEffectInParameter.BufferBase => BufferBase;
+
+        readonly ulong IEffectInParameter.BufferSize => BufferSize;
+
+        readonly uint IEffectInParameter.ProcessingOrder => ProcessingOrder;
+
+        /// <summary>
+        ///  Check if the given channel count is valid.
+        /// </summary>
+        /// <param name="channelCount">The channel count to check</param>
+        /// <returns>Returns true if the channel count is valid.</returns>
+        public static bool IsChannelCountValid(int channelCount)
+        {
+            return channelCount is 1 or 2 or 4 or 6;
+        }
+    }
+}

src/Ryujinx.Audio/Renderer/Parameter/ISplitterDestinationInParameter.cs

@@ -17,11 +17,11 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// The mix to output the result of the splitter.
         /// </summary>
         int DestinationId { get; }
-
+        
         /// <summary>
         /// Biquad filter parameters.
         /// </summary>
-        Array2<BiquadFilterParameter> BiquadFilters { get; }
+        Array2<BiquadFilterParameter2> BiquadFilters2 { get; }
 
         /// <summary>
         /// Set to true if in use.

src/Ryujinx.Audio/Renderer/Parameter/SinkInParameter.cs

@@ -25,7 +25,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// <summary>
         /// Reserved/padding.
         /// </summary>
-        private readonly ushort _reserved1;
+        private readonly ushort _magic; // 0xCAFE
 
         /// <summary>
         /// The node id of the sink.

src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion1.cs

@@ -60,8 +60,8 @@ namespace Ryujinx.Audio.Renderer.Parameter
         readonly int ISplitterDestinationInParameter.Id => Id;
 
         readonly int ISplitterDestinationInParameter.DestinationId => DestinationId;
-
-        readonly Array2<BiquadFilterParameter> ISplitterDestinationInParameter.BiquadFilters => default;
+        
+        readonly Array2<BiquadFilterParameter2> ISplitterDestinationInParameter.BiquadFilters2 => default;
 
         readonly bool ISplitterDestinationInParameter.IsUsed => IsUsed;
         readonly bool ISplitterDestinationInParameter.ResetPrevVolume => ResetPrevVolume;

src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion2a.cs

@@ -0,0 +1,100 @@
+using Ryujinx.Audio.Renderer.Dsp;
+using Ryujinx.Common.Memory;
+using Ryujinx.Common.Utilities;
+using System;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.Audio.Renderer.Parameter
+{
+    /// <summary>
+    /// Input header for a splitter destination version 2 update.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    public struct SplitterDestinationInParameterVersion2a : ISplitterDestinationInParameter
+    {
+        /// <summary>
+        /// Magic of the input header.
+        /// </summary>
+        public uint Magic;
+
+        /// <summary>
+        /// Target splitter destination data id.
+        /// </summary>
+        public int Id;
+
+        /// <summary>
+        /// Mix buffer volumes storage.
+        /// </summary>
+        private MixArray _mixBufferVolume;
+
+        /// <summary>
+        /// The mix to output the result of the splitter.
+        /// </summary>
+        public int DestinationId;
+
+        /// <summary>
+        /// Biquad filter parameters.
+        /// </summary>
+        public Array2<BiquadFilterParameter1> BiquadFilters;
+
+        /// <summary>
+        /// Set to true if in use.
+        /// </summary>
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsUsed;
+
+        /// <summary>
+        /// Set to true to force resetting the previous mix volumes.
+        /// </summary>
+        [MarshalAs(UnmanagedType.I1)]
+        public bool ResetPrevVolume;
+
+        /// <summary>
+        /// Reserved/padding.
+        /// </summary>
+        private unsafe fixed byte _reserved[10];
+
+        [StructLayout(LayoutKind.Sequential, Size = sizeof(float) * Constants.MixBufferCountMax, Pack = 1)]
+        private struct MixArray { }
+
+        /// <summary>
+        /// Mix buffer volumes.
+        /// </summary>
+        /// <remarks>Used when a splitter id is specified in the mix.</remarks>
+        public Span<float> MixBufferVolume => SpanHelpers.AsSpan<MixArray, float>(ref _mixBufferVolume);
+
+        readonly int ISplitterDestinationInParameter.Id => Id;
+
+        readonly int ISplitterDestinationInParameter.DestinationId => DestinationId;
+        
+        readonly Array2<BiquadFilterParameter2> ISplitterDestinationInParameter.BiquadFilters2
+        {
+            get
+            {
+                Array2<BiquadFilterParameter2> newFilters = new();
+                Span<BiquadFilterParameter2> newFiltersSpan = newFilters.AsSpan();
+                newFiltersSpan[0] = BiquadFilterHelper.ToBiquadFilterParameter2(BiquadFilters[0]);
+                newFiltersSpan[1] = BiquadFilterHelper.ToBiquadFilterParameter2(BiquadFilters[1]);
+                
+                return newFilters;
+            }
+        }
+
+        readonly bool ISplitterDestinationInParameter.IsUsed => IsUsed;
+        readonly bool ISplitterDestinationInParameter.ResetPrevVolume => ResetPrevVolume;
+
+        /// <summary>
+        /// The expected constant of any input header.
+        /// </summary>
+        private const uint ValidMagic = 0x44444E53;
+
+        /// <summary>
+        /// Check if the magic is valid.
+        /// </summary>
+        /// <returns>Returns true if the magic is valid.</returns>
+        public readonly bool IsMagicValid()
+        {
+            return Magic == ValidMagic;
+        }
+    }
+}

src/Ryujinx.Audio/Renderer/Parameter/SplitterDestinationInParameterVersion2b.cs

@@ -9,7 +9,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
     /// Input header for a splitter destination version 2 update.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct SplitterDestinationInParameterVersion2 : ISplitterDestinationInParameter
+    public struct SplitterDestinationInParameterVersion2b : ISplitterDestinationInParameter
     {
         /// <summary>
         /// Magic of the input header.
@@ -34,7 +34,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// <summary>
         /// Biquad filter parameters.
         /// </summary>
-        public Array2<BiquadFilterParameter> BiquadFilters;
+        public Array2<BiquadFilterParameter2> BiquadFilters;
 
         /// <summary>
         /// Set to true if in use.
@@ -66,7 +66,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
 
         readonly int ISplitterDestinationInParameter.DestinationId => DestinationId;
 
-        readonly Array2<BiquadFilterParameter> ISplitterDestinationInParameter.BiquadFilters => BiquadFilters;
+        readonly Array2<BiquadFilterParameter2> ISplitterDestinationInParameter.BiquadFilters2 => BiquadFilters;
 
         readonly bool ISplitterDestinationInParameter.IsUsed => IsUsed;
         readonly bool ISplitterDestinationInParameter.ResetPrevVolume => ResetPrevVolume;

src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter1.cs

@@ -12,7 +12,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
     /// Input information for a voice.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Size = 0x170, Pack = 1)]
-    public struct VoiceInParameter
+    public struct VoiceInParameter1
     {
         /// <summary>
         /// Id of the voice.
@@ -79,7 +79,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// <summary>
         /// Biquad filters to apply to the output of the voice.
         /// </summary>
-        public Array2<BiquadFilterParameter> BiquadFilters;
+        public Array2<BiquadFilterParameter1> BiquadFilters;
 
         /// <summary>
         /// Total count of <see cref="WaveBufferInternal"/> of the voice.
@@ -171,8 +171,9 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// Reserved/unused.
         /// </summary>
         private unsafe fixed uint _reserved3[2];
-
-        /// <summary>
+    }
+    
+    /// <summary>
         /// Input information for a voice wavebuffer.
         /// </summary>
         [StructLayout(LayoutKind.Sequential, Size = 0x38, Pack = 1)]
@@ -328,5 +329,4 @@ namespace Ryujinx.Audio.Renderer.Parameter
             /// </summary>
             Low,
         }
-    }
 }

src/Ryujinx.Audio/Renderer/Parameter/VoiceInParameter2.cs

@@ -0,0 +1,176 @@
+using Ryujinx.Audio.Common;
+using Ryujinx.Audio.Renderer.Common;
+using Ryujinx.Audio.Renderer.Dsp;
+using Ryujinx.Common.Memory;
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.Audio.Renderer.Parameter
+{
+    /// <summary>
+    /// Input information for a voice.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Size = 0x188, Pack = 1)]
+    public struct VoiceInParameter2
+    {
+        /// <summary>
+        /// Id of the voice.
+        /// </summary>
+        public int Id;
+
+        /// <summary>
+        /// Node id of the voice.
+        /// </summary>
+        public int NodeId;
+
+        /// <summary>
+        /// Set to true if the voice is new.
+        /// </summary>
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsNew;
+
+        /// <summary>
+        /// Set to true if the voice is used.
+        /// </summary>
+        [MarshalAs(UnmanagedType.I1)]
+        public bool InUse;
+
+        /// <summary>
+        /// The voice <see cref="PlayState"/> wanted by the user.
+        /// </summary>
+        public PlayState PlayState;
+
+        /// <summary>
+        /// The <see cref="SampleFormat"/> of the voice.
+        /// </summary>
+        public SampleFormat SampleFormat;
+
+        /// <summary>
+        /// The sample rate of the voice.
+        /// </summary>
+        public uint SampleRate;
+
+        /// <summary>
+        /// The priority of the voice.
+        /// </summary>
+        public uint Priority;
+
+        /// <summary>
+        /// Target sorting position of the voice. (Used to sort voices with the same <see cref="Priority"/>)
+        /// </summary>
+        public uint SortingOrder;
+
+        /// <summary>
+        /// The total channel count used.
+        /// </summary>
+        public uint ChannelCount;
+
+        /// <summary>
+        /// The pitch used on the voice.
+        /// </summary>
+        public float Pitch;
+
+        /// <summary>
+        /// The output volume of the voice.
+        /// </summary>
+        public float Volume;
+
+        /// <summary>
+        /// Biquad filters to apply to the output of the voice.
+        /// </summary>
+        public Array2<BiquadFilterParameter2> BiquadFilters;
+
+        /// <summary>
+        /// Total count of <see cref="WaveBufferInternal"/> of the voice.
+        /// </summary>
+        public uint WaveBuffersCount;
+
+        /// <summary>
+        /// Current playing <see cref="WaveBufferInternal"/> of the voice.
+        /// </summary>
+        public uint WaveBuffersIndex;
+
+        /// <summary>
+        /// Reserved/unused.
+        /// </summary>
+        private readonly uint 
+            _reserved1;
+
+        /// <summary>
+        /// User state address required by the data source.
+        /// </summary>
+        /// <remarks>Only used for <see cref="SampleFormat.Adpcm"/> as the address of the GC-ADPCM coefficients.</remarks>
+        public ulong DataSourceStateAddress;
+
+        /// <summary>
+        /// User state size required by the data source.
+        /// </summary>
+        /// <remarks>Only used for <see cref="SampleFormat.Adpcm"/> as the size of the GC-ADPCM coefficients.</remarks>
+        public ulong DataSourceStateSize;
+
+        /// <summary>
+        /// The target mix id of the voice.
+        /// </summary>
+        public int MixId;
+
+        /// <summary>
+        /// The target splitter id of the voice.
+        /// </summary>
+        public uint SplitterId;
+
+        /// <summary>
+        /// The wavebuffer parameters of this voice.
+        /// </summary>
+        public Array4<WaveBufferInternal> WaveBuffers;
+
+        /// <summary>
+        /// The channel resource ids associated to the voice.
+        /// </summary>
+        public Array6<int> ChannelResourceIds;
+
+        /// <summary>
+        /// Reset the voice drop flag during voice server update.
+        /// </summary>
+        [MarshalAs(UnmanagedType.I1)]
+        public bool ResetVoiceDropFlag;
+
+        /// <summary>
+        /// Flush the amount of wavebuffer specified. This will result in the wavebuffer being skipped and marked played.
+        /// </summary>
+        /// <remarks>This was added on REV5.</remarks>
+        public byte FlushWaveBufferCount;
+
+        /// <summary>
+        /// Reserved/unused.
+        /// </summary>
+        private readonly ushort _reserved2;
+
+        /// <summary>
+        /// Change the behaviour of the voice.
+        /// </summary>
+        /// <remarks>This was added on REV5.</remarks>
+        public DecodingBehaviour DecodingBehaviourFlags;
+
+        /// <summary>
+        /// Change the Sample Rate Conversion (SRC) quality of the voice.
+        /// </summary>
+        /// <remarks>This was added on REV8.</remarks>
+        public SampleRateConversionQuality SrcQuality;
+
+        /// <summary>
+        /// This was previously used for opus codec support on the Audio Renderer and was removed on REV3.
+        /// </summary>
+        public uint ExternalContext;
+
+        /// <summary>
+        /// This was previously used for opus codec support on the Audio Renderer and was removed on REV3.
+        /// </summary>
+        public uint ExternalContextSize;
+
+        /// <summary>
+        /// Reserved/unused.
+        /// </summary>
+        private unsafe fixed uint _reserved3[2];
+    }
+}

src/Ryujinx.Audio/Renderer/Parameter/VoiceOutStatus.cs

@@ -1,3 +1,5 @@
+using Ryujinx.Audio.Renderer.Common;
+using Ryujinx.Audio.Renderer.Server;
 using System.Runtime.InteropServices;
 
 namespace Ryujinx.Audio.Renderer.Parameter
@@ -5,7 +7,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
     /// <summary>
     /// Output information about a voice.
     /// </summary>
-    /// <remarks>See <seealso cref="Server.StateUpdater.UpdateVoices(Server.Voice.VoiceContext, System.Memory{Server.MemoryPool.MemoryPoolState})"/></remarks>
+    /// <remarks>See <seealso cref="StateUpdater.UpdateVoices1"/></remarks>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     public struct VoiceOutStatus
     {
@@ -13,7 +15,7 @@ namespace Ryujinx.Audio.Renderer.Parameter
         /// The total amount of samples that was played.
         /// </summary>
         /// <remarks>This is reset to 0 when a <see cref="Common.WaveBuffer"/> finishes playing and <see cref="Common.WaveBuffer.IsEndOfStream"/> is set.</remarks>
-        /// <remarks>This is reset to 0 when looping while <see cref="Parameter.VoiceInParameter.DecodingBehaviour.PlayedSampleCountResetWhenLooping"/> is set.</remarks>
+        /// <remarks>This is reset to 0 when looping while <see cref="DecodingBehaviour.PlayedSampleCountResetWhenLooping"/> is set.</remarks>
         public ulong PlayedSampleCount;
 
         /// <summary>