* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2208 warnings * Address or silence dotnet format CA2211 warnings * Address review comments * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Format if-blocks correctly * Run dotnet format whitespace after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Add comments to disabled warnings * Remove a few unused parameters * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Address IDE0251 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * Fix naming rule violations, remove redundant code and fix build issues * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * Add trailing commas * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * Address review feedback --------- Co-authored-by: Ac_K <Acoustik666@gmail.com>
156 lines
5.4 KiB
C#
156 lines
5.4 KiB
C#
using Ryujinx.Audio.Integration;
|
|
using Ryujinx.Audio.Renderer.Server;
|
|
using Ryujinx.Common;
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.Memory;
|
|
using System;
|
|
using System.Buffers;
|
|
using System.Collections.Generic;
|
|
using System.Runtime.CompilerServices;
|
|
|
|
namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|
{
|
|
public class CommandList : IDisposable
|
|
{
|
|
public ulong StartTime { get; private set; }
|
|
public ulong EndTime { get; private set; }
|
|
public uint SampleCount { get; }
|
|
public uint SampleRate { get; }
|
|
|
|
public Memory<float> Buffers { get; }
|
|
public uint BufferCount { get; }
|
|
|
|
public List<ICommand> Commands { get; }
|
|
|
|
public IVirtualMemoryManager MemoryManager { get; }
|
|
|
|
public IHardwareDevice OutputDevice { get; private set; }
|
|
|
|
private readonly int _sampleCount;
|
|
private readonly int _buffersEntryCount;
|
|
private readonly MemoryHandle _buffersMemoryHandle;
|
|
|
|
public CommandList(AudioRenderSystem renderSystem) : this(renderSystem.MemoryManager,
|
|
renderSystem.GetMixBuffer(),
|
|
renderSystem.GetSampleCount(),
|
|
renderSystem.GetSampleRate(),
|
|
renderSystem.GetMixBufferCount(),
|
|
renderSystem.GetVoiceChannelCountMax())
|
|
{
|
|
}
|
|
|
|
public CommandList(IVirtualMemoryManager memoryManager, Memory<float> mixBuffer, uint sampleCount, uint sampleRate, uint mixBufferCount, uint voiceChannelCountMax)
|
|
{
|
|
SampleCount = sampleCount;
|
|
_sampleCount = (int)SampleCount;
|
|
SampleRate = sampleRate;
|
|
BufferCount = mixBufferCount + voiceChannelCountMax;
|
|
Buffers = mixBuffer;
|
|
Commands = new List<ICommand>();
|
|
MemoryManager = memoryManager;
|
|
|
|
_buffersEntryCount = Buffers.Length;
|
|
_buffersMemoryHandle = Buffers.Pin();
|
|
}
|
|
|
|
public void AddCommand(ICommand command)
|
|
{
|
|
Commands.Add(command);
|
|
}
|
|
|
|
public void AddCommand<T>(T command) where T : unmanaged, ICommand
|
|
{
|
|
throw new NotImplementedException();
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public unsafe IntPtr GetBufferPointer(int index)
|
|
{
|
|
if (index >= 0 && index < _buffersEntryCount)
|
|
{
|
|
return (IntPtr)((float*)_buffersMemoryHandle.Pointer + index * _sampleCount);
|
|
}
|
|
|
|
throw new ArgumentOutOfRangeException(nameof(index), index, null);
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public unsafe void ClearBuffer(int index)
|
|
{
|
|
Unsafe.InitBlock((void*)GetBufferPointer(index), 0, SampleCount);
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public unsafe void ClearBuffers()
|
|
{
|
|
Unsafe.InitBlock(_buffersMemoryHandle.Pointer, 0, (uint)_buffersEntryCount * sizeof(float));
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public unsafe void CopyBuffer(int outputBufferIndex, int inputBufferIndex)
|
|
{
|
|
Unsafe.CopyBlock((void*)GetBufferPointer(outputBufferIndex), (void*)GetBufferPointer(inputBufferIndex), SampleCount);
|
|
}
|
|
|
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
|
public Span<float> GetBuffer(int index)
|
|
{
|
|
if (index < 0 || index >= _buffersEntryCount)
|
|
{
|
|
return Span<float>.Empty;
|
|
}
|
|
|
|
unsafe
|
|
{
|
|
return new Span<float>((float*)_buffersMemoryHandle.Pointer + index * _sampleCount, _sampleCount);
|
|
}
|
|
}
|
|
|
|
public ulong GetTimeElapsedSinceDspStartedProcessing()
|
|
{
|
|
return (ulong)PerformanceCounter.ElapsedNanoseconds - StartTime;
|
|
}
|
|
|
|
public void Process(IHardwareDevice outputDevice)
|
|
{
|
|
OutputDevice = outputDevice;
|
|
|
|
StartTime = (ulong)PerformanceCounter.ElapsedNanoseconds;
|
|
|
|
foreach (ICommand command in Commands)
|
|
{
|
|
if (command.Enabled)
|
|
{
|
|
bool shouldMeter = command.ShouldMeter();
|
|
|
|
long startTime = 0;
|
|
|
|
if (shouldMeter)
|
|
{
|
|
startTime = PerformanceCounter.ElapsedNanoseconds;
|
|
}
|
|
|
|
command.Process(this);
|
|
|
|
if (shouldMeter)
|
|
{
|
|
ulong effectiveElapsedTime = (ulong)(PerformanceCounter.ElapsedNanoseconds - startTime);
|
|
|
|
if (effectiveElapsedTime > command.EstimatedProcessingTime)
|
|
{
|
|
Logger.Warning?.Print(LogClass.AudioRenderer, $"Command {command.GetType().Name} took {effectiveElapsedTime}ns (expected {command.EstimatedProcessingTime}ns)");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
EndTime = (ulong)PerformanceCounter.ElapsedNanoseconds;
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
GC.SuppressFinalize(this);
|
|
_buffersMemoryHandle.Dispose();
|
|
}
|
|
}
|
|
}
|