diff options
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Audio')
6 files changed, 50 insertions, 28 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioOutManager/IAudioOut.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioOutManager/IAudioOut.cs index 11d8036c..e6b7cb3d 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/AudioOutManager/IAudioOut.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/AudioOutManager/IAudioOut.cs @@ -1,5 +1,5 @@ -using ARMeilleure.Memory; using Ryujinx.Audio; +using Ryujinx.Cpu; using Ryujinx.HLE.HOS.Ipc; using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Kernel.Threading; @@ -106,9 +106,9 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOutManager context.Memory, position); - byte[] buffer = context.Memory.ReadBytes( - data.SampleBufferPtr, - data.SampleBufferSize); + byte[] buffer = new byte[data.SampleBufferSize]; + + context.Memory.Read((ulong)data.SampleBufferPtr, buffer); _audioOut.AppendBuffer(_track, tag, buffer); @@ -139,7 +139,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOutManager tag = releasedBuffers[index]; } - context.Memory.WriteInt64(position + index * 8, tag); + context.Memory.Write((ulong)(position + index * 8), tag); } context.ResponseData.Write(releasedBuffers.Length); 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); } diff --git a/Ryujinx.HLE/HOS/Services/Audio/HardwareOpusDecoderManager/IHardwareOpusDecoder.cs b/Ryujinx.HLE/HOS/Services/Audio/HardwareOpusDecoderManager/IHardwareOpusDecoder.cs index 079f2ae7..e8fcc4b6 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/HardwareOpusDecoderManager/IHardwareOpusDecoder.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/HardwareOpusDecoderManager/IHardwareOpusDecoder.cs @@ -111,7 +111,11 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager long outputPosition = context.Request.ReceiveBuff[0].Position; long outputSize = context.Request.ReceiveBuff[0].Size; - using (BinaryReader inputStream = new BinaryReader(new MemoryStream(context.Memory.ReadBytes(inPosition, inSize)))) + byte[] buffer = new byte[inSize]; + + context.Memory.Read((ulong)inPosition, buffer); + + using (BinaryReader inputStream = new BinaryReader(new MemoryStream(buffer))) { result = DecodeInterleavedInternal(inputStream, out short[] outPcmData, outputSize, out uint outConsumed, out int outSamples); @@ -119,7 +123,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager { byte[] pcmDataBytes = new byte[outPcmData.Length * sizeof(short)]; Buffer.BlockCopy(outPcmData, 0, pcmDataBytes, 0, pcmDataBytes.Length); - context.Memory.WriteBytes(outputPosition, pcmDataBytes); + context.Memory.Write((ulong)outputPosition, pcmDataBytes); context.ResponseData.Write(outConsumed); context.ResponseData.Write(outSamples); @@ -140,7 +144,11 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager long outputPosition = context.Request.ReceiveBuff[0].Position; long outputSize = context.Request.ReceiveBuff[0].Size; - using (BinaryReader inputStream = new BinaryReader(new MemoryStream(context.Memory.ReadBytes(inPosition, inSize)))) + byte[] buffer = new byte[inSize]; + + context.Memory.Read((ulong)inPosition, buffer); + + using (BinaryReader inputStream = new BinaryReader(new MemoryStream(buffer))) { result = DecodeInterleavedInternal(inputStream, out short[] outPcmData, outputSize, out uint outConsumed, out int outSamples); @@ -148,7 +156,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager { byte[] pcmDataBytes = new byte[outPcmData.Length * sizeof(short)]; Buffer.BlockCopy(outPcmData, 0, pcmDataBytes, 0, pcmDataBytes.Length); - context.Memory.WriteBytes(outputPosition, pcmDataBytes); + context.Memory.Write((ulong)outputPosition, pcmDataBytes); context.ResponseData.Write(outConsumed); context.ResponseData.Write(outSamples); @@ -174,7 +182,11 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager long outputPosition = context.Request.ReceiveBuff[0].Position; long outputSize = context.Request.ReceiveBuff[0].Size; - using (BinaryReader inputStream = new BinaryReader(new MemoryStream(context.Memory.ReadBytes(inPosition, inSize)))) + byte[] buffer = new byte[inSize]; + + context.Memory.Read((ulong)inPosition, buffer); + + using (BinaryReader inputStream = new BinaryReader(new MemoryStream(buffer))) { result = DecodeInterleavedInternal(inputStream, out short[] outPcmData, outputSize, out uint outConsumed, out int outSamples); @@ -182,7 +194,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager { byte[] pcmDataBytes = new byte[outPcmData.Length * sizeof(short)]; Buffer.BlockCopy(outPcmData, 0, pcmDataBytes, 0, pcmDataBytes.Length); - context.Memory.WriteBytes(outputPosition, pcmDataBytes); + context.Memory.Write((ulong)outputPosition, pcmDataBytes); context.ResponseData.Write(outConsumed); context.ResponseData.Write(outSamples); @@ -208,7 +220,11 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager long outputPosition = context.Request.ReceiveBuff[0].Position; long outputSize = context.Request.ReceiveBuff[0].Size; - using (BinaryReader inputStream = new BinaryReader(new MemoryStream(context.Memory.ReadBytes(inPosition, inSize)))) + byte[] buffer = new byte[inSize]; + + context.Memory.Read((ulong)inPosition, buffer); + + using (BinaryReader inputStream = new BinaryReader(new MemoryStream(buffer))) { result = DecodeInterleavedInternal(inputStream, out short[] outPcmData, outputSize, out uint outConsumed, out int outSamples); @@ -216,7 +232,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager { byte[] pcmDataBytes = new byte[outPcmData.Length * sizeof(short)]; Buffer.BlockCopy(outPcmData, 0, pcmDataBytes, 0, pcmDataBytes.Length); - context.Memory.WriteBytes(outputPosition, pcmDataBytes); + context.Memory.Write((ulong)outputPosition, pcmDataBytes); context.ResponseData.Write(outConsumed); context.ResponseData.Write(outSamples); diff --git a/Ryujinx.HLE/HOS/Services/Audio/IAudioOutManager.cs b/Ryujinx.HLE/HOS/Services/Audio/IAudioOutManager.cs index 19ee8067..370b2302 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/IAudioOutManager.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/IAudioOutManager.cs @@ -1,6 +1,6 @@ -using ARMeilleure.Memory; using Ryujinx.Audio; using Ryujinx.Common.Logging; +using Ryujinx.Cpu; using Ryujinx.HLE.HOS.Kernel.Threading; using Ryujinx.HLE.HOS.Services.Audio.AudioOutManager; using System.Text; @@ -72,7 +72,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio if ((ulong)deviceNameBuffer.Length <= (ulong)size) { - context.Memory.WriteBytes(position, deviceNameBuffer); + context.Memory.Write((ulong)position, deviceNameBuffer); nameCount++; } @@ -109,7 +109,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio if ((ulong)deviceNameBuffer.Length <= (ulong)receiveSize) { - context.Memory.WriteBytes(receivePosition, deviceNameBuffer); + context.Memory.Write((ulong)receivePosition, deviceNameBuffer); } else { |