From cd2c1d67d953eadb85be5f826bca3f4b7f546b5a Mon Sep 17 00:00:00 2001 From: Jim Horvath <38920027+jhorv@users.noreply.github.com> Date: Fri, 23 Feb 2024 20:34:50 -0500 Subject: [PATCH] change IAudioRenderer/AudioRenderer RequestUpdate* methods to take input as ReadOnlySequence --- src/Ryujinx.Horizon/Sdk/Audio/Detail/AudioRenderer.cs | 6 +++--- src/Ryujinx.Horizon/Sdk/Audio/Detail/IAudioRenderer.cs | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Ryujinx.Horizon/Sdk/Audio/Detail/AudioRenderer.cs b/src/Ryujinx.Horizon/Sdk/Audio/Detail/AudioRenderer.cs index 776df641ac..5206955c5c 100644 --- a/src/Ryujinx.Horizon/Sdk/Audio/Detail/AudioRenderer.cs +++ b/src/Ryujinx.Horizon/Sdk/Audio/Detail/AudioRenderer.cs @@ -59,7 +59,7 @@ namespace Ryujinx.Horizon.Sdk.Audio.Detail public Result RequestUpdate( [Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Span output, [Buffer(HipcBufferFlags.Out | HipcBufferFlags.MapAlias)] Span performanceOutput, - [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySpan input) + [Buffer(HipcBufferFlags.In | HipcBufferFlags.MapAlias)] ReadOnlySequence input) { using IMemoryOwner outputOwner = ByteMemoryPool.Rent(output.Length); using IMemoryOwner performanceOutputOwner = ByteMemoryPool.Rent(performanceOutput.Length); @@ -70,7 +70,7 @@ namespace Ryujinx.Horizon.Sdk.Audio.Detail using MemoryHandle outputHandle = outputMemory.Pin(); using MemoryHandle performanceOutputHandle = performanceOutputMemory.Pin(); - Result result = new Result((int)_renderSystem.Update(outputMemory, performanceOutputMemory, input.ToArray())); + Result result = new Result((int)_renderSystem.Update(outputMemory, performanceOutputMemory, input)); outputMemory.Span.CopyTo(output); performanceOutputMemory.Span.CopyTo(performanceOutput); @@ -129,7 +129,7 @@ namespace Ryujinx.Horizon.Sdk.Audio.Detail public Result RequestUpdateAuto( [Buffer(HipcBufferFlags.Out | HipcBufferFlags.AutoSelect)] Span output, [Buffer(HipcBufferFlags.Out | HipcBufferFlags.AutoSelect)] Span performanceOutput, - [Buffer(HipcBufferFlags.In | HipcBufferFlags.AutoSelect)] ReadOnlySpan input) + [Buffer(HipcBufferFlags.In | HipcBufferFlags.AutoSelect)] ReadOnlySequence input) { return RequestUpdate(output, performanceOutput, input); } diff --git a/src/Ryujinx.Horizon/Sdk/Audio/Detail/IAudioRenderer.cs b/src/Ryujinx.Horizon/Sdk/Audio/Detail/IAudioRenderer.cs index e4ca2e8ec4..9730093286 100644 --- a/src/Ryujinx.Horizon/Sdk/Audio/Detail/IAudioRenderer.cs +++ b/src/Ryujinx.Horizon/Sdk/Audio/Detail/IAudioRenderer.cs @@ -1,6 +1,7 @@ using Ryujinx.Horizon.Common; using Ryujinx.Horizon.Sdk.Sf; using System; +using System.Buffers; namespace Ryujinx.Horizon.Sdk.Audio.Detail { @@ -10,13 +11,13 @@ namespace Ryujinx.Horizon.Sdk.Audio.Detail Result GetSampleCount(out int sampleCount); Result GetMixBufferCount(out int mixBufferCount); Result GetState(out int state); - Result RequestUpdate(Span output, Span performanceOutput, ReadOnlySpan input); + Result RequestUpdate(Span output, Span performanceOutput, ReadOnlySequence input); Result Start(); Result Stop(); Result QuerySystemEvent(out int eventHandle); Result SetRenderingTimeLimit(int percent); Result GetRenderingTimeLimit(out int percent); - Result RequestUpdateAuto(Span output, Span performanceOutput, ReadOnlySpan input); + Result RequestUpdateAuto(Span output, Span performanceOutput, ReadOnlySequence input); Result ExecuteAudioRendererRendering(); Result SetVoiceDropParameter(float voiceDropParameter); Result GetVoiceDropParameter(out float voiceDropParameter);