From 2adf6f845bd983807c0e81aafca95830412cabe5 Mon Sep 17 00:00:00 2001 From: Thog Date: Fri, 11 Oct 2019 03:17:23 +0200 Subject: [PATCH] Sample rate shouldn't be hardcoded MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fix issues while opening Pokémon Let's Go pause menu. --- .../HardwareOpusDecoderManager/IHardwareOpusDecoder.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Ryujinx.HLE/HOS/Services/Audio/HardwareOpusDecoderManager/IHardwareOpusDecoder.cs b/Ryujinx.HLE/HOS/Services/Audio/HardwareOpusDecoderManager/IHardwareOpusDecoder.cs index bc6d5d77e8..6210851954 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/HardwareOpusDecoderManager/IHardwareOpusDecoder.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/HardwareOpusDecoderManager/IHardwareOpusDecoder.cs @@ -1,7 +1,6 @@ using Concentus; using Concentus.Enums; using Concentus.Structs; -using Ryujinx.Common; using Ryujinx.HLE.HOS.Services.Audio.Types; using System; using System.IO; @@ -11,8 +10,6 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager { class IHardwareOpusDecoder : IpcService { - private const int FixedSampleRate = 48000; - private int _sampleRate; private int _channelsCount; private bool _reset; @@ -25,12 +22,12 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager _channelsCount = channelsCount; _reset = false; - _decoder = new OpusDecoder(FixedSampleRate, channelsCount); + _decoder = new OpusDecoder(sampleRate, channelsCount); } private ResultCode GetPacketNumSamples(out int numSamples, byte[] packet) { - int result = OpusPacketInfo.GetNumSamples(packet, 0, packet.Length, _sampleRate); + int result = OpusPacketInfo.GetNumSamples(_decoder, packet, 0, packet.Length); numSamples = result;