mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-06-02 13:18:46 +02:00
ead9a25141
* - 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>
176 lines
4.9 KiB
C#
176 lines
4.9 KiB
C#
using Ryujinx.Audio;
|
|
using Ryujinx.Audio.Integration;
|
|
using Ryujinx.Audio.Renderer.Server;
|
|
using Ryujinx.Common.Memory;
|
|
using Ryujinx.Horizon.Common;
|
|
using Ryujinx.Horizon.Sdk.Sf;
|
|
using Ryujinx.Horizon.Sdk.Sf.Hipc;
|
|
using System;
|
|
using System.Buffers;
|
|
|
|
namespace Ryujinx.Horizon.Sdk.Audio.Detail
|
|
{
|
|
partial class AudioRenderer : IAudioRenderer, IDisposable
|
|
{
|
|
private readonly AudioRenderSystem _renderSystem;
|
|
private int _workBufferHandle;
|
|
private int _processHandle;
|
|
|
|
public AudioRenderer(AudioRenderSystem renderSystem, int workBufferHandle, int processHandle)
|
|
{
|
|
_renderSystem = renderSystem;
|
|
_workBufferHandle = workBufferHandle;
|
|
_processHandle = processHandle;
|
|
}
|
|
|
|
[CmifCommand(0)]
|
|
public Result GetSampleRate(out int sampleRate)
|
|
{
|
|
sampleRate = (int)_renderSystem.GetSampleRate();
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
[CmifCommand(1)]
|
|
public Result GetSampleCount(out int sampleCount)
|
|
{
|
|
sampleCount = (int)_renderSystem.GetSampleCount();
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
[CmifCommand(2)]
|
|
public Result GetMixBufferCount(out int mixBufferCount)
|
|
{
|
|
mixBufferCount = (int)_renderSystem.GetMixBufferCount();
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
[CmifCommand(3)]
|
|
public Result GetState(out int state)
|
|
{
|
|
state = _renderSystem.IsActive() ? 0 : 1;
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
[CmifCommand(4)]
|
|
public Result RequestUpdate(
|
|
[Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Memory<byte> output,
|
|
[Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Memory<byte> performanceOutput,
|
|
[Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySequence<byte> input)
|
|
{
|
|
Result result = new Result((int)_renderSystem.Update(output, performanceOutput, input));
|
|
|
|
return result;
|
|
}
|
|
|
|
[CmifCommand(5)]
|
|
public Result Start()
|
|
{
|
|
_renderSystem.Start();
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
[CmifCommand(6)]
|
|
public Result Stop()
|
|
{
|
|
_renderSystem.Stop();
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
[CmifCommand(7)]
|
|
public Result QuerySystemEvent([CopyHandle] out int eventHandle)
|
|
{
|
|
ResultCode rc = _renderSystem.QuerySystemEvent(out IWritableEvent systemEvent);
|
|
|
|
eventHandle = 0;
|
|
|
|
if (rc == ResultCode.Success && systemEvent is AudioEvent audioEvent)
|
|
{
|
|
eventHandle = audioEvent.GetReadableHandle();
|
|
}
|
|
|
|
return new Result((int)rc);
|
|
}
|
|
|
|
[CmifCommand(8)]
|
|
public Result SetRenderingTimeLimit(int percent)
|
|
{
|
|
_renderSystem.SetRenderingTimeLimitPercent((uint)percent);
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
[CmifCommand(9)]
|
|
public Result GetRenderingTimeLimit(out int percent)
|
|
{
|
|
percent = (int)_renderSystem.GetRenderingTimeLimit();
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
[CmifCommand(10)] // 3.0.0+
|
|
public Result RequestUpdateAuto(
|
|
[Buffer(HipcBufferFlags.Out | HipcBufferFlags.AutoSelect)] Memory<byte> output,
|
|
[Buffer(HipcBufferFlags.Out | HipcBufferFlags.AutoSelect)] Memory<byte> performanceOutput,
|
|
[Buffer(HipcBufferFlags.In | HipcBufferFlags.AutoSelect)] ReadOnlySequence<byte> input)
|
|
{
|
|
return RequestUpdate(output, performanceOutput, input);
|
|
}
|
|
|
|
[CmifCommand(11)] // 3.0.0+
|
|
public Result ExecuteAudioRendererRendering()
|
|
{
|
|
return new Result((int)_renderSystem.ExecuteAudioRendererRendering());
|
|
}
|
|
|
|
[CmifCommand(12)] // 15.0.0+
|
|
public Result SetVoiceDropParameter(float voiceDropParameter)
|
|
{
|
|
_renderSystem.SetVoiceDropParameter(voiceDropParameter);
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
[CmifCommand(13)] // 15.0.0+
|
|
public Result GetVoiceDropParameter(out float voiceDropParameter)
|
|
{
|
|
voiceDropParameter = _renderSystem.GetVoiceDropParameter();
|
|
|
|
return Result.Success;
|
|
}
|
|
|
|
protected virtual void Dispose(bool disposing)
|
|
{
|
|
if (disposing)
|
|
{
|
|
_renderSystem.Dispose();
|
|
|
|
if (_workBufferHandle != 0)
|
|
{
|
|
HorizonStatic.Syscall.CloseHandle(_workBufferHandle);
|
|
|
|
_workBufferHandle = 0;
|
|
}
|
|
|
|
if (_processHandle != 0)
|
|
{
|
|
HorizonStatic.Syscall.CloseHandle(_processHandle);
|
|
|
|
_processHandle = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
Dispose(disposing: true);
|
|
GC.SuppressFinalize(this);
|
|
}
|
|
}
|
|
}
|