* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2208 warnings * Address or silence dotnet format CA1806 and a few CA1854 warnings * Address dotnet format CA2211 warnings * Address dotnet format CA1822 warnings * Address or silence dotnet format CA1069 warnings * Make dotnet format succeed in style mode * Address or silence dotnet format CA2211 warnings * Address review comments * Address dotnet format CA2208 warnings properly * Make ProcessResult readonly * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Add previously silenced warnings back I have no clue how these disappeared * Revert formatting changes for while and for-loops * Format if-blocks correctly * Run dotnet format style after rebase * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix a few disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Run dotnet format after rebase * Use using declaration instead of block syntax * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Fix typo * Add trailing commas, use targeted new and use array initializer * Fix build issues * Fix remaining build issues * Remove SuppressMessage for CA1069 where possible * Address dotnet format issues * Address formatting issues Co-authored-by: Ac_K <acoustik666@gmail.com> * Add GetHashCode implementation for RenderingSurfaceInfo * Explicitly silence CA1822 for every affected method in Syscall * Address formatting issues in Demangler.cs * Address review feedback Co-authored-by: Ac_K <acoustik666@gmail.com> * Revert marking service methods as static * Next dotnet format pass * Address review feedback --------- Co-authored-by: Ac_K <acoustik666@gmail.com>
116 lines
4.9 KiB
C#
116 lines
4.9 KiB
C#
using Ryujinx.HLE.HOS.Services.Audio.Types;
|
|
using System;
|
|
using System.Runtime.InteropServices;
|
|
|
|
namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager
|
|
{
|
|
class IHardwareOpusDecoder : IpcService
|
|
{
|
|
private readonly IDecoder _decoder;
|
|
private readonly OpusDecoderFlags _flags;
|
|
|
|
public IHardwareOpusDecoder(int sampleRate, int channelsCount, OpusDecoderFlags flags)
|
|
{
|
|
_decoder = new Decoder(sampleRate, channelsCount);
|
|
_flags = flags;
|
|
}
|
|
|
|
public IHardwareOpusDecoder(int sampleRate, int channelsCount, int streams, int coupledStreams, OpusDecoderFlags flags, byte[] mapping)
|
|
{
|
|
_decoder = new MultiSampleDecoder(sampleRate, channelsCount, streams, coupledStreams, mapping);
|
|
_flags = flags;
|
|
}
|
|
|
|
[CommandCmif(0)]
|
|
// DecodeInterleavedOld(buffer<unknown, 5>) -> (u32, u32, buffer<unknown, 6>)
|
|
public ResultCode DecodeInterleavedOld(ServiceCtx context)
|
|
{
|
|
return DecodeInterleavedInternal(context, OpusDecoderFlags.None, reset: false, withPerf: false);
|
|
}
|
|
|
|
[CommandCmif(2)]
|
|
// DecodeInterleavedForMultiStreamOld(buffer<unknown, 5>) -> (u32, u32, buffer<unknown, 6>)
|
|
public ResultCode DecodeInterleavedForMultiStreamOld(ServiceCtx context)
|
|
{
|
|
return DecodeInterleavedInternal(context, OpusDecoderFlags.None, reset: false, withPerf: false);
|
|
}
|
|
|
|
[CommandCmif(4)] // 6.0.0+
|
|
// DecodeInterleavedWithPerfOld(buffer<unknown, 5>) -> (u32, u32, u64, buffer<unknown, 0x46>)
|
|
public ResultCode DecodeInterleavedWithPerfOld(ServiceCtx context)
|
|
{
|
|
return DecodeInterleavedInternal(context, OpusDecoderFlags.None, reset: false, withPerf: true);
|
|
}
|
|
|
|
[CommandCmif(5)] // 6.0.0+
|
|
// DecodeInterleavedForMultiStreamWithPerfOld(buffer<unknown, 5>) -> (u32, u32, u64, buffer<unknown, 0x46>)
|
|
public ResultCode DecodeInterleavedForMultiStreamWithPerfOld(ServiceCtx context)
|
|
{
|
|
return DecodeInterleavedInternal(context, OpusDecoderFlags.None, reset: false, withPerf: true);
|
|
}
|
|
|
|
[CommandCmif(6)] // 6.0.0+
|
|
// DecodeInterleavedWithPerfAndResetOld(bool reset, buffer<unknown, 5>) -> (u32, u32, u64, buffer<unknown, 0x46>)
|
|
public ResultCode DecodeInterleavedWithPerfAndResetOld(ServiceCtx context)
|
|
{
|
|
bool reset = context.RequestData.ReadBoolean();
|
|
|
|
return DecodeInterleavedInternal(context, OpusDecoderFlags.None, reset, withPerf: true);
|
|
}
|
|
|
|
[CommandCmif(7)] // 6.0.0+
|
|
// DecodeInterleavedForMultiStreamWithPerfAndResetOld(bool reset, buffer<unknown, 5>) -> (u32, u32, u64, buffer<unknown, 0x46>)
|
|
public ResultCode DecodeInterleavedForMultiStreamWithPerfAndResetOld(ServiceCtx context)
|
|
{
|
|
bool reset = context.RequestData.ReadBoolean();
|
|
|
|
return DecodeInterleavedInternal(context, OpusDecoderFlags.None, reset, withPerf: true);
|
|
}
|
|
|
|
[CommandCmif(8)] // 7.0.0+
|
|
// DecodeInterleaved(bool reset, buffer<unknown, 0x45>) -> (u32, u32, u64, buffer<unknown, 0x46>)
|
|
public ResultCode DecodeInterleaved(ServiceCtx context)
|
|
{
|
|
bool reset = context.RequestData.ReadBoolean();
|
|
|
|
return DecodeInterleavedInternal(context, _flags, reset, withPerf: true);
|
|
}
|
|
|
|
[CommandCmif(9)] // 7.0.0+
|
|
// DecodeInterleavedForMultiStream(bool reset, buffer<unknown, 0x45>) -> (u32, u32, u64, buffer<unknown, 0x46>)
|
|
public ResultCode DecodeInterleavedForMultiStream(ServiceCtx context)
|
|
{
|
|
bool reset = context.RequestData.ReadBoolean();
|
|
|
|
return DecodeInterleavedInternal(context, _flags, reset, withPerf: true);
|
|
}
|
|
|
|
private ResultCode DecodeInterleavedInternal(ServiceCtx context, OpusDecoderFlags flags, bool reset, bool withPerf)
|
|
{
|
|
ulong inPosition = context.Request.SendBuff[0].Position;
|
|
ulong inSize = context.Request.SendBuff[0].Size;
|
|
ulong outputPosition = context.Request.ReceiveBuff[0].Position;
|
|
ulong outputSize = context.Request.ReceiveBuff[0].Size;
|
|
|
|
ReadOnlySpan<byte> input = context.Memory.GetSpan(inPosition, (int)inSize);
|
|
|
|
ResultCode result = _decoder.DecodeInterleaved(reset, input, out short[] outPcmData, outputSize, out uint outConsumed, out int outSamples);
|
|
|
|
if (result == ResultCode.Success)
|
|
{
|
|
context.Memory.Write(outputPosition, MemoryMarshal.Cast<short, byte>(outPcmData.AsSpan()));
|
|
|
|
context.ResponseData.Write(outConsumed);
|
|
context.ResponseData.Write(outSamples);
|
|
|
|
if (withPerf)
|
|
{
|
|
// This is the time the DSP took to process the request, TODO: fill this.
|
|
context.ResponseData.Write(0UL);
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
}
|
|
}
|