diff options
author | Mary-nyan <mary@mary.zone> | 2022-11-28 08:28:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-28 08:28:45 +0100 |
commit | dff138229c79483c189be6f3829ed88a5f95575d (patch) | |
tree | 2e5c37fdc4c6dcd44ad3a0a294885d8d81bed91d /Ryujinx.Audio/Renderer/Dsp/Command | |
parent | 472119c8da7edaf7bf60fa75e87812e5cb16e33b (diff) |
amadeus: Fixes and initial 15.0.0 support (#3908)1.1.394
* amadeus: Allow OOB read of GC-ADPCM coefficients
Fixes "Ninja Gaiden Sigma 2" and possibly "NINJA GAIDEN 3: Razor's Edge"
* amadeus: Fix wrong variable usage in delay effect
We should transform the delay line values, not the input.
* amadeus: Update GroupedBiquadFilterCommand documentation
* amadeus: Simplify PoolMapper alignment checks
* amadeus: Update Surround delay effect matrix to REV11
* amadeus: Add drop parameter support and use 32 bits integers for estimate time
Also implement accurate ExecuteAudioRendererRendering stub.
* Address gdkchan's comments
* Address gdkchan's other comments
* Address gdkchan's comment
Diffstat (limited to 'Ryujinx.Audio/Renderer/Dsp/Command')
28 files changed, 44 insertions, 45 deletions
diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/AdpcmDataSourceCommandVersion1.cs b/Ryujinx.Audio/Renderer/Dsp/Command/AdpcmDataSourceCommandVersion1.cs index 1ad629f4..1fe6069f 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/AdpcmDataSourceCommandVersion1.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/AdpcmDataSourceCommandVersion1.cs @@ -13,7 +13,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.AdpcmDataSourceVersion1; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ushort OutputBufferIndex { get; } public uint SampleRate { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/AuxiliaryBufferCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/AuxiliaryBufferCommand.cs index cfa5400c..5c3c0324 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/AuxiliaryBufferCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/AuxiliaryBufferCommand.cs @@ -16,7 +16,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.AuxiliaryBuffer; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public uint InputBufferIndex { get; } public uint OutputBufferIndex { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterCommand.cs index e35911b2..b994c1cb 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/BiquadFilterCommand.cs @@ -12,7 +12,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.BiquadFilter; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public Memory<BiquadFilterState> BiquadFilterState { get; } public int InputBufferIndex { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/CaptureBufferCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/CaptureBufferCommand.cs index ab1ea77d..da1cb254 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/CaptureBufferCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/CaptureBufferCommand.cs @@ -16,7 +16,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.CaptureBuffer; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public uint InputBufferIndex { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/CircularBufferSinkCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/CircularBufferSinkCommand.cs index 27cd6e84..e50637eb 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/CircularBufferSinkCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/CircularBufferSinkCommand.cs @@ -12,7 +12,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.CircularBufferSink; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ushort[] Input { get; } public uint InputCount { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/ClearMixBufferCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/ClearMixBufferCommand.cs index c3530db1..9e653e80 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/ClearMixBufferCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/ClearMixBufferCommand.cs @@ -8,7 +8,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.ClearMixBuffer; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ClearMixBufferCommand(int nodeId) { diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/CopyMixBufferCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/CopyMixBufferCommand.cs index 64c297d1..7237fddf 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/CopyMixBufferCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/CopyMixBufferCommand.cs @@ -8,7 +8,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.CopyMixBuffer; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ushort InputBufferIndex { get; } public ushort OutputBufferIndex { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/DataSourceVersion2Command.cs b/Ryujinx.Audio/Renderer/Dsp/Command/DataSourceVersion2Command.cs index f602262e..c1503b6a 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/DataSourceVersion2Command.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/DataSourceVersion2Command.cs @@ -13,7 +13,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType { get; } - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ushort OutputBufferIndex { get; } public uint SampleRate { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/DelayCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/DelayCommand.cs index 8f11da95..cb5678c7 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/DelayCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/DelayCommand.cs @@ -17,7 +17,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.Delay; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public DelayParameter Parameter => _parameter; public Memory<DelayState> State { get; } @@ -49,15 +49,15 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command OutputBufferIndices[i] = (ushort)(bufferOffset + Parameter.Output[i]); } - // NOTE: We do the opposite as Nintendo here for now to restore previous behaviour - // TODO: Update delay processing and remove this to use RemapLegacyChannelEffectMappingToChannelResourceMapping. - DataSourceHelper.RemapChannelResourceMappingToLegacy(newEffectChannelMappingSupported, InputBufferIndices); - DataSourceHelper.RemapChannelResourceMappingToLegacy(newEffectChannelMappingSupported, OutputBufferIndices); + DataSourceHelper.RemapLegacyChannelEffectMappingToChannelResourceMapping(newEffectChannelMappingSupported, InputBufferIndices); + DataSourceHelper.RemapLegacyChannelEffectMappingToChannelResourceMapping(newEffectChannelMappingSupported, OutputBufferIndices); } [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] private unsafe void ProcessDelayMono(ref DelayState state, float* outputBuffer, float* inputBuffer, uint sampleCount) { + const ushort channelCount = 1; + float feedbackGain = FixedPointHelper.ToFloat(Parameter.FeedbackGain, FixedPointPrecision); float inGain = FixedPointHelper.ToFloat(Parameter.InGain, FixedPointPrecision); float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision); @@ -70,7 +70,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command float temp = input * inGain + delayLineValue * feedbackGain; - state.UpdateLowPassFilter(ref temp, 1); + state.UpdateLowPassFilter(ref temp, channelCount); outputBuffer[i] = (input * dryGain + delayLineValue * outGain) / 64; } @@ -104,7 +104,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command Y = state.DelayLines[1].Read(), }; - Vector2 temp = MatrixHelper.Transform(ref channelInput, ref delayFeedback) + channelInput * inGain; + Vector2 temp = MatrixHelper.Transform(ref delayLineValues, ref delayFeedback) + channelInput * inGain; state.UpdateLowPassFilter(ref Unsafe.As<Vector2, float>(ref temp), channelCount); @@ -148,7 +148,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command W = state.DelayLines[3].Read() }; - Vector4 temp = MatrixHelper.Transform(ref channelInput, ref delayFeedback) + channelInput * inGain; + Vector4 temp = MatrixHelper.Transform(ref delayLineValues, ref delayFeedback) + channelInput * inGain; state.UpdateLowPassFilter(ref Unsafe.As<Vector4, float>(ref temp), channelCount); @@ -171,12 +171,12 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command float dryGain = FixedPointHelper.ToFloat(Parameter.DryGain, FixedPointPrecision); float outGain = FixedPointHelper.ToFloat(Parameter.OutGain, FixedPointPrecision); - Matrix6x6 delayFeedback = new Matrix6x6(delayFeedbackBaseGain, 0.0f, 0.0f, 0.0f, delayFeedbackCrossGain, delayFeedbackCrossGain, - 0.0f, delayFeedbackBaseGain, 0.0f, delayFeedbackCrossGain, delayFeedbackCrossGain, 0.0f, - delayFeedbackCrossGain, 0.0f, delayFeedbackBaseGain, delayFeedbackCrossGain, 0.0f, 0.0f, - 0.0f, delayFeedbackCrossGain, delayFeedbackCrossGain, delayFeedbackBaseGain, 0.0f, 0.0f, - delayFeedbackCrossGain, delayFeedbackCrossGain, 0.0f, 0.0f, delayFeedbackBaseGain, 0.0f, - 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, feedbackGain); + Matrix6x6 delayFeedback = new Matrix6x6(delayFeedbackBaseGain, 0.0f, delayFeedbackCrossGain, 0.0f, delayFeedbackCrossGain, 0.0f, + 0.0f, delayFeedbackBaseGain, delayFeedbackCrossGain, 0.0f, 0.0f, delayFeedbackCrossGain, + delayFeedbackCrossGain, delayFeedbackCrossGain, delayFeedbackBaseGain, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, feedbackGain, 0.0f, 0.0f, + delayFeedbackCrossGain, 0.0f, 0.0f, 0.0f, delayFeedbackBaseGain, delayFeedbackCrossGain, + 0.0f, delayFeedbackCrossGain, 0.0f, 0.0f, delayFeedbackCrossGain, delayFeedbackBaseGain); for (int i = 0; i < sampleCount; i++) { @@ -200,7 +200,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command U = state.DelayLines[5].Read() }; - Vector6 temp = MatrixHelper.Transform(ref channelInput, ref delayFeedback) + channelInput * inGain; + Vector6 temp = MatrixHelper.Transform(ref delayLineValues, ref delayFeedback) + channelInput * inGain; state.UpdateLowPassFilter(ref Unsafe.As<Vector6, float>(ref temp), channelCount); diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/DepopForMixBuffersCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/DepopForMixBuffersCommand.cs index e3a87c10..1dba56e6 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/DepopForMixBuffersCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/DepopForMixBuffersCommand.cs @@ -11,7 +11,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.DepopForMixBuffers; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public uint MixBufferOffset { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/DepopPrepareCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/DepopPrepareCommand.cs index 1e37ff71..d02f7c12 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/DepopPrepareCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/DepopPrepareCommand.cs @@ -11,7 +11,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.DepopPrepare; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public uint MixBufferCount { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/DeviceSinkCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/DeviceSinkCommand.cs index a34fbc56..9c88a4e7 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/DeviceSinkCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/DeviceSinkCommand.cs @@ -14,7 +14,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.DeviceSink; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public string DeviceName { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/DownMixSurroundToStereoCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/DownMixSurroundToStereoCommand.cs index d75da6f9..79cefcc5 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/DownMixSurroundToStereoCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/DownMixSurroundToStereoCommand.cs @@ -11,7 +11,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.DownMixSurroundToStereo; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ushort[] InputBufferIndices { get; } public ushort[] OutputBufferIndices { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/GroupedBiquadFilterCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/GroupedBiquadFilterCommand.cs index ae1ab12c..b190cc10 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/GroupedBiquadFilterCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/GroupedBiquadFilterCommand.cs @@ -12,7 +12,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.GroupedBiquadFilter; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } private BiquadFilterParameter[] _parameters; private Memory<BiquadFilterState> _biquadFilterStates; @@ -47,9 +47,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command } } - // NOTE: Nintendo also implements a hot path for double biquad filters, but no generic path when the command definition suggests it could be done. - // As such we currently only implement a generic path for simplicity. - // TODO: Implement double biquad filters fast path. + // NOTE: Nintendo only implement single and double biquad filters but no generic path when the command definition suggests it could be done. + // As such we currently only implement a generic path for simplicity for double biquad. if (_parameters.Length == 1) { BiquadFilterHelper.ProcessBiquadFilter(ref _parameters[0], ref states[0], outputBuffer, inputBuffer, context.SampleCount); diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/ICommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/ICommand.cs index dddd2511..d281e6e9 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/ICommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/ICommand.cs @@ -8,7 +8,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType { get; } - public ulong EstimatedProcessingTime { get; } + public uint EstimatedProcessingTime { get; } public void Process(CommandList context); diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion1.cs b/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion1.cs index a393c885..9cfef736 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion1.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion1.cs @@ -13,7 +13,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.LimiterVersion1; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public LimiterParameter Parameter => _parameter; public Memory<LimiterState> State { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion2.cs b/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion2.cs index ad703de1..46c95e4f 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion2.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/LimiterCommandVersion2.cs @@ -15,7 +15,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.LimiterVersion2; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public LimiterParameter Parameter => _parameter; public Memory<LimiterState> State { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/MixCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/MixCommand.cs index d5030996..2616bda5 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/MixCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/MixCommand.cs @@ -15,7 +15,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.Mix; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ushort InputBufferIndex { get; } public ushort OutputBufferIndex { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/MixRampCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/MixRampCommand.cs index 06af9f6f..76a1aba2 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/MixRampCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/MixRampCommand.cs @@ -12,7 +12,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.MixRamp; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ushort InputBufferIndex { get; } public ushort OutputBufferIndex { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/MixRampGroupedCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/MixRampGroupedCommand.cs index 97bb0f50..e348e358 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/MixRampGroupedCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/MixRampGroupedCommand.cs @@ -12,7 +12,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.MixRampGrouped; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public uint MixBufferCount { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/PcmFloatDataSourceCommandVersion1.cs b/Ryujinx.Audio/Renderer/Dsp/Command/PcmFloatDataSourceCommandVersion1.cs index 7c48a511..7cec7d2a 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/PcmFloatDataSourceCommandVersion1.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/PcmFloatDataSourceCommandVersion1.cs @@ -13,7 +13,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.PcmFloatDataSourceVersion1; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ushort OutputBufferIndex { get; } public uint SampleRate { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/PcmInt16DataSourceCommandVersion1.cs b/Ryujinx.Audio/Renderer/Dsp/Command/PcmInt16DataSourceCommandVersion1.cs index 8483f6d4..dfe9814f 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/PcmInt16DataSourceCommandVersion1.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/PcmInt16DataSourceCommandVersion1.cs @@ -13,7 +13,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.PcmInt16DataSourceVersion1; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ushort OutputBufferIndex { get; } public uint SampleRate { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/PerformanceCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/PerformanceCommand.cs index c2f94474..d3e3f805 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/PerformanceCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/PerformanceCommand.cs @@ -17,7 +17,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.Performance; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public PerformanceEntryAddresses PerformanceEntryAddresses { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/Reverb3dCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/Reverb3dCommand.cs index 04809245..eeb64567 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/Reverb3dCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/Reverb3dCommand.cs @@ -31,7 +31,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.Reverb3d; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ushort InputBufferIndex { get; } public ushort OutputBufferIndex { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/ReverbCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/ReverbCommand.cs index 130706d1..0a32a065 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/ReverbCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/ReverbCommand.cs @@ -34,7 +34,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.Reverb; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ReverbParameter Parameter => _parameter; public Memory<ReverbState> State { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/UpsampleCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/UpsampleCommand.cs index 6df44b32..1617a642 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/UpsampleCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/UpsampleCommand.cs @@ -11,7 +11,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.Upsample; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public uint BufferCount { get; } public uint InputBufferIndex { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/VolumeCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/VolumeCommand.cs index e2947891..0628f6d8 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/VolumeCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/VolumeCommand.cs @@ -15,7 +15,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.Volume; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ushort InputBufferIndex { get; } public ushort OutputBufferIndex { get; } diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/VolumeRampCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/VolumeRampCommand.cs index ffda8b1a..5c0c8845 100644 --- a/Ryujinx.Audio/Renderer/Dsp/Command/VolumeRampCommand.cs +++ b/Ryujinx.Audio/Renderer/Dsp/Command/VolumeRampCommand.cs @@ -11,7 +11,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command public CommandType CommandType => CommandType.VolumeRamp; - public ulong EstimatedProcessingTime { get; set; } + public uint EstimatedProcessingTime { get; set; } public ushort InputBufferIndex { get; } public ushort OutputBufferIndex { get; } |