N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

misc: Reformat Ryujinx.Audio with dotnet-format (#3485)

Browse source 
This is the first commit of a series of reformat around the codebase as
discussed internally some weeks ago.

This project being one that isn't touched that much, it shouldn't cause
conflict with any opened PRs.
This commit is contained in:
Mary-nyan 2022-07-25 20:46:33 +02:00 committed by GitHub
parent 62f8ceb60b
commit 1825bd87b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
200 changed files with 306 additions and 309 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceSession.cs
View file

@ -81,7 +81,7 @@ namespace Ryujinx.Audio.Backends.CompatLayer
{ {
BufferTag = buffer.BufferTag, BufferTag = buffer.BufferTag,
DataPointer = buffer.DataPointer, DataPointer = buffer.DataPointer,
DataSize = (ulong)downmixedBuffer.Length DataSize = (ulong)downmixedBuffer.Length
}; };
bool result = _realSession.RegisterBuffer(fakeBuffer, downmixedBuffer); bool result = _realSession.RegisterBuffer(fakeBuffer, downmixedBuffer);

16
Ryujinx.Audio/Backends/CompatLayer/Downmixing.cs
View file

@ -24,11 +24,11 @@ namespace Ryujinx.Audio.Backends.CompatLayer
public short Right; public short Right;
} }
private const int Q15Bits = 16; private const int Q15Bits = 16;
private const int RawQ15One = 1 << Q15Bits; private const int RawQ15One = 1 << Q15Bits;
private const int RawQ15HalfOne = (int)(0.5f * RawQ15One); private const int RawQ15HalfOne = (int)(0.5f * RawQ15One);
private const int Minus3dBInQ15 = (int)(0.707f * RawQ15One); private const int Minus3dBInQ15 = (int)(0.707f * RawQ15One);
private const int Minus6dBInQ15 = (int)(0.501f * RawQ15One); private const int Minus6dBInQ15 = (int)(0.501f * RawQ15One);
private const int Minus12dBInQ15 = (int)(0.251f * RawQ15One); private const int Minus12dBInQ15 = (int)(0.251f * RawQ15One);
private static readonly int[] DefaultSurroundToStereoCoefficients = new int[4] private static readonly int[] DefaultSurroundToStereoCoefficients = new int[4]
@ -46,8 +46,8 @@ namespace Ryujinx.Audio.Backends.CompatLayer
}; };
private const int SurroundChannelCount = 6; private const int SurroundChannelCount = 6;
private const int StereoChannelCount = 2; private const int StereoChannelCount = 2;
private const int MonoChannelCount = 1; private const int MonoChannelCount = 1;
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static ReadOnlySpan<Channel51FormatPCM16> GetSurroundBuffer(ReadOnlySpan<short> data) private static ReadOnlySpan<Channel51FormatPCM16> GetSurroundBuffer(ReadOnlySpan<short> data)
@ -86,7 +86,7 @@ namespace Ryujinx.Audio.Backends.CompatLayer
{ {
Channel51FormatPCM16 channel = channels[i]; Channel51FormatPCM16 channel = channels[i];
downmixedBuffer[i * 2] = DownMixSurroundToStereo(coefficients, channel.BackLeft, channel.LowFrequency, channel.FrontCenter, channel.FrontLeft); downmixedBuffer[i * 2] = DownMixSurroundToStereo(coefficients, channel.BackLeft, channel.LowFrequency, channel.FrontCenter, channel.FrontLeft);
downmixedBuffer[i * 2 + 1] = DownMixSurroundToStereo(coefficients, channel.BackRight, channel.LowFrequency, channel.FrontCenter, channel.FrontRight); downmixedBuffer[i * 2 + 1] = DownMixSurroundToStereo(coefficients, channel.BackRight, channel.LowFrequency, channel.FrontCenter, channel.FrontRight);
} }

6
Ryujinx.Audio/Input/AudioInputManager.cs
View file

