aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager
diff options
context:
space:
mode:
authorgdkchan <gab.dark.100@gmail.com>2020-05-03 19:54:50 -0300
committerGitHub <noreply@github.com>2020-05-04 08:54:50 +1000
commitf77694e4f774c9391aad5344e70a7c8721cfedc6 (patch)
tree36bccaeb153bd5d921c751966b8a734a7b4b6ae1 /Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager
parent1758424208335d1f4ff7c27c554e517c81bf72f6 (diff)
Implement a new physical memory manager and replace DeviceMemory (#856)
* Implement a new physical memory manager and replace DeviceMemory * Proper generic constraints * Fix debug build * Add memory tests * New CPU memory manager and general code cleanup * Remove host memory management from CPU project, use Ryujinx.Memory instead * Fix tests * Document exceptions on MemoryBlock * Fix leak on unix memory allocation * Proper disposal of some objects on tests * Fix JitCache not being set as initialized * GetRef without checks for 8-bits and 16-bits CAS * Add MemoryBlock destructor * Throw in separate method to improve codegen * Address PR feedback * QueryModified improvements * Fix memory write tracking not marking all pages as modified in some cases * Simplify MarkRegionAsModified * Remove XML doc for ghost param * Add back optimization to avoid useless buffer updates * Add Ryujinx.Cpu project, move MemoryManager there and remove MemoryBlockWrapper * Some nits * Do not perform address translation when size is 0 * Address PR feedback and format NativeInterface class * Remove ghost parameter description * Update Ryujinx.Cpu to .NET Core 3.1 * Address PR feedback * Fix build * Return a well defined value for GetPhysicalAddress with invalid VA, and do not return unmapped ranges as modified * Typo
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager')
-rw-r--r--Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioDevice.cs16
-rw-r--r--Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioRenderer.cs4
-rw-r--r--Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/VoiceContext.cs10
3 files changed, 18 insertions, 12 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioDevice.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioDevice.cs
index ab4aee76..89c064e3 100644
--- a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioDevice.cs
+++ b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioDevice.cs
@@ -44,7 +44,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
break;
}
- context.Memory.WriteBytes(position, buffer);
+ context.Memory.Write((ulong)position, buffer);
position += buffer.Length;
}
@@ -61,7 +61,9 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
long position = context.Request.SendBuff[0].Position;
long size = context.Request.SendBuff[0].Size;
- byte[] deviceNameBuffer = context.Memory.ReadBytes(position, size);
+ byte[] deviceNameBuffer = new byte[size];
+
+ context.Memory.Read((ulong)position, deviceNameBuffer);
string deviceName = Encoding.ASCII.GetString(deviceNameBuffer);
@@ -83,7 +85,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
if ((ulong)deviceNameBuffer.Length <= (ulong)size)
{
- context.Memory.WriteBytes(position, deviceNameBuffer);
+ context.Memory.Write((ulong)position, deviceNameBuffer);
}
else
{
@@ -143,7 +145,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
break;
}
- context.Memory.WriteBytes(position, buffer);
+ context.Memory.Write((ulong)position, buffer);
position += buffer.Length;
}
@@ -159,7 +161,9 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
(long position, long size) = context.Request.GetBufferType0x21();
- byte[] deviceNameBuffer = context.Memory.ReadBytes(position, size);
+ byte[] deviceNameBuffer = new byte[size];
+
+ context.Memory.Read((ulong)position, deviceNameBuffer);
string deviceName = Encoding.UTF8.GetString(deviceNameBuffer);
@@ -191,7 +195,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
if ((ulong)deviceNameBuffer.Length <= (ulong)size)
{
- context.Memory.WriteBytes(position, deviceNameBuffer);
+ context.Memory.Write((ulong)position, deviceNameBuffer);
}
else
{
diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioRenderer.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioRenderer.cs
index b9f1d8df..e899f945 100644
--- a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioRenderer.cs
+++ b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioRenderer.cs
@@ -1,7 +1,7 @@
-using ARMeilleure.Memory;
using Ryujinx.Audio;
using Ryujinx.Audio.Adpcm;
using Ryujinx.Common.Logging;
+using Ryujinx.Cpu;
using Ryujinx.HLE.HOS.Ipc;
using Ryujinx.HLE.HOS.Kernel.Common;
using Ryujinx.HLE.HOS.Kernel.Threading;
@@ -333,7 +333,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
for (int offset = 0; offset < size; offset += 2)
{
- context.Coefficients[offset >> 1] = _memory.ReadInt16(position + offset);
+ context.Coefficients[offset >> 1] = _memory.Read<short>((ulong)(position + offset));
}
return context;
diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/VoiceContext.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/VoiceContext.cs
index 4af04ee0..c14c46b3 100644
--- a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/VoiceContext.cs
+++ b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/VoiceContext.cs
@@ -1,5 +1,5 @@
-using ARMeilleure.Memory;
using Ryujinx.Audio.Adpcm;
+using Ryujinx.Cpu;
using System;
namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
@@ -146,7 +146,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
{
for (int index = 0; index < samplesCount; index++)
{
- short sample = memory.ReadInt16(wb.Position + index * 2);
+ short sample = memory.Read<short>((ulong)(wb.Position + index * 2));
_samples[index * 2 + 0] = sample;
_samples[index * 2 + 1] = sample;
@@ -156,13 +156,15 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
{
for (int index = 0; index < samplesCount * 2; index++)
{
- _samples[index] = memory.ReadInt16(wb.Position + index * 2);
+ _samples[index] = memory.Read<short>((ulong)(wb.Position + index * 2));
}
}
}
else if (SampleFormat == SampleFormat.Adpcm)
{
- byte[] buffer = memory.ReadBytes(wb.Position, wb.Size);
+ byte[] buffer = new byte[wb.Size];
+
+ memory.Read((ulong)wb.Position, buffer);
_samples = AdpcmDecoder.Decode(buffer, AdpcmCtx);
}