From f556c80d0230056335632b60c71f1567e177239e Mon Sep 17 00:00:00 2001 From: Mary Date: Fri, 26 Feb 2021 01:11:56 +0100 Subject: Haydn: Part 1 (#2007) * Haydn: Part 1 Based on my reverse of audio 11.0.0. As always, core implementation under LGPLv3 for the same reasons as for Amadeus. This place the bases of a more flexible audio system while making audout & audin accurate. This have the following improvements: - Complete reimplementation of audout and audin. - Audin currently only have a dummy backend. - Dramatically reduce CPU usage by up to 50% in common cases (SoundIO and OpenAL). - Audio Renderer now can output to 5.1 devices when supported. - Audio Renderer init its backend on demand instead of keeping two up all the time. - All backends implementation are now in their own project. - Ryujinx.Audio.Renderer was renamed Ryujinx.Audio and was refactored because of this. As a note, games having issues with OpenAL haven't improved and will not because of OpenAL design (stopping when buffers finish playing causing possible audio "pops" when buffers are very small). * Update for latest hexkyz's edits on Switchbrew * audren: Rollback channel configuration changes * Address gdkchan's comments * Fix typo in OpenAL backend driver * Address last comments * Fix a nit * Address gdkchan's comments --- Ryujinx.Audio.Renderer/Device/VirtualDevice.cs | 84 ---------------------- .../Device/VirtualDeviceSession.cs | 44 ------------ .../Device/VirtualDeviceSessionRegistry.cs | 79 -------------------- 3 files changed, 207 deletions(-) delete mode 100644 Ryujinx.Audio.Renderer/Device/VirtualDevice.cs delete mode 100644 Ryujinx.Audio.Renderer/Device/VirtualDeviceSession.cs delete mode 100644 Ryujinx.Audio.Renderer/Device/VirtualDeviceSessionRegistry.cs (limited to 'Ryujinx.Audio.Renderer/Device') diff --git a/Ryujinx.Audio.Renderer/Device/VirtualDevice.cs b/Ryujinx.Audio.Renderer/Device/VirtualDevice.cs deleted file mode 100644 index 29395e5c..00000000 --- a/Ryujinx.Audio.Renderer/Device/VirtualDevice.cs +++ /dev/null @@ -1,84 +0,0 @@ -// -// Copyright (c) 2019-2021 Ryujinx -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with this program. If not, see . -// - -using System.Diagnostics; - -namespace Ryujinx.Audio.Renderer.Device -{ - /// - /// Represents a virtual device used by IAudioDevice. - /// - public class VirtualDevice - { - /// - /// All the defined virtual devices. - /// - public static readonly VirtualDevice[] Devices = new VirtualDevice[4] - { - new VirtualDevice("AudioStereoJackOutput", 2), - new VirtualDevice("AudioBuiltInSpeakerOutput", 2), - new VirtualDevice("AudioTvOutput", 6), - new VirtualDevice("AudioUsbDeviceOutput", 2), - }; - - /// - /// The name of the . - /// - public string Name { get; } - - /// - /// The count of channels supported by the . - /// - public uint ChannelCount { get; } - - /// - /// The system master volume of the . - /// - public float MasterVolume { get; private set; } - - /// - /// Create a new instance. - /// - /// The name of the . - /// The count of channels supported by the . - private VirtualDevice(string name, uint channelCount) - { - Name = name; - ChannelCount = channelCount; - } - - /// - /// Update the master volume of the . - /// - /// The new master volume. - public void UpdateMasterVolume(float volume) - { - Debug.Assert(volume >= 0.0f && volume <= 1.0f); - - MasterVolume = volume; - } - - /// - /// Check if the is a usb device. - /// - /// Returns true if the is a usb device. - public bool IsUsbDevice() - { - return Name.Equals("AudioUsbDeviceOutput"); - } - } -} diff --git a/Ryujinx.Audio.Renderer/Device/VirtualDeviceSession.cs b/Ryujinx.Audio.Renderer/Device/VirtualDeviceSession.cs deleted file mode 100644 index b2669418..00000000 --- a/Ryujinx.Audio.Renderer/Device/VirtualDeviceSession.cs +++ /dev/null @@ -1,44 +0,0 @@ -// -// Copyright (c) 2019-2021 Ryujinx -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with this program. If not, see . -// - -namespace Ryujinx.Audio.Renderer.Device -{ - /// - /// Represents a virtual device session used by IAudioDevice. - /// - public class VirtualDeviceSession - { - /// - /// The associated to this session. - /// - public VirtualDevice Device { get; } - - /// - /// The user volume of this session. - /// - public float Volume { get; set; } - - /// - /// Create a new instance. - /// - /// The associated to this session. - public VirtualDeviceSession(VirtualDevice virtualDevice) - { - Device = virtualDevice; - } - } -} diff --git a/Ryujinx.Audio.Renderer/Device/VirtualDeviceSessionRegistry.cs b/Ryujinx.Audio.Renderer/Device/VirtualDeviceSessionRegistry.cs deleted file mode 100644 index ed6806b2..00000000 --- a/Ryujinx.Audio.Renderer/Device/VirtualDeviceSessionRegistry.cs +++ /dev/null @@ -1,79 +0,0 @@ -// -// Copyright (c) 2019-2021 Ryujinx -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with this program. If not, see . -// - -using System.Collections.Generic; - -namespace Ryujinx.Audio.Renderer.Device -{ - /// - /// Represent an instance containing a registry of . - /// - public class VirtualDeviceSessionRegistry - { - /// - /// The session registry, used to store the sessions of a given AppletResourceId. - /// - private Dictionary _sessionsRegistry = new Dictionary(); - - /// - /// The default . - /// - /// This is used when the USB device is the default one on older revision. - public VirtualDevice DefaultDevice => VirtualDevice.Devices[0]; - - /// - /// The current active . - /// - // TODO: make this configurable - public VirtualDevice ActiveDevice = VirtualDevice.Devices[1]; - - /// - /// Get the associated from an AppletResourceId. - /// - /// The AppletResourceId used. - /// The associated from an AppletResourceId. - public VirtualDeviceSession[] GetSessionByAppletResourceId(ulong resourceAppletId) - { - if (_sessionsRegistry.TryGetValue(resourceAppletId, out VirtualDeviceSession[] result)) - { - return result; - } - - result = CreateSessionsFromBehaviourContext(); - - _sessionsRegistry.Add(resourceAppletId, result); - - return result; - } - - /// - /// Create a new array of sessions for each . - /// - /// A new array of sessions for each . - private static VirtualDeviceSession[] CreateSessionsFromBehaviourContext() - { - VirtualDeviceSession[] virtualDeviceSession = new VirtualDeviceSession[VirtualDevice.Devices.Length]; - - for (int i = 0; i < virtualDeviceSession.Length; i++) - { - virtualDeviceSession[i] = new VirtualDeviceSession(VirtualDevice.Devices[i]); - } - - return virtualDeviceSession; - } - } -} -- cgit v1.2.3