audio: sdl2: Do not report 5.1 if the device doesn't support it (#4908)
* amadeus: adjust VirtualDevice channel configuration reporting with HardwareDevice * audio: sdl2: Do not report 5.1 if device doesn't support it SDL2 5.1 to Stereo conversion is terrible and make everything sound quiet. Let's not expose 5.1 if not truly supported by the device.
This commit is contained in:
parent
f679f25e08
commit
880fd3cfcb
4 changed files with 47 additions and 3 deletions
|
@ -5,6 +5,7 @@ using Ryujinx.Memory;
|
||||||
using Ryujinx.SDL2.Common;
|
using Ryujinx.SDL2.Common;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
||||||
using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
|
using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
|
||||||
|
@ -18,6 +19,13 @@ namespace Ryujinx.Audio.Backends.SDL2
|
||||||
private readonly ManualResetEvent _pauseEvent;
|
private readonly ManualResetEvent _pauseEvent;
|
||||||
private readonly ConcurrentDictionary<SDL2HardwareDeviceSession, byte> _sessions;
|
private readonly ConcurrentDictionary<SDL2HardwareDeviceSession, byte> _sessions;
|
||||||
|
|
||||||
|
private bool _supportSurroundConfiguration;
|
||||||
|
|
||||||
|
// TODO: Add this to SDL2-CS
|
||||||
|
// NOTE: We use a DllImport here because of marshaling issue for spec.
|
||||||
|
[DllImport("SDL2")]
|
||||||
|
private static extern int SDL_GetDefaultAudioInfo(IntPtr name, out SDL_AudioSpec spec, int isCapture);
|
||||||
|
|
||||||
public SDL2HardwareDeviceDriver()
|
public SDL2HardwareDeviceDriver()
|
||||||
{
|
{
|
||||||
_updateRequiredEvent = new ManualResetEvent(false);
|
_updateRequiredEvent = new ManualResetEvent(false);
|
||||||
|
@ -25,6 +33,20 @@ namespace Ryujinx.Audio.Backends.SDL2
|
||||||
_sessions = new ConcurrentDictionary<SDL2HardwareDeviceSession, byte>();
|
_sessions = new ConcurrentDictionary<SDL2HardwareDeviceSession, byte>();
|
||||||
|
|
||||||
SDL2Driver.Instance.Initialize();
|
SDL2Driver.Instance.Initialize();
|
||||||
|
|
||||||
|
int res = SDL_GetDefaultAudioInfo(IntPtr.Zero, out var spec, 0);
|
||||||
|
|
||||||
|
if (res != 0)
|
||||||
|
{
|
||||||
|
Logger.Error?.Print(LogClass.Application,
|
||||||
|
$"SDL_GetDefaultAudioInfo failed with error \"{SDL_GetError()}\"");
|
||||||
|
|
||||||
|
_supportSurroundConfiguration = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_supportSurroundConfiguration = spec.channels == 6;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool IsSupported => IsSupportedInternal();
|
public static bool IsSupported => IsSupportedInternal();
|
||||||
|
@ -164,6 +186,11 @@ namespace Ryujinx.Audio.Backends.SDL2
|
||||||
|
|
||||||
public bool SupportsChannelCount(uint channelCount)
|
public bool SupportsChannelCount(uint channelCount)
|
||||||
{
|
{
|
||||||
|
if (channelCount == 6)
|
||||||
|
{
|
||||||
|
return _supportSurroundConfiguration;
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ namespace Ryujinx.Audio.Renderer.Device
|
||||||
/// <param name="name">The name of the <see cref="VirtualDevice"/>.</param>
|
/// <param name="name">The name of the <see cref="VirtualDevice"/>.</param>
|
||||||
/// <param name="channelCount">The count of channels supported by the <see cref="VirtualDevice"/>.</param>
|
/// <param name="channelCount">The count of channels supported by the <see cref="VirtualDevice"/>.</param>
|
||||||
/// <param name="isExternalOutput">Indicate if the <see cref="VirtualDevice"/> is provided by an external interface.</param>
|
/// <param name="isExternalOutput">Indicate if the <see cref="VirtualDevice"/> is provided by an external interface.</param>
|
||||||
private VirtualDevice(string name, uint channelCount, bool isExternalOutput)
|
public VirtualDevice(string name, uint channelCount, bool isExternalOutput)
|
||||||
{
|
{
|
||||||
Name = name;
|
Name = name;
|
||||||
ChannelCount = channelCount;
|
ChannelCount = channelCount;
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
using Ryujinx.Audio.Integration;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
||||||
namespace Ryujinx.Audio.Renderer.Device
|
namespace Ryujinx.Audio.Renderer.Device
|
||||||
|
@ -22,7 +23,23 @@ namespace Ryujinx.Audio.Renderer.Device
|
||||||
/// The current active <see cref="VirtualDevice"/>.
|
/// The current active <see cref="VirtualDevice"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
// TODO: make this configurable
|
// TODO: make this configurable
|
||||||
public VirtualDevice ActiveDevice = VirtualDevice.Devices[2];
|
public VirtualDevice ActiveDevice { get; }
|
||||||
|
|
||||||
|
public VirtualDeviceSessionRegistry(IHardwareDeviceDriver driver)
|
||||||
|
{
|
||||||
|
uint channelCount;
|
||||||
|
|
||||||
|
if (driver.GetRealDeviceDriver().SupportsChannelCount(6))
|
||||||
|
{
|
||||||
|
channelCount = 6;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
channelCount = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
ActiveDevice = new VirtualDevice("AudioTvOutput", channelCount, false);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the associated <see cref="T:VirtualDeviceSession[]"/> from an AppletResourceId.
|
/// Get the associated <see cref="T:VirtualDeviceSession[]"/> from an AppletResourceId.
|
||||||
|
|
|
@ -261,7 +261,7 @@ namespace Ryujinx.HLE.HOS
|
||||||
AudioInputManager = new AudioInputManager();
|
AudioInputManager = new AudioInputManager();
|
||||||
AudioRendererManager = new AudioRendererManager(tickSource);
|
AudioRendererManager = new AudioRendererManager(tickSource);
|
||||||
AudioRendererManager.SetVolume(Device.Configuration.AudioVolume);
|
AudioRendererManager.SetVolume(Device.Configuration.AudioVolume);
|
||||||
AudioDeviceSessionRegistry = new VirtualDeviceSessionRegistry();
|
AudioDeviceSessionRegistry = new VirtualDeviceSessionRegistry(Device.AudioDeviceDriver);
|
||||||
|
|
||||||
IWritableEvent[] audioOutputRegisterBufferEvents = new IWritableEvent[Constants.AudioOutSessionCountMax];
|
IWritableEvent[] audioOutputRegisterBufferEvents = new IWritableEvent[Constants.AudioOutSessionCountMax];
|
||||||
|
|
||||||
|
|
Reference in a new issue