@ -214,9 +214,9 @@ namespace Ryujinx.Audio.Input
outputDeviceName = audioIn.DeviceName; outputDeviceName = audioIn.DeviceName;
outputConfiguration = new AudioOutputConfiguration outputConfiguration = new AudioOutputConfiguration
{ {
ChannelCount = audioIn.ChannelCount, ChannelCount = audioIn.ChannelCount,
SampleFormat = audioIn.SampleFormat, SampleFormat = audioIn.SampleFormat,
SampleRate = audioIn.SampleRate, SampleRate = audioIn.SampleRate,
AudioOutState = audioIn.GetState(), AudioOutState = audioIn.GetState(),
}; };

4
Ryujinx.Audio/Integration/HardwareDeviceImpl.cs
View file

@ -32,8 +32,8 @@ namespace Ryujinx.Audio.Integration
_session.QueueBuffer(new AudioBuffer _session.QueueBuffer(new AudioBuffer
{ {
DataPointer = _currentBufferTag++, DataPointer = _currentBufferTag++,
Data = _buffer, Data = _buffer,
DataSize = (ulong)_buffer.Length, DataSize = (ulong)_buffer.Length,
}); });
_currentBufferTag = _currentBufferTag % 4; _currentBufferTag = _currentBufferTag % 4;

6
Ryujinx.Audio/Output/AudioOutputManager.cs
View file

@ -209,9 +209,9 @@ namespace Ryujinx.Audio.Output
outputDeviceName = audioOut.DeviceName; outputDeviceName = audioOut.DeviceName;
outputConfiguration = new AudioOutputConfiguration outputConfiguration = new AudioOutputConfiguration
{ {
ChannelCount = audioOut.ChannelCount, ChannelCount = audioOut.ChannelCount,
SampleFormat = audioOut.SampleFormat, SampleFormat = audioOut.SampleFormat,
SampleRate = audioOut.SampleRate, SampleRate = audioOut.SampleRate,
AudioOutState = audioOut.GetState(), AudioOutState = audioOut.GetState(),
}; };

8
Ryujinx.Audio/Output/AudioOutputSystem.cs
View file

@ -169,7 +169,7 @@ namespace Ryujinx.Audio.Output
} }
SampleFormat = sampleFormat; SampleFormat = sampleFormat;
SampleRate = Constants.TargetSampleRate; SampleRate = Constants.TargetSampleRate;
} }
return result; return result;
@ -187,9 +187,9 @@ namespace Ryujinx.Audio.Output
{ {
AudioBuffer buffer = new AudioBuffer AudioBuffer buffer = new AudioBuffer
{ {
BufferTag = bufferTag, BufferTag = bufferTag,
DataPointer = userBuffer.Data, DataPointer = userBuffer.Data,
DataSize = userBuffer.DataSize DataSize = userBuffer.DataSize
}; };
if (_session.AppendBuffer(buffer)) if (_session.AppendBuffer(buffer))
@ -291,7 +291,7 @@ namespace Ryujinx.Audio.Output
{ {
lock (_parentLock) lock (_parentLock)
{ {
_session.SetVolume(volume); _session.SetVolume(volume);
} }
} }

4
Ryujinx.Audio/Renderer/Common/WorkBufferAllocator.cs
View file

@ -41,7 +41,7 @@ namespace Ryujinx.Audio.Renderer.Common
return Memory<byte>.Empty; return Memory<byte>.Empty;
} }
public Memory<T> Allocate<T>(ulong count, int align) where T: unmanaged public Memory<T> Allocate<T>(ulong count, int align) where T : unmanaged
{ {
Memory<byte> allocatedMemory = Allocate((ulong)Unsafe.SizeOf<T>() * count, align); Memory<byte> allocatedMemory = Allocate((ulong)Unsafe.SizeOf<T>() * count, align);
@ -53,7 +53,7 @@ namespace Ryujinx.Audio.Renderer.Common
return SpanMemoryManager<T>.Cast(allocatedMemory); return SpanMemoryManager<T>.Cast(allocatedMemory);
} }
public static ulong GetTargetSize<T>(ulong currentSize, ulong count, int align) where T: unmanaged public static ulong GetTargetSize<T>(ulong currentSize, ulong count, int align) where T : unmanaged
{ {
return BitUtils.AlignUp(currentSize, align) + (ulong)Unsafe.SizeOf<T>() * count; return BitUtils.AlignUp(currentSize, align) + (ulong)Unsafe.SizeOf<T>() * count;
} }

