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/Parameter/Sink | |
| 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/Parameter/Sink')
| -rw-r--r-- | Ryujinx.Audio.Renderer/Parameter/Sink/CircularBufferParameter.cs | 78 | ||||
| -rw-r--r-- | Ryujinx.Audio.Renderer/Parameter/Sink/DeviceParameter.cs | 75 |
2 files changed, 0 insertions, 153 deletions
diff --git a/Ryujinx.Audio.Renderer/Parameter/Sink/CircularBufferParameter.cs b/Ryujinx.Audio.Renderer/Parameter/Sink/CircularBufferParameter.cs deleted file mode 100644 index d688529a..00000000 --- a/Ryujinx.Audio.Renderer/Parameter/Sink/CircularBufferParameter.cs +++ /dev/null @@ -1,78 +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 Ryujinx.Audio.Renderer.Common; -using Ryujinx.Common.Memory; -using System.Runtime.InteropServices; - -using CpuAddress = System.UInt64; - -namespace Ryujinx.Audio.Renderer.Parameter.Sink -{ - /// <summary> - /// <see cref="SinkInParameter.SpecificData"/> for <see cref="SinkType.CircularBuffer"/>. - /// </summary> - [StructLayout(LayoutKind.Sequential, Pack = 1)] - public struct CircularBufferParameter - { - /// <summary> - /// The CPU address of the user circular buffer. - /// </summary> - public CpuAddress BufferAddress; - - /// <summary> - /// The size of the user circular buffer. - /// </summary> - public uint BufferSize; - - /// <summary> - /// The total count of channels to output to the circular buffer. - /// </summary> - public uint InputCount; - - /// <summary> - /// The target sample count to output per update in the circular buffer. - /// </summary> - public uint SampleCount; - - /// <summary> - /// Last read offset on the CPU side. - /// </summary> - public uint LastReadOffset; - - /// <summary> - /// The target <see cref="SampleFormat"/>. - /// </summary> - /// <remarks>Only <see cref="SampleFormat.PcmInt16"/> is supported.</remarks> - public SampleFormat SampleFormat; - - /// <summary> - /// Reserved/padding. - /// </summary> - private unsafe fixed byte _reserved1[3]; - - /// <summary> - /// The input channels index that will be used. - /// </summary> - public Array6<byte> Input; - - /// <summary> - /// Reserved/padding. - /// </summary> - private ushort _reserved2; - } -} diff --git a/Ryujinx.Audio.Renderer/Parameter/Sink/DeviceParameter.cs b/Ryujinx.Audio.Renderer/Parameter/Sink/DeviceParameter.cs deleted file mode 100644 index 591b4945..00000000 --- a/Ryujinx.Audio.Renderer/Parameter/Sink/DeviceParameter.cs +++ /dev/null @@ -1,75 +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 Ryujinx.Common.Memory; -using Ryujinx.Common.Utilities; -using System; -using System.Runtime.InteropServices; - -namespace Ryujinx.Audio.Renderer.Parameter.Sink -{ - /// <summary> - /// <see cref="SinkInParameter.SpecificData"/> for <see cref="Common.SinkType.Device"/>. - /// </summary> - [StructLayout(LayoutKind.Sequential, Pack = 1)] - public struct DeviceParameter - { - /// <summary> - /// Device name storage. - /// </summary> - private DeviceNameStruct _deviceName; - - /// <summary> - /// Reserved/padding. - /// </summary> - private byte _padding; - - /// <summary> - /// The total count of channels to output to the device. - /// </summary> - public uint InputCount; - - /// <summary> - /// The input channels index that will be used. - /// </summary> - public Array6<byte> Input; - - /// <summary> - /// Reserved/padding. - /// </summary> - private byte _reserved; - - /// <summary> - /// Set to true if the user controls Surround to Stereo downmixing coefficients. - /// </summary> - [MarshalAs(UnmanagedType.I1)] - public bool DownMixParameterEnabled; - - /// <summary> - /// The user Surround to Stereo downmixing coefficients. - /// </summary> - public Array4<float> DownMixParameter; - - [StructLayout(LayoutKind.Sequential, Size = 0xFF, Pack = 1)] - private struct DeviceNameStruct { } - - /// <summary> - /// The output device name. - /// </summary> - public Span<byte> DeviceName => SpanHelpers.AsSpan<DeviceNameStruct, byte>(ref _deviceName); - } -} |
