* - WritableRegion: enable wrapping IMemoryOwner<byte> - IVirtualMemoryManager impls of GetWritableRegion() use pooled memory when region is non-contiguous. - IVirtualMemoryManager: add GetReadOnlySequence() and impls - ByteMemoryPool: add new method RentCopy() - ByteMemoryPool: make class static, remove ctor and singleton field from earlier impl * - BytesReadOnlySequenceSegment: move from Ryujinx.Common.Memory to Ryujinx.Memory - BytesReadOnlySequenceSegment: add IsContiguousWith() and Replace() methods - VirtualMemoryManagerBase: - remove generic type parameters, instead use ulong for virtual addresses and nuint for host/physical addresses - implement IWritableBlock - add virtual GetReadOnlySequence() with coalescing of contiguous segments - add virtual GetSpan() - add virtual GetWritableRegion() - add abstract IsMapped() - add virtual MapForeign(ulong, nuint, ulong) - add virtual Read<T>() - add virtual Read(ulong, Span<byte>) - add virtual ReadTracked<T>() - add virtual SignalMemoryTracking() - add virtual Write() - add virtual Write<T>() - add virtual WriteUntracked() - add virtual WriteWithRedundancyCheck() - VirtualMemoryManagerRefCountedBase: remove generic type parameters - AddressSpaceManager: remove redundant methods, add required overrides - HvMemoryManager: remove redundant methods, add required overrides, add overrides for _invalidAccessHandler handling - MemoryManager: remove redundant methods, add required overrides, add overrides for _invalidAccessHandler handling - MemoryManagerHostMapped: remove redundant methods, add required overrides, add overrides for _invalidAccessHandler handling - NativeMemoryManager: add get properties for Pointer and Length - throughout: removed invalid <inheritdoc/> comments * - WritableRegion: enable wrapping IMemoryOwner<byte> - IVirtualMemoryManager impls of GetWritableRegion() use pooled memory when region is non-contiguous. - IVirtualMemoryManager: add GetReadOnlySequence() and impls - ByteMemoryPool: add new method RentCopy() - ByteMemoryPool: make class static, remove ctor and singleton field from earlier impl * add PagedMemoryRange enumerator types, use them in IVirtualMemoryManager implementations to consolidate page-handling logic and add a new capability - the coalescing of pages for consolidating memory copies and segmentation. * new: more tests for PagedMemoryRangeCoalescingEnumerator showing coalescing of contiguous segments * make some struct properties readonly * put braces around `foreach` bodies * encourage inlining of some PagedMemoryRange*Enumerator members * DynamicRingBuffer: - use ByteMemoryPool - make some methods return without locking when size/count argument = 0 - make generic Read<T>()/Write<T>() non-generic because its only usage is as T = byte - change Read(byte[]...) to Read(Span<byte>...) - change Write(byte[]...) to Write(Span<byte>...) * change IAudioRenderer.RequestUpdate() to take a ReadOnlySequence<byte>, enabling zero-copy audio rendering * HipcGenerator: support ReadOnlySequence<byte> as IPC method parameter * change IAudioRenderer/AudioRenderer RequestUpdate* methods to take input as ReadOnlySequence<byte> * MemoryManagerHostTracked: use rented memory when contiguous in `GetWritableRegion()` * rebase cleanup * dotnet format fixes * format and comment fixes * format long parameter list - take 2 * - add support to HipcGenerator for buffers of type `Memory<byte>` - change `AudioRenderer` `RequestUpdate()` and `RequestUpdateAuto()` to use Memory<byte> for output buffers, removing another memory block allocation/copy * SplitterContext `UpdateState()` and `UpdateData()` smooth out advance/rewind logic, only rewind if magic is invalid * DynamicRingBuffer.Write(): change Span<byte> to ReadOnlySpan<byte>
110 lines
3.6 KiB
C#
110 lines
3.6 KiB
C#
using Ryujinx.Audio.Renderer.Common;
|
|
using Ryujinx.Audio.Renderer.Parameter;
|
|
using Ryujinx.Audio.Renderer.Parameter.Sink;
|
|
using Ryujinx.Audio.Renderer.Server.MemoryPool;
|
|
using System.Diagnostics;
|
|
using System.Runtime.InteropServices;
|
|
|
|
namespace Ryujinx.Audio.Renderer.Server.Sink
|
|
{
|
|
/// <summary>
|
|
/// Server information for a circular buffer sink.
|
|
/// </summary>
|
|
public class CircularBufferSink : BaseSink
|
|
{
|
|
/// <summary>
|
|
/// The circular buffer parameter.
|
|
/// </summary>
|
|
public CircularBufferParameter Parameter;
|
|
|
|
/// <summary>
|
|
/// The last written data offset on the circular buffer.
|
|
/// </summary>
|
|
private uint _lastWrittenOffset;
|
|
|
|
/// <summary>
|
|
/// THe previous written offset of the circular buffer.
|
|
/// </summary>
|
|
private uint _oldWrittenOffset;
|
|
|
|
/// <summary>
|
|
/// The current offset to write data on the circular buffer.
|
|
/// </summary>
|
|
public uint CurrentWriteOffset { get; private set; }
|
|
|
|
/// <summary>
|
|
/// The <see cref="AddressInfo"/> of the circular buffer.
|
|
/// </summary>
|
|
public AddressInfo CircularBufferAddressInfo;
|
|
|
|
public CircularBufferSink()
|
|
{
|
|
CircularBufferAddressInfo = AddressInfo.Create();
|
|
}
|
|
|
|
public override SinkType TargetSinkType => SinkType.CircularBuffer;
|
|
|
|
public override void Update(out BehaviourParameter.ErrorInfo errorInfo, in SinkInParameter parameter, ref SinkOutStatus outStatus, PoolMapper mapper)
|
|
{
|
|
errorInfo = new BehaviourParameter.ErrorInfo();
|
|
outStatus = new SinkOutStatus();
|
|
|
|
Debug.Assert(IsTypeValid(in parameter));
|
|
|
|
ref CircularBufferParameter inputDeviceParameter = ref MemoryMarshal.Cast<byte, CircularBufferParameter>(parameter.SpecificData)[0];
|
|
|
|
if (parameter.IsUsed != IsUsed || ShouldSkip)
|
|
{
|
|
UpdateStandardParameter(in parameter);
|
|
|
|
if (parameter.IsUsed)
|
|
{
|
|
Debug.Assert(CircularBufferAddressInfo.CpuAddress == 0);
|
|
Debug.Assert(CircularBufferAddressInfo.GetReference(false) == 0);
|
|
|
|
ShouldSkip = !mapper.TryAttachBuffer(out errorInfo, ref CircularBufferAddressInfo, inputDeviceParameter.BufferAddress, inputDeviceParameter.BufferSize);
|
|
}
|
|
else
|
|
{
|
|
Debug.Assert(CircularBufferAddressInfo.CpuAddress != 0);
|
|
Debug.Assert(CircularBufferAddressInfo.GetReference(false) != 0);
|
|
}
|
|
|
|
Parameter = inputDeviceParameter;
|
|
}
|
|
|
|
outStatus.LastWrittenOffset = _lastWrittenOffset;
|
|
}
|
|
|
|
public override void UpdateForCommandGeneration()
|
|
{
|
|
Debug.Assert(Type == TargetSinkType);
|
|
|
|
if (IsUsed)
|
|
{
|
|
uint frameSize = Constants.TargetSampleSize * Parameter.SampleCount * Parameter.InputCount;
|
|
|
|
_lastWrittenOffset = _oldWrittenOffset;
|
|
|
|
_oldWrittenOffset = CurrentWriteOffset;
|
|
|
|
CurrentWriteOffset += frameSize;
|
|
|
|
if (Parameter.BufferSize > 0)
|
|
{
|
|
CurrentWriteOffset %= Parameter.BufferSize;
|
|
}
|
|
}
|
|
}
|
|
|
|
public override void CleanUp()
|
|
{
|
|
CircularBufferAddressInfo = AddressInfo.Create();
|
|
_lastWrittenOffset = 0;
|
|
_oldWrittenOffset = 0;
|
|
CurrentWriteOffset = 0;
|
|
base.CleanUp();
|
|
}
|
|
}
|
|
}
|