22
Ryujinx.Audio/Renderer/Dsp/Command/DelayCommand.cs
View file

@ -87,7 +87,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision); float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision); float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
Matrix2x2 delayFeedback = new Matrix2x2(delayFeedbackBaseGain , delayFeedbackCrossGain, Matrix2x2 delayFeedback = new Matrix2x2(delayFeedbackBaseGain, delayFeedbackCrossGain,
delayFeedbackCrossGain, delayFeedbackBaseGain); delayFeedbackCrossGain, delayFeedbackBaseGain);
for (int i = 0; i < sampleCount; i++) for (int i = 0; i < sampleCount; i++)
@ -124,10 +124,10 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision); float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision); float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
Matrix4x4 delayFeedback = new Matrix4x4(delayFeedbackBaseGain , delayFeedbackCrossGain, delayFeedbackCrossGain, 0.0f, Matrix4x4 delayFeedback = new Matrix4x4(delayFeedbackBaseGain, delayFeedbackCrossGain, delayFeedbackCrossGain, 0.0f,
delayFeedbackCrossGain, delayFeedbackBaseGain , 0.0f , delayFeedbackCrossGain, delayFeedbackCrossGain, delayFeedbackBaseGain, 0.0f, delayFeedbackCrossGain,
delayFeedbackCrossGain, 0.0f , delayFeedbackBaseGain , delayFeedbackCrossGain, delayFeedbackCrossGain, 0.0f, delayFeedbackBaseGain, delayFeedbackCrossGain,
0.0f , delayFeedbackCrossGain, delayFeedbackCrossGain, delayFeedbackBaseGain); 0.0f, delayFeedbackCrossGain, delayFeedbackCrossGain, delayFeedbackBaseGain);
for (int i = 0; i < sampleCount; i++) for (int i = 0; i < sampleCount; i++)
@ -171,12 +171,12 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision); float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision);
float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision); float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision);
Matrix6x6 delayFeedback = new Matrix6x6(delayFeedbackBaseGain , 0.0f , 0.0f , 0.0f , delayFeedbackCrossGain, delayFeedbackCrossGain, Matrix6x6 delayFeedback = new Matrix6x6(delayFeedbackBaseGain, 0.0f, 0.0f, 0.0f, delayFeedbackCrossGain, delayFeedbackCrossGain,
0.0f , delayFeedbackBaseGain , 0.0f , delayFeedbackCrossGain, delayFeedbackCrossGain, 0.0f , 0.0f, delayFeedbackBaseGain, 0.0f, delayFeedbackCrossGain, delayFeedbackCrossGain, 0.0f,
delayFeedbackCrossGain, 0.0f , delayFeedbackBaseGain , delayFeedbackCrossGain, 0.0f , 0.0f , delayFeedbackCrossGain, 0.0f, delayFeedbackBaseGain, delayFeedbackCrossGain, 0.0f, 0.0f,
0.0f , delayFeedbackCrossGain, delayFeedbackCrossGain, delayFeedbackBaseGain , 0.0f , 0.0f , 0.0f, delayFeedbackCrossGain, delayFeedbackCrossGain, delayFeedbackBaseGain, 0.0f, 0.0f,
delayFeedbackCrossGain, delayFeedbackCrossGain, 0.0f , 0.0f , delayFeedbackBaseGain , 0.0f , delayFeedbackCrossGain, delayFeedbackCrossGain, 0.0f, 0.0f, delayFeedbackBaseGain, 0.0f,
0.0f , 0.0f , 0.0f , 0.0f , 0.0f , feedbackGain); 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, feedbackGain);
for (int i = 0; i < sampleCount; i++) for (int i = 0; i < sampleCount; i++)
{ {

2
Ryujinx.Audio/Renderer/Dsp/State/LimiterState.cs
View file

@ -25,6 +25,6 @@ namespace Ryujinx.Audio.Renderer.Dsp.State
UpdateParameter(ref parameter); UpdateParameter(ref parameter);
} }
public void UpdateParameter(ref LimiterParameter parameter) {} public void UpdateParameter(ref LimiterParameter parameter) { }
} }
} }

