diff options
| author | Mary <me@thog.eu> | 2021-02-26 01:11:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-26 01:11:56 +0100 |
| commit | f556c80d0230056335632b60c71f1567e177239e (patch) | |
| tree | 748aa6be62b93a8e941e25dbd83f39e1dbb37035 /Ryujinx.Audio.Renderer/Device | |
| parent | 1c49089ff00fc87dc4872f135dc6a0d36169a970 (diff) | |
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
Diffstat (limited to 'Ryujinx.Audio.Renderer/Device')
| -rw-r--r-- | Ryujinx.Audio.Renderer/Device/VirtualDevice.cs | 84 | ||||
| -rw-r--r-- | Ryujinx.Audio.Renderer/Device/VirtualDeviceSession.cs | 44 | ||||
| -rw-r--r-- | Ryujinx.Audio.Renderer/Device/VirtualDeviceSessionRegistry.cs | 79 |
3 files changed, 0 insertions, 207 deletions
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 <https://www.gnu.org/licenses/>. -// - -using System.Diagnostics; - -namespace Ryujinx.Audio.Renderer.Device -{ - /// <summary> - /// Represents a virtual device used by IAudioDevice. - /// </summary> - public class VirtualDevice - { - /// <summary> - /// All the defined virtual devices. - /// </summary> - public static readonly VirtualDevice[] Devices = new VirtualDevice[4] - { - new VirtualDevice("AudioStereoJackOutput", 2), - new VirtualDevice("AudioBuiltInSpeakerOutput", 2), - new VirtualDevice("AudioTvOutput", 6), - new VirtualDevice("AudioUsbDeviceOutput", 2), - }; - - /// <summary> - /// The name of the <see cref="VirtualDevice"/>. - /// </summary> - public string Name { get; } - - /// <summary> - /// The count of channels supported by the <see cref="VirtualDevice"/>. - /// </summary> - public uint ChannelCount { get; } - - /// <summary> - /// The system master volume of the <see cref="VirtualDevice"/>. - /// </summary> - public float MasterVolume { get; private set; } - - /// <summary> - /// Create a new <see cref="VirtualDevice"/> instance. - /// </summary> - /// <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> - private VirtualDevice(string name, uint channelCount) - { - Name = name; - ChannelCount = channelCount; - } - - /// <summary> - /// Update the master volume of the <see cref="VirtualDevice"/>. - /// </summary> - /// <param name="volume">The new master volume.</param> - public void UpdateMasterVolume(float volume) - { - Debug.Assert(volume >= 0.0f && volume <= 1.0f); - - MasterVolume = volume; - } - - /// <summary> - /// Check if the <see cref="VirtualDevice"/> is a usb device. - /// </summary> - /// <returns>Returns true if the <see cref="VirtualDevice"/> is a usb device.</returns> - 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 <https://www.gnu.org/licenses/>. -// - -namespace Ryujinx.Audio.Renderer.Device -{ - /// <summary> - /// Represents a virtual device session used by IAudioDevice. - /// </summary> - public class VirtualDeviceSession - { - /// <summary> - /// The <see cref="VirtualDevice"/> associated to this session. - /// </summary> - public VirtualDevice Device { get; } - - /// <summary> - /// The user volume of this session. - /// </summary> - public float Volume { get; set; } - - /// <summary> - /// Create a new <see cref="VirtualDeviceSession"/> instance. - /// </summary> - /// <param name="virtualDevice">The <see cref="VirtualDevice"/> associated to this session.</param> - 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 <https://www.gnu.org/licenses/>. -// - -using System.Collections.Generic; - -namespace Ryujinx.Audio.Renderer.Device -{ - /// <summary> - /// Represent an instance containing a registry of <see cref="VirtualDeviceSession"/>. - /// </summary> - public class VirtualDeviceSessionRegistry - { - /// <summary> - /// The session registry, used to store the sessions of a given AppletResourceId. - /// </summary> - private Dictionary<ulong, VirtualDeviceSession[]> _sessionsRegistry = new Dictionary<ulong, VirtualDeviceSession[]>(); - - /// <summary> - /// The default <see cref="VirtualDevice"/>. - /// </summary> - /// <remarks>This is used when the USB device is the default one on older revision.</remarks> - public VirtualDevice DefaultDevice => VirtualDevice.Devices[0]; - - /// <summary> - /// The current active <see cref="VirtualDevice"/>. - /// </summary> - // TODO: make this configurable - public VirtualDevice ActiveDevice = VirtualDevice.Devices[1]; - - /// <summary> - /// Get the associated <see cref="T:VirtualDeviceSession[]"/> from an AppletResourceId. - /// </summary> - /// <param name="resourceAppletId">The AppletResourceId used.</param> - /// <returns>The associated <see cref="T:VirtualDeviceSession[]"/> from an AppletResourceId.</returns> - public VirtualDeviceSession[] GetSessionByAppletResourceId(ulong resourceAppletId) - { - if (_sessionsRegistry.TryGetValue(resourceAppletId, out VirtualDeviceSession[] result)) - { - return result; - } - - result = CreateSessionsFromBehaviourContext(); - - _sessionsRegistry.Add(resourceAppletId, result); - - return result; - } - - /// <summary> - /// Create a new array of sessions for each <see cref="VirtualDevice"/>. - /// </summary> - /// <returns>A new array of sessions for each <see cref="VirtualDevice"/>.</returns> - 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; - } - } -} |
