From fb0f3f83c40aefca066c9cd372eed48e9e0332aa Mon Sep 17 00:00:00 2001 From: Logan Stromberg Date: Sat, 4 May 2024 10:43:29 -0700 Subject: [PATCH] Fix opus MS channel count. Explicitly disable native lib probe in OpusCodecFactory. --- src/Ryujinx.Horizon/Sdk/Codec/Detail/HardwareOpusDecoder.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Ryujinx.Horizon/Sdk/Codec/Detail/HardwareOpusDecoder.cs b/src/Ryujinx.Horizon/Sdk/Codec/Detail/HardwareOpusDecoder.cs index 0028977820..76dcf3c357 100644 --- a/src/Ryujinx.Horizon/Sdk/Codec/Detail/HardwareOpusDecoder.cs +++ b/src/Ryujinx.Horizon/Sdk/Codec/Detail/HardwareOpusDecoder.cs @@ -48,6 +48,7 @@ namespace Ryujinx.Horizon.Sdk.Codec.Detail public Decoder(int sampleRate, int channelsCount) { + OpusCodecFactory.AttemptToUseNativeLibrary = false; _decoder = OpusCodecFactory.CreateDecoder(sampleRate, channelsCount); } @@ -81,11 +82,11 @@ namespace Ryujinx.Horizon.Sdk.Codec.Detail private readonly IOpusMultiStreamDecoder _decoder; public int SampleRate => _decoder.SampleRate; - public int ChannelsCount { get; } + public int ChannelsCount => _decoder.NumChannels; public MultiSampleDecoder(int sampleRate, int channelsCount, int streams, int coupledStreams, byte[] mapping) { - ChannelsCount = channelsCount; + OpusCodecFactory.AttemptToUseNativeLibrary = false; _decoder = OpusCodecFactory.CreateMultiStreamDecoder(sampleRate, channelsCount, streams, coupledStreams, mapping); }