68
Ryujinx.Audio/Renderer/Server/AudioRenderSystem.cs
View file

@ -29,34 +29,34 @@ namespace Ryujinx.Audio.Renderer.Server
private object _lock = new object(); private object _lock = new object();
private AudioRendererExecutionMode _executionMode; private AudioRendererExecutionMode _executionMode;
private IWritableEvent _systemEvent; private IWritableEvent _systemEvent;
private ManualResetEvent _terminationEvent; private ManualResetEvent _terminationEvent;
private MemoryPoolState _dspMemoryPoolState; private MemoryPoolState _dspMemoryPoolState;
private VoiceContext _voiceContext; private VoiceContext _voiceContext;
private MixContext _mixContext; private MixContext _mixContext;
private SinkContext _sinkContext; private SinkContext _sinkContext;
private SplitterContext _splitterContext; private SplitterContext _splitterContext;
private EffectContext _effectContext; private EffectContext _effectContext;
private PerformanceManager _performanceManager; private PerformanceManager _performanceManager;
private UpsamplerManager _upsamplerManager; private UpsamplerManager _upsamplerManager;
private bool _isActive; private bool _isActive;
private BehaviourContext _behaviourContext; private BehaviourContext _behaviourContext;
private ulong _totalElapsedTicksUpdating; private ulong _totalElapsedTicksUpdating;
private ulong _totalElapsedTicks; private ulong _totalElapsedTicks;
private int _sessionId; private int _sessionId;
private Memory<MemoryPoolState> _memoryPools; private Memory<MemoryPoolState> _memoryPools;
private uint _sampleRate; private uint _sampleRate;
private uint _sampleCount; private uint _sampleCount;
private uint _mixBufferCount; private uint _mixBufferCount;
private uint _voiceChannelCountMax; private uint _voiceChannelCountMax;
private uint _upsamplerCount; private uint _upsamplerCount;
private uint _memoryPoolCount; private uint _memoryPoolCount;
private uint _processHandle; private uint _processHandle;
private ulong _appletResourceId; private ulong _appletResourceId;
private WritableRegion _workBufferRegion; private WritableRegion _workBufferRegion;
private MemoryHandle _workBufferMemoryPin; private MemoryHandle _workBufferMemoryPin;
private Memory<float> _mixBuffer; private Memory<float> _mixBuffer;
private Memory<float> _depopBuffer; private Memory<float> _depopBuffer;
@ -81,21 +81,21 @@ namespace Ryujinx.Audio.Renderer.Server
public AudioRenderSystem(AudioRendererManager manager, IWritableEvent systemEvent) public AudioRenderSystem(AudioRendererManager manager, IWritableEvent systemEvent)
{ {
_manager = manager; _manager = manager;
_terminationEvent = new ManualResetEvent(false); _terminationEvent = new ManualResetEvent(false);
_dspMemoryPoolState = MemoryPoolState.Create(MemoryPoolState.LocationType.Dsp); _dspMemoryPoolState = MemoryPoolState.Create(MemoryPoolState.LocationType.Dsp);
_voiceContext = new VoiceContext(); _voiceContext = new VoiceContext();
_mixContext = new MixContext(); _mixContext = new MixContext();
_sinkContext = new SinkContext(); _sinkContext = new SinkContext();
_splitterContext = new SplitterContext(); _splitterContext = new SplitterContext();
_effectContext = new EffectContext(); _effectContext = new EffectContext();
_commandProcessingTimeEstimator = null; _commandProcessingTimeEstimator = null;
_systemEvent = systemEvent; _systemEvent = systemEvent;
_behaviourContext = new BehaviourContext(); _behaviourContext = new BehaviourContext();
_totalElapsedTicksUpdating = 0; _totalElapsedTicksUpdating = 0;
_sessionId = 0; _sessionId = 0;
} }
public ResultCode Initialize(ref AudioRendererConfiguration parameter, uint processHandle, CpuAddress workBuffer, ulong workBufferSize, int sessionId, ulong appletResourceId, IVirtualMemoryManager memoryManager) public ResultCode Initialize(ref AudioRendererConfiguration parameter, uint processHandle, CpuAddress workBuffer, ulong workBufferSize, int sessionId, ulong appletResourceId, IVirtualMemoryManager memoryManager)
@ -116,7 +116,7 @@ namespace Ryujinx.Audio.Renderer.Server
_behaviourContext.SetUserRevision(parameter.Revision); _behaviourContext.SetUserRevision(parameter.Revision);
_sampleRate = parameter.SampleRate; _sampleRate = parameter.SampleRate;
_sampleCount = parameter.SampleCount; _sampleCount = parameter.SampleCount;
_mixBufferCount = parameter.MixBufferCount; _mixBufferCount = parameter.MixBufferCount;
_voiceChannelCountMax = Constants.VoiceChannelCountMax; _voiceChannelCountMax = Constants.VoiceChannelCountMax;
@ -203,7 +203,7 @@ namespace Ryujinx.Audio.Renderer.Server
{ {
ref VoiceChannelResource voiceChannelResource = ref voiceChannelResources.Span[(int)id]; ref VoiceChannelResource voiceChannelResource = ref voiceChannelResources.Span[(int)id];
voiceChannelResource.Id = id; voiceChannelResource.Id = id;
voiceChannelResource.IsUsed = false; voiceChannelResource.IsUsed = false;
} }

4
Ryujinx.Audio/Renderer/Server/BehaviourContext.cs
View file

@ -141,8 +141,8 @@ namespace Ryujinx.Audio.Renderer.Server
public BehaviourContext() public BehaviourContext()
{ {
UserRevision = 0; UserRevision = 0;
_errorInfos = new ErrorInfo[Constants.MaxErrorInfos]; _errorInfos = new ErrorInfo[Constants.MaxErrorInfos];
_errorIndex = 0; _errorIndex = 0;
} }
/// <summary> /// <summary>

8
Ryujinx.Audio/Renderer/Server/Effect/BaseEffect.cs
View file

@ -81,7 +81,7 @@ namespace Ryujinx.Audio.Renderer.Server.Effect
/// </summary> /// </summary>
/// <param name="parameter">The user parameter.</param> /// <param name="parameter">The user parameter.</param>
/// <returns>Returns true if the <see cref="EffectType"/> sent by the user matches the internal <see cref="EffectType"/>.</returns> /// <returns>Returns true if the <see cref="EffectType"/> sent by the user matches the internal <see cref="EffectType"/>.</returns>
public bool IsTypeValid<T>(ref T parameter) where T: unmanaged, IEffectInParameter public bool IsTypeValid<T>(ref T parameter) where T : unmanaged, IEffectInParameter
{ {
return parameter.Type == TargetEffectType; return parameter.Type == TargetEffectType;
} }
@ -140,14 +140,14 @@ namespace Ryujinx.Audio.Renderer.Server.Effect
/// Initialize the given <paramref name="state"/> result state. /// Initialize the given <paramref name="state"/> result state.
/// </summary> /// </summary>
/// <param name="state">The state to initalize</param> /// <param name="state">The state to initalize</param>
public virtual void InitializeResultState(ref EffectResultState state) {} public virtual void InitializeResultState(ref EffectResultState state) { }
/// <summary> /// <summary>
/// Update the <paramref name="destState"/> result state with <paramref name="srcState"/>. /// Update the <paramref name="destState"/> result state with <paramref name="srcState"/>.
/// </summary> /// </summary>
/// <param name="destState">The destination result state</param> /// <param name="destState">The destination result state</param>
/// <param name="srcState">The source result state</param> /// <param name="srcState">The source result state</param>
public virtual void UpdateResultState(ref EffectResultState destState, ref EffectResultState srcState) {} public virtual void UpdateResultState(ref EffectResultState destState, ref EffectResultState srcState) { }
/// <summary> /// <summary>
/// Update the internal state from a user version 1 parameter. /// Update the internal state from a user version 1 parameter.
@ -215,7 +215,7 @@ namespace Ryujinx.Audio.Renderer.Server.Effect
/// </summary> /// </summary>
/// <param name="outStatus">The given user output.</param> /// <param name="outStatus">The given user output.</param>
/// <param name="isAudioRendererActive">If set to true, the <see cref="AudioRenderSystem"/> is active.</param> /// <param name="isAudioRendererActive">If set to true, the <see cref="AudioRenderSystem"/> is active.</param>
public void StoreStatus<T>(ref T outStatus, bool isAudioRendererActive) where T: unmanaged, IEffectOutStatus public void StoreStatus<T>(ref T outStatus, bool isAudioRendererActive) where T : unmanaged, IEffectOutStatus
{ {
if (isAudioRendererActive) if (isAudioRendererActive)
{ {

2
Ryujinx.Audio/Renderer/Server/Effect/Reverb3dEffect.cs
View file

@ -46,7 +46,7 @@ namespace Ryujinx.Audio.Renderer.Server.Effect
Update(out updateErrorInfo, ref parameter, mapper); Update(out updateErrorInfo, ref parameter, mapper);
} }
public void Update<T>(out BehaviourParameter.ErrorInfo updateErrorInfo, ref T parameter, PoolMapper mapper) where T: unmanaged, IEffectInParameter public void Update<T>(out BehaviourParameter.ErrorInfo updateErrorInfo, ref T parameter, PoolMapper mapper) where T : unmanaged, IEffectInParameter
{ {
Debug.Assert(IsTypeValid(ref parameter)); Debug.Assert(IsTypeValid(ref parameter));

13
Ryujinx.Audio/Renderer/Server/MemoryPool/AddressInfo.cs
View file

@ -1,8 +1,7 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using DspAddress = System.UInt64;
using CpuAddress = System.UInt64; using CpuAddress = System.UInt64;
using DspAddress = System.UInt64;
namespace Ryujinx.Audio.Renderer.Server.MemoryPool namespace Ryujinx.Audio.Renderer.Server.MemoryPool
{ {
@ -53,9 +52,9 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
{ {
return new AddressInfo return new AddressInfo
{ {
CpuAddress = cpuAddress, CpuAddress = cpuAddress,
_memoryPools = MemoryPoolState.Null, _memoryPools = MemoryPoolState.Null,
Size = size, Size = size,
ForceMappedDspAddress = 0 ForceMappedDspAddress = 0
}; };
} }
@ -68,8 +67,8 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
/// <param name="size">The size of the region.</param> /// <param name="size">The size of the region.</param>
public void Setup(CpuAddress cpuAddress, ulong size) public void Setup(CpuAddress cpuAddress, ulong size)
{ {
CpuAddress = cpuAddress; CpuAddress = cpuAddress;
Size = size; Size = size;
ForceMappedDspAddress = 0; ForceMappedDspAddress = 0;
unsafe unsafe

9
Ryujinx.Audio/Renderer/Server/MemoryPool/MemoryPoolState.cs
View file

@ -1,8 +1,7 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using DspAddress = System.UInt64;
using CpuAddress = System.UInt64; using CpuAddress = System.UInt64;
using DspAddress = System.UInt64;
namespace Ryujinx.Audio.Renderer.Server.MemoryPool namespace Ryujinx.Audio.Renderer.Server.MemoryPool
{ {
@ -69,8 +68,8 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
{ {
CpuAddress = 0, CpuAddress = 0,
DspAddress = 0, DspAddress = 0,
Size = 0, Size = 0,
Location = location Location = location
}; };
} }
@ -82,7 +81,7 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
public void SetCpuAddress(CpuAddress cpuAddress, ulong size) public void SetCpuAddress(CpuAddress cpuAddress, ulong size)
{ {
CpuAddress = cpuAddress; CpuAddress = cpuAddress;
Size = size; Size = size;
} }
/// <summary> /// <summary>

4
Ryujinx.Audio/Renderer/Server/MemoryPool/PoolMapper.cs
View file

@ -229,14 +229,14 @@ namespace Ryujinx.Audio.Renderer.Server.MemoryPool
if (AssignDspAddress(ref addressInfo)) if (AssignDspAddress(ref addressInfo))
{ {
errorInfo.ErrorCode = 0x0; errorInfo.ErrorCode = 0x0;
errorInfo.ExtraErrorInfo = 0x0; errorInfo.ExtraErrorInfo = 0x0;
return true; return true;
} }
else else
{ {
errorInfo.ErrorCode = ResultCode.InvalidAddressInfo; errorInfo.ErrorCode = ResultCode.InvalidAddressInfo;
errorInfo.ExtraErrorInfo = addressInfo.CpuAddress; errorInfo.ExtraErrorInfo = addressInfo.CpuAddress;
return _isForceMapEnabled; return _isForceMapEnabled;

2
Ryujinx.Audio/Renderer/Server/Performance/PerformanceManagerGeneric.cs
View file

@ -13,7 +13,7 @@ namespace Ryujinx.Audio.Renderer.Server.Performance
/// <typeparam name="THeader">The header implementation of the performance frame.</typeparam> /// <typeparam name="THeader">The header implementation of the performance frame.</typeparam>
/// <typeparam name="TEntry">The entry implementation of the performance frame.</typeparam> /// <typeparam name="TEntry">The entry implementation of the performance frame.</typeparam>
/// <typeparam name="TEntryDetail">A detailed implementation of the performance frame.</typeparam> /// <typeparam name="TEntryDetail">A detailed implementation of the performance frame.</typeparam>
public class PerformanceManagerGeneric<THeader, TEntry, TEntryDetail> : PerformanceManager where THeader: unmanaged, IPerformanceHeader where TEntry : unmanaged, IPerformanceEntry where TEntryDetail: unmanaged, IPerformanceDetailEntry public class PerformanceManagerGeneric<THeader, TEntry, TEntryDetail> : PerformanceManager where THeader : unmanaged, IPerformanceHeader where TEntry : unmanaged, IPerformanceEntry where TEntryDetail : unmanaged, IPerformanceDetailEntry
{ {
/// <summary> /// <summary>
/// The magic used for the <see cref="THeader"/>. /// The magic used for the <see cref="THeader"/>.

2
Ryujinx.Audio/Renderer/Server/Splitter/SplitterDestination.cs
View file

@ -172,7 +172,7 @@ namespace Ryujinx.Audio.Renderer.Server.Splitter
{ {
unsafe unsafe
{ {
fixed (SplitterDestination *nextPtr = &next) fixed (SplitterDestination* nextPtr = &next)
{ {
_next = nextPtr; _next = nextPtr;
} }

4
Ryujinx.Audio/Renderer/Server/StateUpdater.cs
View file

@ -21,7 +21,7 @@ namespace Ryujinx.Audio.Renderer.Server
public class StateUpdater public class StateUpdater
{ {
private readonly ReadOnlyMemory<byte> _inputOrigin; private readonly ReadOnlyMemory<byte> _inputOrigin;
private ReadOnlyMemory <byte> _outputOrigin; private ReadOnlyMemory<byte> _outputOrigin;
private ReadOnlyMemory<byte> _input; private ReadOnlyMemory<byte> _input;
private Memory<byte> _output; private Memory<byte> _output;
@ -207,7 +207,7 @@ namespace Ryujinx.Audio.Renderer.Server
return ResultCode.Success; return ResultCode.Success;
} }
private static void ResetEffect<T>(ref BaseEffect effect, ref T parameter, PoolMapper mapper) where T: unmanaged, IEffectInParameter private static void ResetEffect<T>(ref BaseEffect effect, ref T parameter, PoolMapper mapper) where T : unmanaged, IEffectInParameter
{ {
effect.ForceUnmapBuffers(mapper); effect.ForceUnmapBuffers(mapper);

4
Ryujinx.Audio/Renderer/Server/Voice/VoiceState.cs
View file

@ -200,7 +200,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
SampleFormat = SampleFormat.Invalid; SampleFormat = SampleFormat.Invalid;
ChannelsCount = 0; ChannelsCount = 0;
Pitch = 0.0f; Pitch = 0.0f;
Volume= 0.0f; Volume = 0.0f;
PreviousVolume = 0.0f; PreviousVolume = 0.0f;
BiquadFilters.ToSpan().Fill(new BiquadFilterParameter()); BiquadFilters.ToSpan().Fill(new BiquadFilterParameter());
WaveBuffersCount = 0; WaveBuffersCount = 0;
@ -260,7 +260,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice
} }
return DataSourceStateAddressInfo.CpuAddress != parameter.DataSourceStateAddress || return DataSourceStateAddressInfo.CpuAddress != parameter.DataSourceStateAddress ||
DataSourceStateAddressInfo.Size != parameter.DataSourceStateSize || DataSourceStateAddressInfo.Size != parameter.DataSourceStateSize ||
DataSourceStateUnmapped; DataSourceStateUnmapped;
} }

3
Ryujinx.Audio/Renderer/Utils/AudioProcessorMemoryManager.cs
View file

@ -1,7 +1,6 @@
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using DspAddress = System.UInt64;
using CpuAddress = System.UInt64; using CpuAddress = System.UInt64;
using DspAddress = System.UInt64;
namespace Ryujinx.Audio.Renderer.Utils namespace Ryujinx.Audio.Renderer.Utils
{ {

20
Ryujinx.Audio/ResultCode.cs
View file

@ -2,20 +2,20 @@ namespace Ryujinx.Audio
{ {
public enum ResultCode public enum ResultCode
{ {
ModuleId = 153, ModuleId = 153,
ErrorCodeShift = 9, ErrorCodeShift = 9,
Success = 0, Success = 0,
DeviceNotFound = (1 << ErrorCodeShift) | ModuleId, DeviceNotFound = (1 << ErrorCodeShift) | ModuleId,
OperationFailed = (2 << ErrorCodeShift) | ModuleId, OperationFailed = (2 << ErrorCodeShift) | ModuleId,
UnsupportedSampleRate = (3 << ErrorCodeShift) | ModuleId, UnsupportedSampleRate = (3 << ErrorCodeShift) | ModuleId,
WorkBufferTooSmall = (4 << ErrorCodeShift) | ModuleId, WorkBufferTooSmall = (4 << ErrorCodeShift) | ModuleId,
BufferRingFull = (8 << ErrorCodeShift) | ModuleId, BufferRingFull = (8 << ErrorCodeShift) | ModuleId,
UnsupportedChannelConfiguration = (10 << ErrorCodeShift) | ModuleId, UnsupportedChannelConfiguration = (10 << ErrorCodeShift) | ModuleId,
InvalidUpdateInfo = (41 << ErrorCodeShift) | ModuleId, InvalidUpdateInfo = (41 << ErrorCodeShift) | ModuleId,
InvalidAddressInfo = (42 << ErrorCodeShift) | ModuleId, InvalidAddressInfo = (42 << ErrorCodeShift) | ModuleId,
InvalidMixSorting = (43 << ErrorCodeShift) | ModuleId, InvalidMixSorting = (43 << ErrorCodeShift) | ModuleId,
UnsupportedOperation = (513 << ErrorCodeShift) | ModuleId, UnsupportedOperation = (513 << ErrorCodeShift) | ModuleId,
} }
} }