Mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

audio: Cleanup Ryujinx.Audio and fix OpenAL issue (#1746)

Browse source 
* audio: Cleanup SoundIO and fix OpenAL issue

* fix tabs by spaces

* Fix extra spaces

* Fix SoundIO.cs

* Fix ContainsAudioOutBuffer
This commit is contained in:
Ac_K 2020-11-27 20:55:00 +01:00 committed by GitHub
parent 0108004691
commit 7b66cb0d90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 1459 additions and 1322 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
Ryujinx.Audio/Decoders/Adpcm/AdpcmDecoder.cs
View file

@ -1,91 +0,0 @@
namespace Ryujinx.Audio.Adpcm
{
public static class AdpcmDecoder
{
private const int SamplesPerFrame = 14;
private const int BytesPerFrame = 8;
public static int[] Decode(byte[] Buffer, AdpcmDecoderContext Context)
{
int Samples = GetSamplesCountFromSize(Buffer.Length);
int[] Pcm = new int[Samples * 2];
short History0 = Context.History0;
short History1 = Context.History1;
int InputOffset = 0;
int OutputOffset = 0;
while (InputOffset < Buffer.Length)
{
byte Header = Buffer[InputOffset++];
int Scale = 0x800 << (Header & 0xf);
int CoeffIndex = (Header >> 4) & 7;
short Coeff0 = Context.Coefficients[CoeffIndex * 2 + 0];
short Coeff1 = Context.Coefficients[CoeffIndex * 2 + 1];
int FrameSamples = SamplesPerFrame;
if (FrameSamples > Samples)
{
FrameSamples = Samples;
}
int Value = 0;
for (int SampleIndex = 0; SampleIndex < FrameSamples; SampleIndex++)
{
int Sample;
if ((SampleIndex & 1) == 0)
{
Value = Buffer[InputOffset++];
Sample = (Value << 24) >> 28;
}
else
{
Sample = (Value << 28) >> 28;
}
int Prediction = Coeff0 * History0 + Coeff1 * History1;
Sample = (Sample * Scale + Prediction + 0x400) >> 11;
short SaturatedSample = DspUtils.Saturate(Sample);
History1 = History0;
History0 = SaturatedSample;
Pcm[OutputOffset++] = SaturatedSample;
Pcm[OutputOffset++] = SaturatedSample;
}
Samples -= FrameSamples;
}
Context.History0 = History0;
Context.History1 = History1;
return Pcm;
}
public static long GetSizeFromSamplesCount(int SamplesCount)
{
int Frames = SamplesCount / SamplesPerFrame;
return Frames * BytesPerFrame;
}
public static int GetSamplesCountFromSize(long Size)
{
int Frames = (int)(Size / BytesPerFrame);
return Frames * SamplesPerFrame;
}
}
}

10
Ryujinx.Audio/Decoders/Adpcm/AdpcmDecoderContext.cs
View file

@ -1,10 +0,0 @@
namespace Ryujinx.Audio.Adpcm
{
public class AdpcmDecoderContext
{
public short[] Coefficients;
public short History0;
public short History1;
}
}

18
Ryujinx.Audio/Downmixing.cs
View file

@ -31,20 +31,24 @@ namespace Ryujinx.Audio
private const int Minus6dBInQ15 = (int)(0.501f * RawQ15One); private const int Minus6dBInQ15 = (int)(0.501f * RawQ15One);
private const int Minus12dBInQ15 = (int)(0.251f * RawQ15One); private const int Minus12dBInQ15 = (int)(0.251f * RawQ15One);
private static int[] DefaultSurroundToStereoCoefficients = new int[4] private static readonly int[] DefaultSurroundToStereoCoefficients = new int[4]
{ {
RawQ15One, RawQ15One,
Minus3dBInQ15, Minus3dBInQ15,
Minus12dBInQ15, Minus12dBInQ15,
Minus3dBInQ15, Minus3dBInQ15
}; };
private static int[] DefaultStereoToMonoCoefficients = new int[2] private static readonly int[] DefaultStereoToMonoCoefficients = new int[2]
{ {
Minus6dBInQ15, Minus6dBInQ15,
Minus6dBInQ15, Minus6dBInQ15
}; };
private const int SurroundChannelCount = 6;
private const int StereoChannelCount = 2;
private const int MonoChannelCount = 1;
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static ReadOnlySpan<Channel51FormatPCM16> GetSurroundBuffer(ReadOnlySpan<short> data) private static ReadOnlySpan<Channel51FormatPCM16> GetSurroundBuffer(ReadOnlySpan<short> data)
{ {
@ -72,9 +76,6 @@ namespace Ryujinx.Audio
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static short[] DownMixSurroundToStereo(ReadOnlySpan<int> coefficients, ReadOnlySpan<short> data) private static short[] DownMixSurroundToStereo(ReadOnlySpan<int> coefficients, ReadOnlySpan<short> data)
{ {
const int SurroundChannelCount = 6;
const int StereoChannelCount = 2;
int samplePerChannelCount = data.Length / SurroundChannelCount; int samplePerChannelCount = data.Length / SurroundChannelCount;
short[] downmixedBuffer = new short[samplePerChannelCount * StereoChannelCount]; short[] downmixedBuffer = new short[samplePerChannelCount * StereoChannelCount];
@ -95,9 +96,6 @@ namespace Ryujinx.Audio
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static short[] DownMixStereoToMono(ReadOnlySpan<int> coefficients, ReadOnlySpan<short> data) private static short[] DownMixStereoToMono(ReadOnlySpan<int> coefficients, ReadOnlySpan<short> data)
{ {
const int StereoChannelCount = 2;
const int MonoChannelCount = 1;
int samplePerChannelCount = data.Length / StereoChannelCount; int samplePerChannelCount = data.Length / StereoChannelCount;
short[] downmixedBuffer = new short[samplePerChannelCount * MonoChannelCount]; short[] downmixedBuffer = new short[samplePerChannelCount * MonoChannelCount];

16
Ryujinx.Audio/DspUtils.cs
View file

@ -1,16 +0,0 @@
namespace Ryujinx.Audio
{
public static class DspUtils
{
public static short Saturate(int Value)
{
if (Value > short.MaxValue)
Value = short.MaxValue;
if (Value < short.MinValue)
Value = short.MinValue;
return (short)Value;
}
}
}

16
Ryujinx.Audio/IAalOutput.cs
View file

@ -13,17 +13,13 @@ namespace Ryujinx.Audio
return targetChannelCount; return targetChannelCount;
} }
switch (targetChannelCount) return targetChannelCount switch
{ {
case 6: 6 => SelectHardwareChannelCount(2),
return SelectHardwareChannelCount(2); 2 => SelectHardwareChannelCount(1),
case 2: 1 => throw new ArgumentException("No valid channel configuration found!"),
return SelectHardwareChannelCount(1); _ => throw new ArgumentException($"Invalid targetChannelCount {targetChannelCount}"),
case 1: };
throw new ArgumentException("No valid channel configuration found!");
default:
throw new ArgumentException($"Invalid targetChannelCount {targetChannelCount}");
}
} }
int OpenTrack(int sampleRate, int channels, ReleaseCallback callback) int OpenTrack(int sampleRate, int channels, ReleaseCallback callback)

355
Ryujinx.Audio/Native/libsoundio/SoundIO.cs
View file

@ -8,12 +8,12 @@ namespace SoundIOSharp
{ {
Pointer<SoundIo> handle; Pointer<SoundIo> handle;
public SoundIO () public SoundIO()
{ {
handle = Natives.soundio_create (); handle = Natives.soundio_create();
} }
internal SoundIO (Pointer<SoundIo> handle) internal SoundIO(Pointer<SoundIo> handle)
{ {
this.handle = handle; this.handle = handle;
} }
@ -21,291 +21,366 @@ namespace SoundIOSharp
public void Dispose () public void Dispose ()
{ {
foreach (var h in allocated_hglobals) foreach (var h in allocated_hglobals)
Marshal.FreeHGlobal (h); {
Natives.soundio_destroy (handle); Marshal.FreeHGlobal(h);
}
Natives.soundio_destroy(handle);
} }
// Equality (based on handle) // Equality (based on handle)
public override bool Equals (object other) public override bool Equals(object other)
{ {
var d = other as SoundIO; var d = other as SoundIO;
return d != null && this.handle == d.handle; return d != null && this.handle == d.handle;
} }
public override int GetHashCode () public override int GetHashCode()
{ {
return (int) (IntPtr) handle; return (int)(IntPtr)handle;
} }
public static bool operator == (SoundIO obj1, SoundIO obj2) public static bool operator == (SoundIO obj1, SoundIO obj2)
{ {
return (object)obj1 == null ? (object)obj2 == null : obj1.Equals (obj2); return obj1 is null ? obj2 is null : obj1.Equals(obj2);
} }
public static bool operator != (SoundIO obj1, SoundIO obj2) public static bool operator != (SoundIO obj1, SoundIO obj2)
{ {
return (object)obj1 == null ? (object)obj2 != null : !obj1.Equals (obj2); return obj1 is null ? obj2 is object : !obj1.Equals(obj2);
} }
// fields // fields
// FIXME: this should be taken care in more centralized/decent manner... we don't want to write // FIXME: this should be taken care in more centralized/decent manner... we don't want to write
// this kind of code anywhere we need string marshaling. // this kind of code anywhere we need string marshaling.
List<IntPtr> allocated_hglobals = new List<IntPtr> (); List<IntPtr> allocated_hglobals = new List<IntPtr>();
public string ApplicationName { public string ApplicationName {
get { return Marshal.PtrToStringAnsi (Marshal.ReadIntPtr (handle, app_name_offset)); } get { return Marshal.PtrToStringAnsi(Marshal.ReadIntPtr(handle, app_name_offset)); }
set { set
unsafe { {
var existing = Marshal.ReadIntPtr (handle, app_name_offset); unsafe
if (allocated_hglobals.Contains (existing)) { {
allocated_hglobals.Remove (existing); var existing = Marshal.ReadIntPtr(handle, app_name_offset);
Marshal.FreeHGlobal (existing); if (allocated_hglobals.Contains (existing))
{
allocated_hglobals.Remove(existing);
Marshal.FreeHGlobal(existing);
} }
var ptr = Marshal.StringToHGlobalAnsi (value);
Marshal.WriteIntPtr (handle, app_name_offset, ptr);
allocated_hglobals.Add (ptr);
}
}
}
static readonly int app_name_offset = (int)Marshal.OffsetOf<SoundIo> ("app_name");
public SoundIOBackend CurrentBackend { var ptr = Marshal.StringToHGlobalAnsi(value);
get { return (SoundIOBackend) Marshal.ReadInt32 (handle, current_backend_offset); } Marshal.WriteIntPtr(handle, app_name_offset, ptr);
allocated_hglobals.Add(ptr);
} }
static readonly int current_backend_offset = (int)Marshal.OffsetOf<SoundIo> ("current_backend"); }
}
static readonly int app_name_offset = (int)Marshal.OffsetOf<SoundIo>("app_name");
public SoundIOBackend CurrentBackend
{
get { return (SoundIOBackend)Marshal.ReadInt32(handle, current_backend_offset); }
}
static readonly int current_backend_offset = (int)Marshal.OffsetOf<SoundIo>("current_backend");
// emit_rtprio_warning // emit_rtprio_warning
public Action EmitRealtimePriorityWarning { public Action EmitRealtimePriorityWarning
{
get { return emit_rtprio_warning; } get { return emit_rtprio_warning; }
set { set
{
emit_rtprio_warning = value; emit_rtprio_warning = value;
var ptr = Marshal.GetFunctionPointerForDelegate (on_devices_change);
Marshal.WriteIntPtr (handle, emit_rtprio_warning_offset, ptr); var ptr = Marshal.GetFunctionPointerForDelegate(on_devices_change);
Marshal.WriteIntPtr(handle, emit_rtprio_warning_offset, ptr);
} }
} }
static readonly int emit_rtprio_warning_offset = (int)Marshal.OffsetOf<SoundIo> ("emit_rtprio_warning");
static readonly int emit_rtprio_warning_offset = (int)Marshal.OffsetOf<SoundIo>("emit_rtprio_warning");
Action emit_rtprio_warning; Action emit_rtprio_warning;
// jack_error_callback // jack_error_callback
public Action<string> JackErrorCallback { public Action<string> JackErrorCallback
{
get { return jack_error_callback; } get { return jack_error_callback; }
set { set
{
jack_error_callback = value; jack_error_callback = value;
if (value == null) if (value == null)
{
jack_error_callback = null; jack_error_callback = null;
}
else else
jack_error_callback_native = msg => jack_error_callback (msg); {
var ptr = Marshal.GetFunctionPointerForDelegate (jack_error_callback_native); jack_error_callback_native = msg => jack_error_callback(msg);
Marshal.WriteIntPtr (handle, jack_error_callback_offset, ptr); }
var ptr = Marshal.GetFunctionPointerForDelegate(jack_error_callback_native);
Marshal.WriteIntPtr(handle, jack_error_callback_offset, ptr);
} }
} }
static readonly int jack_error_callback_offset = (int)Marshal.OffsetOf<SoundIo> ("jack_error_callback");
static readonly int jack_error_callback_offset = (int)Marshal.OffsetOf<SoundIo>("jack_error_callback");
Action<string> jack_error_callback; Action<string> jack_error_callback;
delegate void jack_error_delegate (string message); delegate void jack_error_delegate(string message);
jack_error_delegate jack_error_callback_native; jack_error_delegate jack_error_callback_native;
// jack_info_callback // jack_info_callback
public Action<string> JackInfoCallback { public Action<string> JackInfoCallback
{
get { return jack_info_callback; } get { return jack_info_callback; }
set { set
{
jack_info_callback = value; jack_info_callback = value;
if (value == null) if (value == null)
{
jack_info_callback = null; jack_info_callback = null;
}
else else
jack_info_callback_native = msg => jack_info_callback (msg); {
var ptr = Marshal.GetFunctionPointerForDelegate (jack_info_callback_native); jack_info_callback_native = msg => jack_info_callback(msg);
Marshal.WriteIntPtr (handle, jack_info_callback_offset, ptr); }
var ptr = Marshal.GetFunctionPointerForDelegate(jack_info_callback_native);
Marshal.WriteIntPtr(handle, jack_info_callback_offset, ptr);
} }
} }
static readonly int jack_info_callback_offset = (int)Marshal.OffsetOf<SoundIo> ("jack_info_callback");
static readonly int jack_info_callback_offset = (int)Marshal.OffsetOf<SoundIo>("jack_info_callback");
Action<string> jack_info_callback; Action<string> jack_info_callback;
delegate void jack_info_delegate (string message); delegate void jack_info_delegate(string message);
jack_info_delegate jack_info_callback_native; jack_info_delegate jack_info_callback_native;
// on_backend_disconnect // on_backend_disconnect
public Action<int> OnBackendDisconnect { public Action<int> OnBackendDisconnect
{
get { return on_backend_disconnect; } get { return on_backend_disconnect; }
set { set
{
on_backend_disconnect = value; on_backend_disconnect = value;
if (value == null) if (value == null)
{
on_backend_disconnect_native = null; on_backend_disconnect_native = null;
}
else else
on_backend_disconnect_native = (sio, err) => on_backend_disconnect (err); {
var ptr = Marshal.GetFunctionPointerForDelegate (on_backend_disconnect_native); on_backend_disconnect_native = (sio, err) => on_backend_disconnect(err);
Marshal.WriteIntPtr (handle, on_backend_disconnect_offset, ptr); }
var ptr = Marshal.GetFunctionPointerForDelegate(on_backend_disconnect_native);
Marshal.WriteIntPtr(handle, on_backend_disconnect_offset, ptr);
} }
} }
static readonly int on_backend_disconnect_offset = (int)Marshal.OffsetOf<SoundIo> ("on_backend_disconnect");
static readonly int on_backend_disconnect_offset = (int)Marshal.OffsetOf<SoundIo>("on_backend_disconnect");
Action<int> on_backend_disconnect; Action<int> on_backend_disconnect;
delegate void on_backend_disconnect_delegate (IntPtr handle, int errorCode); delegate void on_backend_disconnect_delegate(IntPtr handle, int errorCode);
on_backend_disconnect_delegate on_backend_disconnect_native; on_backend_disconnect_delegate on_backend_disconnect_native;
// on_devices_change // on_devices_change
public Action OnDevicesChange { public Action OnDevicesChange
{
get { return on_devices_change; } get { return on_devices_change; }
set { set
{
on_devices_change = value; on_devices_change = value;
if (value == null) if (value == null)
{
on_devices_change_native = null; on_devices_change_native = null;
}
else else
on_devices_change_native = sio => on_devices_change (); {
var ptr = Marshal.GetFunctionPointerForDelegate (on_devices_change_native); on_devices_change_native = sio => on_devices_change();
Marshal.WriteIntPtr (handle, on_devices_change_offset, ptr); }
var ptr = Marshal.GetFunctionPointerForDelegate(on_devices_change_native);
Marshal.WriteIntPtr(handle, on_devices_change_offset, ptr);
} }
} }
static readonly int on_devices_change_offset = (int)Marshal.OffsetOf<SoundIo> ("on_devices_change");
static readonly int on_devices_change_offset = (int)Marshal.OffsetOf<SoundIo>("on_devices_change");
Action on_devices_change; Action on_devices_change;
delegate void on_devices_change_delegate (IntPtr handle); delegate void on_devices_change_delegate(IntPtr handle);
on_devices_change_delegate on_devices_change_native; on_devices_change_delegate on_devices_change_native;
// on_events_signal // on_events_signal
public Action OnEventsSignal { public Action OnEventsSignal
{
get { return on_events_signal; } get { return on_events_signal; }
set { set
{
on_events_signal = value; on_events_signal = value;
if (value == null) if (value == null)
{
on_events_signal_native = null; on_events_signal_native = null;
}
else else
on_events_signal_native = sio => on_events_signal (); {
var ptr = Marshal.GetFunctionPointerForDelegate (on_events_signal_native); on_events_signal_native = sio => on_events_signal();
Marshal.WriteIntPtr (handle, on_events_signal_offset, ptr); }
var ptr = Marshal.GetFunctionPointerForDelegate(on_events_signal_native);
Marshal.WriteIntPtr(handle, on_events_signal_offset, ptr);
} }
} }
static readonly int on_events_signal_offset = (int)Marshal.OffsetOf<SoundIo> ("on_events_signal");
static readonly int on_events_signal_offset = (int)Marshal.OffsetOf<SoundIo>("on_events_signal");
Action on_events_signal; Action on_events_signal;
delegate void on_events_signal_delegate (IntPtr handle); delegate void on_events_signal_delegate(IntPtr handle);
on_events_signal_delegate on_events_signal_native; on_events_signal_delegate on_events_signal_native;
// functions // functions
public int BackendCount { public int BackendCount
get { return Natives.soundio_backend_count (handle); }
}
public int InputDeviceCount {
get { return Natives.soundio_input_device_count (handle); }
}
public int OutputDeviceCount {
get { return Natives.soundio_output_device_count (handle); }
}
public int DefaultInputDeviceIndex {
get { return Natives.soundio_default_input_device_index (handle); }
}
public int DefaultOutputDeviceIndex {
get { return Natives.soundio_default_output_device_index (handle); }
}
public SoundIOBackend GetBackend (int index)
{ {
return (SoundIOBackend) Natives.soundio_get_backend (handle, index); get { return Natives.soundio_backend_count(handle); }
} }
public SoundIODevice GetInputDevice (int index) public int InputDeviceCount
{ {
return new SoundIODevice (Natives.soundio_get_input_device (handle, index)); get { return Natives.soundio_input_device_count(handle); }
} }
public SoundIODevice GetOutputDevice (int index) public int OutputDeviceCount
{ {
return new SoundIODevice (Natives.soundio_get_output_device (handle, index)); get { return Natives.soundio_output_device_count(handle); }
} }
public void Connect () public int DefaultInputDeviceIndex
{ {
var ret = (SoundIoError) Natives.soundio_connect (handle); get { return Natives.soundio_default_input_device_index(handle); }
}
public int DefaultOutputDeviceIndex
{
get { return Natives.soundio_default_output_device_index(handle); }
}
public SoundIOBackend GetBackend(int index)
{
return (SoundIOBackend)Natives.soundio_get_backend(handle, index);
}
public SoundIODevice GetInputDevice(int index)
{
return new SoundIODevice(Natives.soundio_get_input_device(handle, index));
}
public SoundIODevice GetOutputDevice(int index)
{
return new SoundIODevice(Natives.soundio_get_output_device(handle, index));
}
public void Connect()
{
var ret = (SoundIoError)Natives.soundio_connect(handle);
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
throw new SoundIOException(ret);
}
} }
public void ConnectBackend (SoundIOBackend backend) public void ConnectBackend(SoundIOBackend backend)
{ {
var ret = (SoundIoError) Natives.soundio_connect_backend (handle, (SoundIoBackend) backend); var ret = (SoundIoError)Natives.soundio_connect_backend(handle, (SoundIoBackend)backend);
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
throw new SoundIOException(ret);
}
} }
public void Disconnect () public void Disconnect()
{ {
Natives.soundio_disconnect (handle); Natives.soundio_disconnect(handle);
} }
public void FlushEvents () public void FlushEvents()
{ {
Natives.soundio_flush_events (handle); Natives.soundio_flush_events(handle);
} }
public void WaitEvents () public void WaitEvents()
{ {
Natives.soundio_wait_events (handle); Natives.soundio_wait_events(handle);
} }
public void Wakeup () public void Wakeup()
{ {
Natives.soundio_wakeup (handle); Natives.soundio_wakeup(handle);
} }
public void ForceDeviceScan () public void ForceDeviceScan()
{ {
Natives.soundio_force_device_scan (handle); Natives.soundio_force_device_scan(handle);
} }
public SoundIORingBuffer CreateRingBuffer (int capacity) public SoundIORingBuffer CreateRingBuffer(int capacity)
{ {
return new SoundIORingBuffer (Natives.soundio_ring_buffer_create (handle, capacity)); return new SoundIORingBuffer(Natives.soundio_ring_buffer_create(handle, capacity));
} }
// static methods // static methods
public static string VersionString { public static string VersionString
get { return Marshal.PtrToStringAnsi (Natives.soundio_version_string ()); }
}
public static int VersionMajor {
get { return Natives.soundio_version_major (); }
}
public static int VersionMinor {
get { return Natives.soundio_version_minor (); }
}
public static int VersionPatch {
get { return Natives.soundio_version_patch (); }
}
public static string GetBackendName (SoundIOBackend backend)
{ {
return Marshal.PtrToStringAnsi (Natives.soundio_backend_name ((SoundIoBackend) backend)); get { return Marshal.PtrToStringAnsi(Natives.soundio_version_string()); }
} }
public static bool HaveBackend (SoundIOBackend backend) public static int VersionMajor
{ {
return Natives.soundio_have_backend ((SoundIoBackend) backend); get { return Natives.soundio_version_major(); }
} }
public static int GetBytesPerSample (SoundIOFormat format) public static int VersionMinor
{ {
return Natives.soundio_get_bytes_per_sample ((SoundIoFormat) format); get { return Natives.soundio_version_minor(); }
} }
public static int GetBytesPerFrame (SoundIOFormat format, int channelCount) public static int VersionPatch
{ {
return Natives.soundio_get_bytes_per_frame ((SoundIoFormat) format, channelCount); get { return Natives.soundio_version_patch(); }
} }
public static int GetBytesPerSecond (SoundIOFormat format, int channelCount, int sampleRate) public static string GetBackendName(SoundIOBackend backend)
{ {
return Natives.soundio_get_bytes_per_second ((SoundIoFormat) format, channelCount, sampleRate); return Marshal.PtrToStringAnsi(Natives.soundio_backend_name((SoundIoBackend)backend));
} }
public static string GetSoundFormatName (SoundIOFormat format) public static bool HaveBackend(SoundIOBackend backend)
{ {
return Marshal.PtrToStringAnsi (Natives.soundio_format_string ((SoundIoFormat) format)); return Natives.soundio_have_backend((SoundIoBackend)backend);
}
public static int GetBytesPerSample(SoundIOFormat format)
{
return Natives.soundio_get_bytes_per_sample((SoundIoFormat)format);
}
public static int GetBytesPerFrame(SoundIOFormat format, int channelCount)
{
return Natives.soundio_get_bytes_per_frame((SoundIoFormat)format, channelCount);
}
public static int GetBytesPerSecond(SoundIOFormat format, int channelCount, int sampleRate)
{
return Natives.soundio_get_bytes_per_second((SoundIoFormat)format, channelCount, sampleRate);
}
public static string GetSoundFormatName(SoundIOFormat format)
{
return Marshal.PtrToStringAnsi(Natives.soundio_format_string((SoundIoFormat)format));
} }
} }
} }

18
Ryujinx.Audio/Native/libsoundio/SoundIOBackend.cs
View file

@ -1,15 +1,13 @@
using System; namespace SoundIOSharp
namespace SoundIOSharp
{ {
public enum SoundIOBackend public enum SoundIOBackend
{ {
None = 0, None,
Jack = 1, Jack,
PulseAudio = 2, PulseAudio,
Alsa = 3, Alsa,
CoreAudio = 4, CoreAudio,
Wasapi = 5, Wasapi,
Dummy = 6, Dummy
} }
} }

20
Ryujinx.Audio/Native/libsoundio/SoundIOChannelArea.cs
View file

@ -5,22 +5,26 @@ namespace SoundIOSharp
{ {
public struct SoundIOChannelArea public struct SoundIOChannelArea
{ {
internal SoundIOChannelArea (Pointer<SoundIoChannelArea> handle) internal SoundIOChannelArea(Pointer<SoundIoChannelArea> handle)
{ {
this.handle = handle; this.handle = handle;
} }
Pointer<SoundIoChannelArea> handle; Pointer<SoundIoChannelArea> handle;
public IntPtr Pointer { public IntPtr Pointer
get { return Marshal.ReadIntPtr (handle, ptr_offset); } {
set { Marshal.WriteIntPtr (handle, ptr_offset, value); } get { return Marshal.ReadIntPtr(handle, ptr_offset); }
set { Marshal.WriteIntPtr(handle, ptr_offset, value); }
} }
static readonly int ptr_offset = (int) Marshal.OffsetOf<SoundIoChannelArea> ("ptr");
public int Step { static readonly int ptr_offset = (int)Marshal.OffsetOf<SoundIoChannelArea>("ptr");
get { return Marshal.ReadInt32 (handle, step_offset); }
public int Step
{
get { return Marshal.ReadInt32(handle, step_offset); }
} }
static readonly int step_offset = (int)Marshal.OffsetOf<SoundIoChannelArea> ("step");
static readonly int step_offset = (int)Marshal.OffsetOf<SoundIoChannelArea>("step");
} }
} }

11
Ryujinx.Audio/Native/libsoundio/SoundIOChannelAreas.cs
View file

@ -5,9 +5,9 @@ namespace SoundIOSharp
{ {
public struct SoundIOChannelAreas public struct SoundIOChannelAreas
{ {
static readonly int native_size = Marshal.SizeOf<SoundIoChannelArea> (); static readonly int native_size = Marshal.SizeOf<SoundIoChannelArea>();
internal SoundIOChannelAreas (IntPtr head, int channelCount, int frameCount) internal SoundIOChannelAreas(IntPtr head, int channelCount, int frameCount)
{ {
this.head = head; this.head = head;
this.channel_count = channelCount; this.channel_count = channelCount;
@ -18,13 +18,14 @@ namespace SoundIOSharp
int channel_count; int channel_count;
int frame_count; int frame_count;
public bool IsEmpty { public bool IsEmpty
{
get { return head == IntPtr.Zero; } get { return head == IntPtr.Zero; }
} }
public SoundIOChannelArea GetArea (int channel) public SoundIOChannelArea GetArea(int channel)
{ {
return new SoundIOChannelArea (head + native_size * channel); return new SoundIOChannelArea(head + native_size * channel);
} }
public int ChannelCount => channel_count; public int ChannelCount => channel_count;

142
Ryujinx.Audio/Native/libsoundio/SoundIOChannelId.cs
View file

@ -1,77 +1,75 @@
using System; namespace SoundIOSharp
namespace SoundIOSharp
{ {
public enum SoundIOChannelId public enum SoundIOChannelId
{ {
Invalid = 0, Invalid,
FrontLeft = 1, FrontLeft,
FrontRight = 2, FrontRight,
FrontCenter = 3, FrontCenter,
Lfe = 4, Lfe,
BackLeft = 5, BackLeft,
BackRight = 6, BackRight,
FrontLeftCenter = 7, FrontLeftCenter,
FrontRightCenter = 8, FrontRightCenter,
BackCenter = 9, BackCenter,
SideLeft = 10, SideLeft,
SideRight = 11, SideRight,
TopCenter = 12, TopCenter,
TopFrontLeft = 13, TopFrontLeft,
TopFrontCenter = 14, TopFrontCenter,
TopFrontRight = 15, TopFrontRight,
TopBackLeft = 16, TopBackLeft,
TopBackCenter = 17, TopBackCenter,
TopBackRight = 18, TopBackRight,
BackLeftCenter = 19, BackLeftCenter,
BackRightCenter = 20, BackRightCenter,
FrontLeftWide = 21, FrontLeftWide,
FrontRightWide = 22, FrontRightWide,
FrontLeftHigh = 23, FrontLeftHigh,
FrontCenterHigh = 24, FrontCenterHigh,
FrontRightHigh = 25, FrontRightHigh,
TopFrontLeftCenter = 26, TopFrontLeftCenter,
TopFrontRightCenter = 27, TopFrontRightCenter,
TopSideLeft = 28, TopSideLeft,
TopSideRight = 29, TopSideRight,
LeftLfe = 30, LeftLfe,
RightLfe = 31, RightLfe,
Lfe2 = 32, Lfe2,
BottomCenter = 33, BottomCenter,
BottomLeftCenter = 34, BottomLeftCenter,
BottomRightCenter = 35, BottomRightCenter,
MsMid = 36, MsMid,
MsSide = 37, MsSide,
AmbisonicW = 38, AmbisonicW,
AmbisonicX = 39, AmbisonicX,
AmbisonicY = 40, AmbisonicY,
AmbisonicZ = 41, AmbisonicZ,
XyX = 42, XyX,
XyY = 43, XyY,
HeadphonesLeft = 44, HeadphonesLeft,
HeadphonesRight = 45, HeadphonesRight,
ClickTrack = 46, ClickTrack,
ForeignLanguage = 47, ForeignLanguage,
HearingImpaired = 48, HearingImpaired,
Narration = 49, Narration,
Haptic = 50, Haptic,
DialogCentricMix = 51, DialogCentricMix,
Aux = 52, Aux,
Aux0 = 53, Aux0,
Aux1 = 54, Aux1,
Aux2 = 55, Aux2,
Aux3 = 56, Aux3,
Aux4 = 57, Aux4,
Aux5 = 58, Aux5,
Aux6 = 59, Aux6,
Aux7 = 60, Aux7,
Aux8 = 61, Aux8,
Aux9 = 62, Aux9,
Aux10 = 63, Aux10,
Aux11 = 64, Aux11,
Aux12 = 65, Aux12,
Aux13 = 66, Aux13,
Aux14 = 67, Aux14,
Aux15 = 68, Aux15
} }
} }

107
Ryujinx.Audio/Native/libsoundio/SoundIOChannelLayout.cs
View file

@ -1,99 +1,116 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace SoundIOSharp namespace SoundIOSharp
{ {
public struct SoundIOChannelLayout public struct SoundIOChannelLayout
{ {
public static int BuiltInCount { public static int BuiltInCount
get { return Natives.soundio_channel_layout_builtin_count (); } {
get { return Natives.soundio_channel_layout_builtin_count(); }
} }
public static SoundIOChannelLayout GetBuiltIn (int index) public static SoundIOChannelLayout GetBuiltIn(int index)
{ {
return new SoundIOChannelLayout (Natives.soundio_channel_layout_get_builtin (index)); return new SoundIOChannelLayout(Natives.soundio_channel_layout_get_builtin(index));
} }
public static SoundIOChannelLayout GetDefault (int channelCount) public static SoundIOChannelLayout GetDefault(int channelCount)
{ {
var handle = Natives.soundio_channel_layout_get_default (channelCount); var handle = Natives.soundio_channel_layout_get_default(channelCount);
return new SoundIOChannelLayout (handle); return new SoundIOChannelLayout (handle);
} }
public static SoundIOChannelId ParseChannelId (string name) public static SoundIOChannelId ParseChannelId(string name)
{ {
var ptr = Marshal.StringToHGlobalAnsi (name); var ptr = Marshal.StringToHGlobalAnsi(name);
try {
return (SoundIOChannelId)Natives.soundio_parse_channel_id (ptr, name.Length); try
} finally { {
Marshal.FreeHGlobal (ptr); return (SoundIOChannelId)Natives.soundio_parse_channel_id(ptr, name.Length);
}
finally
{
Marshal.FreeHGlobal(ptr);
} }
} }
// instance members // instance members
internal SoundIOChannelLayout (Pointer<SoundIoChannelLayout> handle) internal SoundIOChannelLayout(Pointer<SoundIoChannelLayout> handle)
{ {
this.handle = handle; this.handle = handle;
} }
readonly Pointer<SoundIoChannelLayout> handle; readonly Pointer<SoundIoChannelLayout> handle;
public bool IsNull { public bool IsNull
{
get { return handle.Handle == IntPtr.Zero; } get { return handle.Handle == IntPtr.Zero; }
} }
internal IntPtr Handle { internal IntPtr Handle
{
get { return handle; } get { return handle; }
} }
public int ChannelCount { public int ChannelCount
get { return IsNull ? 0 : Marshal.ReadInt32 ((IntPtr) handle + channel_count_offset); } {
get { return IsNull ? 0 : Marshal.ReadInt32((IntPtr)handle + channel_count_offset); }
} }
static readonly int channel_count_offset = (int) Marshal.OffsetOf<SoundIoChannelLayout> ("channel_count");
public string Name { static readonly int channel_count_offset = (int)Marshal.OffsetOf<SoundIoChannelLayout>("channel_count");
get { return IsNull ? null : Marshal.PtrToStringAnsi (Marshal.ReadIntPtr ((IntPtr) handle + name_offset)); }
public string Name
{
get { return IsNull ? null : Marshal.PtrToStringAnsi(Marshal.ReadIntPtr((IntPtr)handle + name_offset)); }
} }
static readonly int name_offset = (int)Marshal.OffsetOf<SoundIoChannelLayout> ("name");
public IEnumerable<SoundIOChannelId> Channels { static readonly int name_offset = (int)Marshal.OffsetOf<SoundIoChannelLayout>("name");
get {
if (IsNull) public IEnumerable<SoundIOChannelId> Channels
yield break; {
get
{
if (IsNull) yield break;
for (int i = 0; i < 24; i++) for (int i = 0; i < 24; i++)
yield return (SoundIOChannelId) Marshal.ReadInt32 ((IntPtr) handle + channels_offset + sizeof (SoundIoChannelId) * i);
}
}
static readonly int channels_offset = (int)Marshal.OffsetOf<SoundIoChannelLayout> ("channels");
public override bool Equals (object other)
{ {
if (!(other is SoundIOChannelLayout)) yield return (SoundIOChannelId)Marshal.ReadInt32((IntPtr)handle + channels_offset + sizeof(SoundIoChannelId) * i);
return false; }
}
}
static readonly int channels_offset = (int)Marshal.OffsetOf<SoundIoChannelLayout>("channels");
public override bool Equals(object other)
{
if (!(other is SoundIOChannelLayout)) return false;
var s = (SoundIOChannelLayout) other; var s = (SoundIOChannelLayout) other;
return handle == s.handle || Natives.soundio_channel_layout_equal (handle, s.handle);
return handle == s.handle || Natives.soundio_channel_layout_equal(handle, s.handle);
} }
public override int GetHashCode () public override int GetHashCode()
{ {
return handle.GetHashCode (); return handle.GetHashCode();
} }
public string DetectBuiltInName () public string DetectBuiltInName()
{ {
if (IsNull) if (IsNull) throw new InvalidOperationException();
throw new InvalidOperationException ();
return Natives.soundio_channel_layout_detect_builtin (handle) ? Name : null; return Natives.soundio_channel_layout_detect_builtin(handle) ? Name : null;
} }
public int FindChannel (SoundIOChannelId channel) public int FindChannel(SoundIOChannelId channel)
{ {
if (IsNull) if (IsNull) throw new InvalidOperationException();
throw new InvalidOperationException ();
return Natives.soundio_channel_layout_find_channel (handle, (SoundIoChannelId) channel); return Natives.soundio_channel_layout_find_channel(handle, (SoundIoChannelId)channel);
} }
} }
} }

241
Ryujinx.Audio/Native/libsoundio/SoundIODevice.cs
View file

@ -6,14 +6,15 @@ namespace SoundIOSharp
{ {
public class SoundIODevice public class SoundIODevice
{ {
public static SoundIOChannelLayout BestMatchingChannelLayout (SoundIODevice device1, SoundIODevice device2) public static SoundIOChannelLayout BestMatchingChannelLayout(SoundIODevice device1, SoundIODevice device2)
{ {
var ptr1 = Marshal.ReadIntPtr (device1.handle, layouts_offset); var ptr1 = Marshal.ReadIntPtr(device1.handle, layouts_offset);
var ptr2 = Marshal.ReadIntPtr (device2.handle, layouts_offset); var ptr2 = Marshal.ReadIntPtr(device2.handle, layouts_offset);
return new SoundIOChannelLayout (Natives.soundio_best_matching_channel_layout (ptr1, device1.LayoutCount, ptr2, device2.LayoutCount));
return new SoundIOChannelLayout(Natives.soundio_best_matching_channel_layout(ptr1, device1.LayoutCount, ptr2, device2.LayoutCount));
} }
internal SoundIODevice (Pointer<SoundIoDevice> handle) internal SoundIODevice(Pointer<SoundIoDevice> handle)
{ {
this.handle = handle; this.handle = handle;
} }
@ -22,152 +23,198 @@ namespace SoundIOSharp
// Equality (based on handle and native func) // Equality (based on handle and native func)
public override bool Equals (object other) public override bool Equals(object other)
{ {
var d = other as SoundIODevice; var d = other as SoundIODevice;
return d != null && (this.handle == d.handle || Natives.soundio_device_equal (this.handle, d.handle)); return d != null && (this.handle == d.handle || Natives.soundio_device_equal (this.handle, d.handle));
} }
public override int GetHashCode () public override int GetHashCode()
{ {
return (int) (IntPtr) handle; return (int)(IntPtr)handle;
} }
public static bool operator == (SoundIODevice obj1, SoundIODevice obj2) public static bool operator == (SoundIODevice obj1, SoundIODevice obj2)
{ {
return (object)obj1 == null ? (object)obj2 == null : obj1.Equals (obj2); return obj1 is null ? obj2 is null : obj1.Equals(obj2);
} }
public static bool operator != (SoundIODevice obj1, SoundIODevice obj2) public static bool operator != (SoundIODevice obj1, SoundIODevice obj2)
{ {
return (object)obj1 == null ? (object) obj2 != null : !obj1.Equals (obj2); return obj1 is null ? obj2 is object : !obj1.Equals(obj2);
} }
// fields // fields
public SoundIODeviceAim Aim { public SoundIODeviceAim Aim
get { return (SoundIODeviceAim) Marshal.ReadInt32 (handle, aim_offset); } {
get { return (SoundIODeviceAim)Marshal.ReadInt32(handle, aim_offset); }
} }
static readonly int aim_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("aim");
public SoundIOFormat CurrentFormat { static readonly int aim_offset = (int)Marshal.OffsetOf<SoundIoDevice>("aim");
get { return (SoundIOFormat) Marshal.ReadInt32 (handle, current_format_offset); }
}
static readonly int current_format_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("current_format");
public SoundIOChannelLayout CurrentLayout { public SoundIOFormat CurrentFormat
get { return new SoundIOChannelLayout ((IntPtr) handle + current_layout_offset); {
get { return (SoundIOFormat)Marshal.ReadInt32(handle, current_format_offset); }
} }
}
static readonly int current_layout_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("current_layout");
public int FormatCount { static readonly int current_format_offset = (int)Marshal.OffsetOf<SoundIoDevice>("current_format");
get { return Marshal.ReadInt32 (handle, format_count_offset); }
} public SoundIOChannelLayout CurrentLayout
static readonly int format_count_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("format_count"); {
get { return new SoundIOChannelLayout((IntPtr)handle + current_layout_offset); }
}
static readonly int current_layout_offset = (int)Marshal.OffsetOf<SoundIoDevice>("current_layout");
public int FormatCount
{
get { return Marshal.ReadInt32(handle, format_count_offset); }
}
static readonly int format_count_offset = (int)Marshal.OffsetOf<SoundIoDevice>("format_count");
public IEnumerable<SoundIOFormat> Formats
{
get
{
var ptr = Marshal.ReadIntPtr(handle, formats_offset);
public IEnumerable<SoundIOFormat> Formats {
get {
var ptr = Marshal.ReadIntPtr (handle, formats_offset);
for (int i = 0; i < FormatCount; i++) for (int i = 0; i < FormatCount; i++)
yield return (SoundIOFormat) Marshal.ReadInt32 (ptr, i); {
yield return (SoundIOFormat)Marshal.ReadInt32(ptr, i);
}
} }
} }
static readonly int formats_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("formats");
public string Id { static readonly int formats_offset = (int)Marshal.OffsetOf<SoundIoDevice>("formats");
get { return Marshal.PtrToStringAnsi (Marshal.ReadIntPtr (handle, id_offset)); }
}
static readonly int id_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("id");
public bool IsRaw { public string Id
get { return Marshal.ReadInt32 (handle, is_raw_offset) != 0; } {
get { return Marshal.PtrToStringAnsi(Marshal.ReadIntPtr(handle, id_offset)); }
} }
static readonly int is_raw_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("is_raw");
public int LayoutCount { static readonly int id_offset = (int)Marshal.OffsetOf<SoundIoDevice>("id");
get { return Marshal.ReadInt32 (handle, layout_count_offset); }
public bool IsRaw
{
get { return Marshal.ReadInt32(handle, is_raw_offset) != 0; }
} }
static readonly int layout_count_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("layout_count");
public IEnumerable<SoundIOChannelLayout> Layouts { static readonly int is_raw_offset = (int)Marshal.OffsetOf<SoundIoDevice>("is_raw");
get {
public int LayoutCount
{
get { return Marshal.ReadInt32(handle, layout_count_offset); }
}
static readonly int layout_count_offset = (int)Marshal.OffsetOf<SoundIoDevice>("layout_count");
public IEnumerable<SoundIOChannelLayout> Layouts
{
get
{
var ptr = Marshal.ReadIntPtr (handle, layouts_offset); var ptr = Marshal.ReadIntPtr (handle, layouts_offset);
for (int i = 0; i < LayoutCount; i++) for (int i = 0; i < LayoutCount; i++)
yield return new SoundIOChannelLayout (ptr + i * Marshal.SizeOf<SoundIoChannelLayout> ()); {
yield return new SoundIOChannelLayout(ptr + i * Marshal.SizeOf<SoundIoChannelLayout>());
}
} }
} }
static readonly int layouts_offset = (int) Marshal.OffsetOf<SoundIoDevice> ("layouts");
public string Name { static readonly int layouts_offset = (int)Marshal.OffsetOf<SoundIoDevice>("layouts");
get { return Marshal.PtrToStringAnsi (Marshal.ReadIntPtr (handle, name_offset)); }
}
static readonly int name_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("name");
public int ProbeError { public string Name
get { return Marshal.ReadInt32 (handle, probe_error_offset); } {
get { return Marshal.PtrToStringAnsi(Marshal.ReadIntPtr(handle, name_offset)); }
} }
static readonly int probe_error_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("probe_error");
public int ReferenceCount { static readonly int name_offset = (int)Marshal.OffsetOf<SoundIoDevice>("name");
get { return Marshal.ReadInt32 (handle, ref_count_offset); }
public int ProbeError
{
get { return Marshal.ReadInt32(handle, probe_error_offset); }
} }
static readonly int ref_count_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("ref_count");
public int SampleRateCount { static readonly int probe_error_offset = (int)Marshal.OffsetOf<SoundIoDevice>("probe_error");
get { return Marshal.ReadInt32 (handle, sample_rate_count_offset); }
public int ReferenceCount
{
get { return Marshal.ReadInt32(handle, ref_count_offset); }
} }
static readonly int sample_rate_count_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("sample_rate_count");
public IEnumerable<SoundIOSampleRateRange> SampleRates { static readonly int ref_count_offset = (int)Marshal.OffsetOf<SoundIoDevice>("ref_count");
get {
var ptr = Marshal.ReadIntPtr (handle, sample_rates_offset); public int SampleRateCount
{
get { return Marshal.ReadInt32(handle, sample_rate_count_offset); }
}
static readonly int sample_rate_count_offset = (int)Marshal.OffsetOf<SoundIoDevice>("sample_rate_count");
public IEnumerable<SoundIOSampleRateRange> SampleRates
{
get
{
var ptr = Marshal.ReadIntPtr(handle, sample_rates_offset);
for (int i = 0; i < SampleRateCount; i++) for (int i = 0; i < SampleRateCount; i++)
yield return new SoundIOSampleRateRange ( {
Marshal.ReadInt32 (ptr, i * 2), yield return new SoundIOSampleRateRange(Marshal.ReadInt32(ptr, i * 2), Marshal.ReadInt32(ptr, i * 2 + 1));
Marshal.ReadInt32 (ptr, i * 2 + 1)); }
} }
} }
static readonly int sample_rates_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("sample_rates");
public double SoftwareLatencyCurrent { static readonly int sample_rates_offset = (int)Marshal.OffsetOf<SoundIoDevice>("sample_rates");
get { return MarshalEx.ReadDouble (handle, software_latency_current_offset); }
set { MarshalEx.WriteDouble (handle, software_latency_current_offset, value); }
}
static readonly int software_latency_current_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("software_latency_current");
public double SoftwareLatencyMin { public double SoftwareLatencyCurrent
get { return MarshalEx.ReadDouble (handle, software_latency_min_offset); } {
set { MarshalEx.WriteDouble (handle, software_latency_min_offset, value); } get { return MarshalEx.ReadDouble(handle, software_latency_current_offset); }
set { MarshalEx.WriteDouble(handle, software_latency_current_offset, value); }
} }
static readonly int software_latency_min_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("software_latency_min");
public double SoftwareLatencyMax { static readonly int software_latency_current_offset = (int)Marshal.OffsetOf<SoundIoDevice>("software_latency_current");
get { return MarshalEx.ReadDouble (handle, software_latency_max_offset); }
set { MarshalEx.WriteDouble (handle, software_latency_max_offset, value); }
}
static readonly int software_latency_max_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("software_latency_max");
public SoundIO SoundIO { public double SoftwareLatencyMin
get { return new SoundIO (Marshal.ReadIntPtr (handle, soundio_offset)); } {
get { return MarshalEx.ReadDouble(handle, software_latency_min_offset); }
set { MarshalEx.WriteDouble(handle, software_latency_min_offset, value); }
} }
static readonly int soundio_offset = (int)Marshal.OffsetOf<SoundIoDevice> ("soundio");
static readonly int software_latency_min_offset = (int)Marshal.OffsetOf<SoundIoDevice>("software_latency_min");
public double SoftwareLatencyMax
{
get { return MarshalEx.ReadDouble(handle, software_latency_max_offset); }
set { MarshalEx.WriteDouble(handle, software_latency_max_offset, value); }
}
static readonly int software_latency_max_offset = (int)Marshal.OffsetOf<SoundIoDevice>("software_latency_max");
public SoundIO SoundIO
{
get { return new SoundIO(Marshal.ReadIntPtr(handle, soundio_offset)); }
}
static readonly int soundio_offset = (int)Marshal.OffsetOf<SoundIoDevice>("soundio");
// functions // functions
public void AddReference () public void AddReference()
{ {
Natives.soundio_device_ref (handle); Natives.soundio_device_ref(handle);
} }
public void RemoveReference () public void RemoveReference()
{ {
Natives.soundio_device_unref (handle); Natives.soundio_device_unref(handle);
} }
public void SortDeviceChannelLayouts () public void SortDeviceChannelLayouts()
{ {
Natives.soundio_device_sort_channel_layouts (handle); Natives.soundio_device_sort_channel_layouts(handle);
} }
public static readonly SoundIOFormat S16NE = BitConverter.IsLittleEndian ? SoundIOFormat.S16LE : SoundIOFormat.S16BE; public static readonly SoundIOFormat S16NE = BitConverter.IsLittleEndian ? SoundIOFormat.S16LE : SoundIOFormat.S16BE;
@ -187,14 +234,14 @@ namespace SoundIOSharp
public static readonly SoundIOFormat Float32FE = !BitConverter.IsLittleEndian ? SoundIOFormat.Float32LE : SoundIOFormat.Float32BE; public static readonly SoundIOFormat Float32FE = !BitConverter.IsLittleEndian ? SoundIOFormat.Float32LE : SoundIOFormat.Float32BE;
public static readonly SoundIOFormat Float64FE = !BitConverter.IsLittleEndian ? SoundIOFormat.Float64LE : SoundIOFormat.Float64BE; public static readonly SoundIOFormat Float64FE = !BitConverter.IsLittleEndian ? SoundIOFormat.Float64LE : SoundIOFormat.Float64BE;
public bool SupportsFormat (SoundIOFormat format) public bool SupportsFormat(SoundIOFormat format)
{ {
return Natives.soundio_device_supports_format (handle, (SoundIoFormat) format); return Natives.soundio_device_supports_format(handle, (SoundIoFormat)format);
} }
public bool SupportsSampleRate (int sampleRate) public bool SupportsSampleRate(int sampleRate)
{ {
return Natives.soundio_device_supports_sample_rate (handle, sampleRate); return Natives.soundio_device_supports_sample_rate(handle, sampleRate);
} }
public bool SupportsChannelCount(int channelCount) public bool SupportsChannelCount(int channelCount)
@ -202,19 +249,19 @@ namespace SoundIOSharp
return Natives.soundio_device_supports_layout(handle, SoundIOChannelLayout.GetDefault(channelCount).Handle); return Natives.soundio_device_supports_layout(handle, SoundIOChannelLayout.GetDefault(channelCount).Handle);
} }
public int GetNearestSampleRate (int sampleRate) public int GetNearestSampleRate(int sampleRate)
{ {
return Natives.soundio_device_nearest_sample_rate (handle, sampleRate); return Natives.soundio_device_nearest_sample_rate(handle, sampleRate);
} }
public SoundIOInStream CreateInStream () public SoundIOInStream CreateInStream()
{ {
return new SoundIOInStream (Natives.soundio_instream_create (handle)); return new SoundIOInStream(Natives.soundio_instream_create(handle));
} }
public SoundIOOutStream CreateOutStream () public SoundIOOutStream CreateOutStream()
{ {
return new SoundIOOutStream (Natives.soundio_outstream_create (handle)); return new SoundIOOutStream(Natives.soundio_outstream_create(handle));
} }
} }
} }

7
Ryujinx.Audio/Native/libsoundio/SoundIODeviceAim.cs
View file

@ -1,9 +1,8 @@
using System; namespace SoundIOSharp
namespace SoundIOSharp
{ {
public enum SoundIODeviceAim // soundio.h (228, 6) public enum SoundIODeviceAim // soundio.h (228, 6)
{ {
Input = 0, Input,
Output = 1, Output
} }
} }

5
Ryujinx.Audio/Native/libsoundio/SoundIOException.cs
View file

@ -5,9 +5,6 @@ namespace SoundIOSharp
{ {
public class SoundIOException : Exception public class SoundIOException : Exception
{ {
internal SoundIOException (SoundIoError errorCode) internal SoundIOException(SoundIoError errorCode) : base (Marshal.PtrToStringAnsi(Natives.soundio_strerror((int) errorCode))) { }
: base (Marshal.PtrToStringAnsi (Natives.soundio_strerror ((int) errorCode)))
{
}
} }
} }

41
Ryujinx.Audio/Native/libsoundio/SoundIOFormat.cs
View file

@ -1,26 +1,25 @@
using System; namespace SoundIOSharp
namespace SoundIOSharp
{ {
public enum SoundIOFormat public enum SoundIOFormat
{ {
Invalid = 0, Invalid,
S8 = 1, S8,
U8 = 2, U8,
S16LE = 3, S16LE,
S16BE = 4, S16BE,
U16LE = 5, U16LE,
U16BE = 6, U16BE,
S24LE = 7, S24LE,
S24BE = 8, S24BE,
U24LE = 9, U24LE,
U24BE = 10, U24BE,
S32LE = 11, S32LE,
S32BE = 12, S32BE,
U32LE = 13, U32LE,
U32BE = 14, U32BE,
Float32LE = 15, Float32LE,
Float32BE = 16, Float32BE,
Float64LE = 17, Float64LE,
Float64BE = 18, Float64BE
} }
} }

273
Ryujinx.Audio/Native/libsoundio/SoundIOInStream.cs
View file

@ -6,221 +6,286 @@ namespace SoundIOSharp
{ {
public class SoundIOInStream : IDisposable public class SoundIOInStream : IDisposable
{ {
internal SoundIOInStream (Pointer<SoundIoInStream> handle) internal SoundIOInStream(Pointer<SoundIoInStream> handle)
{ {
this.handle = handle; this.handle = handle;
} }
Pointer<SoundIoInStream> handle; Pointer<SoundIoInStream> handle;
public void Dispose () public void Dispose()
{ {
Natives.soundio_instream_destroy (handle); Natives.soundio_instream_destroy(handle);
} }
// Equality (based on handle) // Equality (based on handle)
public override bool Equals (object other) public override bool Equals(object other)
{ {
var d = other as SoundIOInStream; var d = other as SoundIOInStream;
return d != null && (this.handle == d.handle); return d != null && (this.handle == d.handle);
} }
public override int GetHashCode () public override int GetHashCode()
{ {
return (int)(IntPtr)handle; return (int)(IntPtr)handle;
} }
public static bool operator == (SoundIOInStream obj1, SoundIOInStream obj2) public static bool operator == (SoundIOInStream obj1, SoundIOInStream obj2)
{ {
return (object)obj1 == null ? (object)obj2 == null : obj1.Equals (obj2); return obj1 is null ? obj2 is null : obj1.Equals(obj2);
} }
public static bool operator != (SoundIOInStream obj1, SoundIOInStream obj2) public static bool operator != (SoundIOInStream obj1, SoundIOInStream obj2)
{ {
return (object)obj1 == null ? (object)obj2 != null : !obj1.Equals (obj2); return obj1 is null ? obj2 is object : !obj1.Equals(obj2);
} }
// fields // fields
public SoundIODevice Device { public SoundIODevice Device
get { return new SoundIODevice (Marshal.ReadIntPtr (handle, device_offset)); } {
get { return new SoundIODevice(Marshal.ReadIntPtr(handle, device_offset)); }
} }
static readonly int device_offset = (int)Marshal.OffsetOf<SoundIoInStream> ("device");
public SoundIOFormat Format { static readonly int device_offset = (int)Marshal.OffsetOf<SoundIoInStream>("device");
get { return (SoundIOFormat) Marshal.ReadInt32 (handle, format_offset); }
set { Marshal.WriteInt32 (handle, format_offset, (int) value); } public SoundIOFormat Format
{
get { return (SoundIOFormat)Marshal.ReadInt32(handle, format_offset); }
set { Marshal.WriteInt32(handle, format_offset, (int) value); }
} }
static readonly int format_offset = (int)Marshal.OffsetOf<SoundIoInStream> ("format");
public int SampleRate { static readonly int format_offset = (int)Marshal.OffsetOf<SoundIoInStream>("format");
get { return Marshal.ReadInt32 (handle, sample_rate_offset); }
set { Marshal.WriteInt32 (handle, sample_rate_offset, value); } public int SampleRate
{
get { return Marshal.ReadInt32(handle, sample_rate_offset); }
set { Marshal.WriteInt32(handle, sample_rate_offset, value); }
} }
static readonly int sample_rate_offset = (int)Marshal.OffsetOf<SoundIoInStream> ("sample_rate");
public SoundIOChannelLayout Layout { static readonly int sample_rate_offset = (int)Marshal.OffsetOf<SoundIoInStream>("sample_rate");
public SoundIOChannelLayout Layout
{
get { return new SoundIOChannelLayout ((IntPtr) handle + layout_offset); } get { return new SoundIOChannelLayout ((IntPtr) handle + layout_offset); }
set { set
unsafe { {
Buffer.MemoryCopy ((void*) ((IntPtr) handle + layout_offset), (void*)value.Handle, unsafe
Marshal.SizeOf<SoundIoChannelLayout> (), Marshal.SizeOf<SoundIoChannelLayout> ()); {
Buffer.MemoryCopy((void*)((IntPtr)handle + layout_offset), (void*)value.Handle, Marshal.SizeOf<SoundIoChannelLayout>(), Marshal.SizeOf<SoundIoChannelLayout>());
} }
} }
} }
static readonly int layout_offset = (int)Marshal.OffsetOf<SoundIoInStream> ("layout");
static readonly int layout_offset = (int)Marshal.OffsetOf<SoundIoInStream>("layout");
public double SoftwareLatency { public double SoftwareLatency
get { return MarshalEx.ReadDouble (handle, software_latency_offset); } {
set { MarshalEx.WriteDouble (handle, software_latency_offset, value); } get { return MarshalEx.ReadDouble(handle, software_latency_offset); }
set { MarshalEx.WriteDouble(handle, software_latency_offset, value); }
} }
static readonly int software_latency_offset = (int)Marshal.OffsetOf<SoundIoInStream> ("software_latency");
static readonly int software_latency_offset = (int)Marshal.OffsetOf<SoundIoInStream>("software_latency");
// error_callback // error_callback
public Action ErrorCallback { public Action ErrorCallback
{
get { return error_callback; } get { return error_callback; }
set { set
{
error_callback = value; error_callback = value;
error_callback_native = _ => error_callback (); error_callback_native = _ => error_callback();
var ptr = Marshal.GetFunctionPointerForDelegate (error_callback_native);
Marshal.WriteIntPtr (handle, error_callback_offset, ptr); var ptr = Marshal.GetFunctionPointerForDelegate(error_callback_native);
Marshal.WriteIntPtr(handle, error_callback_offset, ptr);
} }
} }
static readonly int error_callback_offset = (int)Marshal.OffsetOf<SoundIoInStream> ("error_callback");
static readonly int error_callback_offset = (int)Marshal.OffsetOf<SoundIoInStream>("error_callback");
Action error_callback; Action error_callback;
delegate void error_callback_delegate (IntPtr handle); delegate void error_callback_delegate(IntPtr handle);
error_callback_delegate error_callback_native; error_callback_delegate error_callback_native;
// read_callback // read_callback
public Action<int,int> ReadCallback { public Action<int,int> ReadCallback
{
get { return read_callback; } get { return read_callback; }
set { set
{
read_callback = value; read_callback = value;
read_callback_native = (_, minFrameCount, maxFrameCount) => read_callback (minFrameCount, maxFrameCount); read_callback_native = (_, minFrameCount, maxFrameCount) => read_callback(minFrameCount, maxFrameCount);
var ptr = Marshal.GetFunctionPointerForDelegate (read_callback_native);
Marshal.WriteIntPtr (handle, read_callback_offset, ptr); var ptr = Marshal.GetFunctionPointerForDelegate(read_callback_native);
Marshal.WriteIntPtr(handle, read_callback_offset, ptr);
} }
} }
static readonly int read_callback_offset = (int)Marshal.OffsetOf<SoundIoInStream> ("read_callback");
static readonly int read_callback_offset = (int)Marshal.OffsetOf<SoundIoInStream>("read_callback");
Action<int, int> read_callback; Action<int, int> read_callback;
delegate void read_callback_delegate (IntPtr handle, int min, int max); delegate void read_callback_delegate(IntPtr handle, int min, int max);
read_callback_delegate read_callback_native; read_callback_delegate read_callback_native;
// overflow_callback // overflow_callback
public Action OverflowCallback { public Action OverflowCallback
{
get { return overflow_callback; } get { return overflow_callback; }
set { set
{
overflow_callback = value; overflow_callback = value;
overflow_callback_native = _ => overflow_callback (); overflow_callback_native = _ => overflow_callback();
var ptr = Marshal.GetFunctionPointerForDelegate (overflow_callback_native);
Marshal.WriteIntPtr (handle, overflow_callback_offset, ptr); var ptr = Marshal.GetFunctionPointerForDelegate(overflow_callback_native);
Marshal.WriteIntPtr(handle, overflow_callback_offset, ptr);
} }
} }
static readonly int overflow_callback_offset = (int)Marshal.OffsetOf<SoundIoInStream> ("overflow_callback"); static readonly int overflow_callback_offset = (int)Marshal.OffsetOf<SoundIoInStream>("overflow_callback");
Action overflow_callback; Action overflow_callback;
delegate void overflow_callback_delegate (IntPtr handle); delegate void overflow_callback_delegate(IntPtr handle);
overflow_callback_delegate overflow_callback_native; overflow_callback_delegate overflow_callback_native;
// FIXME: this should be taken care in more centralized/decent manner... we don't want to write // FIXME: this should be taken care in more centralized/decent manner... we don't want to write
// this kind of code anywhere we need string marshaling. // this kind of code anywhere we need string marshaling.
List<IntPtr> allocated_hglobals = new List<IntPtr> (); List<IntPtr> allocated_hglobals = new List<IntPtr>();
public string Name { public string Name
get { return Marshal.PtrToStringAnsi (Marshal.ReadIntPtr (handle, name_offset)); } {
set { get { return Marshal.PtrToStringAnsi(Marshal.ReadIntPtr(handle, name_offset)); }
unsafe { set
var existing = Marshal.ReadIntPtr (handle, name_offset); {
if (allocated_hglobals.Contains (existing)) { unsafe
allocated_hglobals.Remove (existing); {
Marshal.FreeHGlobal (existing); var existing = Marshal.ReadIntPtr(handle, name_offset);
if (allocated_hglobals.Contains(existing))
{
allocated_hglobals.Remove(existing);
Marshal.FreeHGlobal(existing);
} }
var ptr = Marshal.StringToHGlobalAnsi (value);
Marshal.WriteIntPtr (handle, name_offset, ptr);
allocated_hglobals.Add (ptr);
}
}
}
static readonly int name_offset = (int)Marshal.OffsetOf<SoundIoInStream> ("name");
public bool NonTerminalHint { var ptr = Marshal.StringToHGlobalAnsi(value);
get { return Marshal.ReadInt32 (handle, non_terminal_hint_offset) != 0; } Marshal.WriteIntPtr(handle, name_offset, ptr);
allocated_hglobals.Add(ptr);
}
}
} }
static readonly int non_terminal_hint_offset = (int)Marshal.OffsetOf<SoundIoInStream> ("non_terminal_hint");
public int BytesPerFrame { static readonly int name_offset = (int)Marshal.OffsetOf<SoundIoInStream>("name");
get { return Marshal.ReadInt32 (handle, bytes_per_frame_offset); }
}
static readonly int bytes_per_frame_offset = (int)Marshal.OffsetOf<SoundIoInStream> ("bytes_per_frame");
public int BytesPerSample { public bool NonTerminalHint
get { return Marshal.ReadInt32 (handle, bytes_per_sample_offset); } {
get { return Marshal.ReadInt32(handle, non_terminal_hint_offset) != 0; }
} }
static readonly int bytes_per_sample_offset = (int)Marshal.OffsetOf<SoundIoInStream> ("bytes_per_sample");
public string LayoutErrorMessage { static readonly int non_terminal_hint_offset = (int)Marshal.OffsetOf<SoundIoInStream>("non_terminal_hint");
get {
var code = (SoundIoError) Marshal.ReadInt32 (handle, layout_error_offset); public int BytesPerFrame
return code == SoundIoError.SoundIoErrorNone ? null : Marshal.PtrToStringAnsi (Natives.soundio_strerror ((int) code)); {
get { return Marshal.ReadInt32(handle, bytes_per_frame_offset); }
}
static readonly int bytes_per_frame_offset = (int)Marshal.OffsetOf<SoundIoInStream>("bytes_per_frame");
public int BytesPerSample
{
get { return Marshal.ReadInt32(handle, bytes_per_sample_offset); }
}
static readonly int bytes_per_sample_offset = (int)Marshal.OffsetOf<SoundIoInStream>("bytes_per_sample");
public string LayoutErrorMessage
{
get
{
var code = (SoundIoError)Marshal.ReadInt32(handle, layout_error_offset);
return code == SoundIoError.SoundIoErrorNone ? null : Marshal.PtrToStringAnsi(Natives.soundio_strerror((int)code));
} }
} }
static readonly int layout_error_offset = (int)Marshal.OffsetOf<SoundIoInStream> ("layout_error");
static readonly int layout_error_offset = (int)Marshal.OffsetOf<SoundIoInStream>("layout_error");
// functions // functions
public void Open () public void Open()
{ {
var ret = (SoundIoError) Natives.soundio_instream_open (handle); var ret = (SoundIoError)Natives.soundio_instream_open(handle);
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
throw new SoundIOException(ret);
}
} }
public void Start () public void Start()
{ {
var ret = (SoundIoError)Natives.soundio_instream_start (handle); var ret = (SoundIoError)Natives.soundio_instream_start(handle);
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
throw new SoundIOException(ret);
}
} }
public SoundIOChannelAreas BeginRead (ref int frameCount) public SoundIOChannelAreas BeginRead(ref int frameCount)
{ {
IntPtr ptrs = default (IntPtr); IntPtr ptrs = default;
int nativeFrameCount = frameCount; int nativeFrameCount = frameCount;
unsafe {
unsafe
{
var frameCountPtr = &nativeFrameCount; var frameCountPtr = &nativeFrameCount;
var ptrptr = &ptrs; var ptrptr = &ptrs;
var ret = (SoundIoError) Natives.soundio_instream_begin_read (handle, (IntPtr)ptrptr, (IntPtr)frameCountPtr); var ret = (SoundIoError)Natives.soundio_instream_begin_read(handle, (IntPtr)ptrptr, (IntPtr)frameCountPtr);
frameCount = *frameCountPtr; frameCount = *frameCountPtr;
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
return new SoundIOChannelAreas (ptrs, Layout.ChannelCount, frameCount); throw new SoundIOException(ret);
}
return new SoundIOChannelAreas(ptrs, Layout.ChannelCount, frameCount);
} }
} }
public void EndRead () public void EndRead()
{ {
var ret = (SoundIoError) Natives.soundio_instream_end_read (handle); var ret = (SoundIoError)Natives.soundio_instream_end_read(handle);
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
throw new SoundIOException(ret);
}
} }
public void Pause (bool pause) public void Pause(bool pause)
{ {
var ret = (SoundIoError) Natives.soundio_instream_pause (handle, pause); var ret = (SoundIoError)Natives.soundio_instream_pause(handle, pause);
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
throw new SoundIOException(ret);
}
} }
public double GetLatency () public double GetLatency()
{
unsafe
{ {
unsafe {
double* dptr = null; double* dptr = null;
IntPtr p = new IntPtr (dptr); IntPtr p = new IntPtr(dptr);
var ret = (SoundIoError) Natives.soundio_instream_get_latency (handle, p);
var ret = (SoundIoError)Natives.soundio_instream_get_latency(handle, p);
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
dptr = (double*) p; throw new SoundIOException(ret);
}
dptr = (double*)p;
return *dptr; return *dptr;
} }
} }

269
Ryujinx.Audio/Native/libsoundio/SoundIOOutStream.cs
View file

@ -22,6 +22,7 @@ namespace SoundIOSharp
public override bool Equals (object other) public override bool Equals (object other)
{ {
var d = other as SoundIOOutStream; var d = other as SoundIOOutStream;
return d != null && (this.handle == d.handle); return d != null && (this.handle == d.handle);
} }
@ -32,223 +33,299 @@ namespace SoundIOSharp
public static bool operator == (SoundIOOutStream obj1, SoundIOOutStream obj2) public static bool operator == (SoundIOOutStream obj1, SoundIOOutStream obj2)
{ {
return (object)obj1 == null ? (object)obj2 == null : obj1.Equals (obj2); return obj1 is null ? obj2 is null : obj1.Equals(obj2);
} }
public static bool operator != (SoundIOOutStream obj1, SoundIOOutStream obj2) public static bool operator != (SoundIOOutStream obj1, SoundIOOutStream obj2)
{ {
return (object)obj1 == null ? (object)obj2 != null : !obj1.Equals (obj2); return obj1 is null ? obj2 is object : !obj1.Equals(obj2);
} }
// fields // fields
public SoundIODevice Device { public SoundIODevice Device
get { return new SoundIODevice (Marshal.ReadIntPtr (handle, device_offset)); } {
get { return new SoundIODevice(Marshal.ReadIntPtr(handle, device_offset)); }
} }
static readonly int device_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("device");
public SoundIOFormat Format { static readonly int device_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("device");
get { return (SoundIOFormat) Marshal.ReadInt32 (handle, format_offset); }
set { Marshal.WriteInt32 (handle, format_offset, (int) value); }
}
static readonly int format_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("format");
public int SampleRate { public SoundIOFormat Format
get { return Marshal.ReadInt32 (handle, sample_rate_offset); } {
set { Marshal.WriteInt32 (handle, sample_rate_offset, value); } get { return (SoundIOFormat) Marshal.ReadInt32(handle, format_offset); }
set { Marshal.WriteInt32(handle, format_offset, (int) value); }
} }
static readonly int sample_rate_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("sample_rate");
static readonly int format_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("format");
public SoundIOChannelLayout Layout { public int SampleRate
get { unsafe { return new SoundIOChannelLayout ((IntPtr) ((void*) ((IntPtr) handle + layout_offset))); } } {
set { get { return Marshal.ReadInt32(handle, sample_rate_offset); }
unsafe { set { Marshal.WriteInt32(handle, sample_rate_offset, value); }
Buffer.MemoryCopy ((void*)value.Handle, (void*)((IntPtr)handle + layout_offset),
Marshal.SizeOf<SoundIoChannelLayout> (), Marshal.SizeOf<SoundIoChannelLayout> ());
} }
}
}
static readonly int layout_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("layout");
public double SoftwareLatency { static readonly int sample_rate_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("sample_rate");
public SoundIOChannelLayout Layout
{
get { unsafe { return new SoundIOChannelLayout((IntPtr) (void*)((IntPtr)handle + layout_offset)); } }
set
{
unsafe
{
Buffer.MemoryCopy((void*)value.Handle, (void*)((IntPtr)handle + layout_offset), Marshal.SizeOf<SoundIoChannelLayout>(), Marshal.SizeOf<SoundIoChannelLayout>());
}
}
}
static readonly int layout_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("layout");
public double SoftwareLatency
{
get { return MarshalEx.ReadDouble (handle, software_latency_offset); } get { return MarshalEx.ReadDouble (handle, software_latency_offset); }
set { MarshalEx.WriteDouble (handle, software_latency_offset, value); } set { MarshalEx.WriteDouble (handle, software_latency_offset, value); }
} }
static readonly int software_latency_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("software_latency");
public float Volume { static readonly int software_latency_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("software_latency");
get { return MarshalEx.ReadFloat (handle, volume_offset); }
set { MarshalEx.WriteFloat (handle, volume_offset, value); } public float Volume
{
get { return MarshalEx.ReadFloat(handle, volume_offset); }
set { MarshalEx.WriteFloat(handle, volume_offset, value); }
} }
static readonly int volume_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("volume");
static readonly int volume_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("volume");
// error_callback // error_callback
public Action ErrorCallback { public Action ErrorCallback
{
get { return error_callback; } get { return error_callback; }
set { set
{
error_callback = value; error_callback = value;
if (value == null) if (value == null)
{
error_callback_native = null; error_callback_native = null;
}
else else
error_callback_native = stream => error_callback (); {
var ptr = Marshal.GetFunctionPointerForDelegate (error_callback_native); error_callback_native = stream => error_callback();
Marshal.WriteIntPtr (handle, error_callback_offset, ptr); }
var ptr = Marshal.GetFunctionPointerForDelegate(error_callback_native);
Marshal.WriteIntPtr(handle, error_callback_offset, ptr);
} }
} }
static readonly int error_callback_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("error_callback");
static readonly int error_callback_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("error_callback");
Action error_callback; Action error_callback;
delegate void error_callback_delegate (IntPtr handle); delegate void error_callback_delegate (IntPtr handle);
error_callback_delegate error_callback_native; error_callback_delegate error_callback_native;
// write_callback // write_callback
public Action<int, int> WriteCallback { public Action<int, int> WriteCallback
{
get { return write_callback; } get { return write_callback; }
set { set
{
write_callback = value; write_callback = value;
if (value == null) if (value == null)
{
write_callback_native = null; write_callback_native = null;
}
else else
write_callback_native = (h, frame_count_min, frame_count_max) => write_callback (frame_count_min, frame_count_max); {
write_callback_native = (h, frame_count_min, frame_count_max) => write_callback(frame_count_min, frame_count_max);
}
var ptr = Marshal.GetFunctionPointerForDelegate (write_callback_native); var ptr = Marshal.GetFunctionPointerForDelegate (write_callback_native);
Marshal.WriteIntPtr (handle, write_callback_offset, ptr); Marshal.WriteIntPtr (handle, write_callback_offset, ptr);
} }
} }
static readonly int write_callback_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("write_callback");
static readonly int write_callback_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("write_callback");
Action<int, int> write_callback; Action<int, int> write_callback;
delegate void write_callback_delegate (IntPtr handle, int min, int max); delegate void write_callback_delegate(IntPtr handle, int min, int max);
write_callback_delegate write_callback_native; write_callback_delegate write_callback_native;
// underflow_callback // underflow_callback
public Action UnderflowCallback { public Action UnderflowCallback
{
get { return underflow_callback; } get { return underflow_callback; }
set { set
{
underflow_callback = value; underflow_callback = value;
if (value == null) if (value == null)
{
underflow_callback_native = null; underflow_callback_native = null;
}
else else
underflow_callback_native = h => underflow_callback (); {
underflow_callback_native = h => underflow_callback();
}
var ptr = Marshal.GetFunctionPointerForDelegate (underflow_callback_native); var ptr = Marshal.GetFunctionPointerForDelegate (underflow_callback_native);
Marshal.WriteIntPtr (handle, underflow_callback_offset, ptr); Marshal.WriteIntPtr (handle, underflow_callback_offset, ptr);
} }
} }
static readonly int underflow_callback_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("underflow_callback");
static readonly int underflow_callback_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("underflow_callback");
Action underflow_callback; Action underflow_callback;
delegate void underflow_callback_delegate (IntPtr handle); delegate void underflow_callback_delegate(IntPtr handle);
underflow_callback_delegate underflow_callback_native; underflow_callback_delegate underflow_callback_native;
// FIXME: this should be taken care in more centralized/decent manner... we don't want to write // FIXME: this should be taken care in more centralized/decent manner... we don't want to write
// this kind of code anywhere we need string marshaling. // this kind of code anywhere we need string marshaling.
List<IntPtr> allocated_hglobals = new List<IntPtr> (); List<IntPtr> allocated_hglobals = new List<IntPtr>();
public string Name { public string Name {
get { return Marshal.PtrToStringAnsi (Marshal.ReadIntPtr (handle, name_offset)); } get { return Marshal.PtrToStringAnsi(Marshal.ReadIntPtr(handle, name_offset)); }
set { set
unsafe { {
var existing = Marshal.ReadIntPtr (handle, name_offset); unsafe
if (allocated_hglobals.Contains (existing)) { {
allocated_hglobals.Remove (existing); var existing = Marshal.ReadIntPtr(handle, name_offset);
Marshal.FreeHGlobal (existing); if (allocated_hglobals.Contains(existing))
{
allocated_hglobals.Remove(existing);
Marshal.FreeHGlobal(existing);
} }
var ptr = Marshal.StringToHGlobalAnsi (value);
Marshal.WriteIntPtr (handle, name_offset, ptr);
allocated_hglobals.Add (ptr);
}
}
}
static readonly int name_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("name");
public bool NonTerminalHint { var ptr = Marshal.StringToHGlobalAnsi(value);
get { return Marshal.ReadInt32 (handle, non_terminal_hint_offset) != 0; } Marshal.WriteIntPtr(handle, name_offset, ptr);
allocated_hglobals.Add(ptr);
}
}
} }
static readonly int non_terminal_hint_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("non_terminal_hint");
public int BytesPerFrame { static readonly int name_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("name");
get { return Marshal.ReadInt32 (handle, bytes_per_frame_offset); }
}
static readonly int bytes_per_frame_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("bytes_per_frame");
public int BytesPerSample { public bool NonTerminalHint
get { return Marshal.ReadInt32 (handle, bytes_per_sample_offset); } {
get { return Marshal.ReadInt32(handle, non_terminal_hint_offset) != 0; }
} }
static readonly int bytes_per_sample_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("bytes_per_sample");
public string LayoutErrorMessage { static readonly int non_terminal_hint_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("non_terminal_hint");
get {
var code = (SoundIoError) Marshal.ReadInt32 (handle, layout_error_offset); public int BytesPerFrame
return code == SoundIoError.SoundIoErrorNone ? null : Marshal.PtrToStringAnsi (Natives.soundio_strerror ((int) code)); {
get { return Marshal.ReadInt32(handle, bytes_per_frame_offset); }
}
static readonly int bytes_per_frame_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("bytes_per_frame");
public int BytesPerSample
{
get { return Marshal.ReadInt32(handle, bytes_per_sample_offset); }
}
static readonly int bytes_per_sample_offset = (int)Marshal.OffsetOf<SoundIoOutStream>("bytes_per_sample");
public string LayoutErrorMessage
{
get
{
var code = (SoundIoError)Marshal.ReadInt32(handle, layout_error_offset);
return code == SoundIoError.SoundIoErrorNone ? null : Marshal.PtrToStringAnsi(Natives.soundio_strerror((int)code));
} }
} }
static readonly int layout_error_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("layout_error"); static readonly int layout_error_offset = (int)Marshal.OffsetOf<SoundIoOutStream> ("layout_error");
// functions // functions
public void Open () public void Open ()
{ {
var ret = (SoundIoError) Natives.soundio_outstream_open (handle); var ret = (SoundIoError)Natives.soundio_outstream_open(handle);
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
throw new SoundIOException(ret);
}
} }
public void Start () public void Start ()
{ {
var ret = (SoundIoError)Natives.soundio_outstream_start (handle); var ret = (SoundIoError)Natives.soundio_outstream_start(handle);
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
throw new SoundIOException(ret);
}
} }
public SoundIOChannelAreas BeginWrite (ref int frameCount) public SoundIOChannelAreas BeginWrite(ref int frameCount)
{ {
IntPtr ptrs = default (IntPtr); IntPtr ptrs = default;
int nativeFrameCount = frameCount; int nativeFrameCount = frameCount;
unsafe {
unsafe
{
var frameCountPtr = &nativeFrameCount; var frameCountPtr = &nativeFrameCount;
var ptrptr = &ptrs; var ptrptr = &ptrs;
var ret = (SoundIoError)Natives.soundio_outstream_begin_write (handle, (IntPtr) ptrptr, (IntPtr) frameCountPtr); var ret = (SoundIoError)Natives.soundio_outstream_begin_write(handle, (IntPtr)ptrptr, (IntPtr)frameCountPtr);
frameCount = *frameCountPtr; frameCount = *frameCountPtr;
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
return new SoundIOChannelAreas (ptrs, Layout.ChannelCount, frameCount); throw new SoundIOException(ret);
}
return new SoundIOChannelAreas(ptrs, Layout.ChannelCount, frameCount);
} }
} }
public void EndWrite () public void EndWrite ()
{ {
var ret = (SoundIoError) Natives.soundio_outstream_end_write (handle); var ret = (SoundIoError)Natives.soundio_outstream_end_write(handle);
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
throw new SoundIOException(ret);
}
} }
public void ClearBuffer () public void ClearBuffer ()
{ {
Natives.soundio_outstream_clear_buffer (handle); _ = Natives.soundio_outstream_clear_buffer(handle);
} }
public void Pause (bool pause) public void Pause (bool pause)
{ {
var ret = (SoundIoError) Natives.soundio_outstream_pause (handle, pause); var ret = (SoundIoError)Natives.soundio_outstream_pause(handle, pause);
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
throw new SoundIOException(ret);
}
} }
public double GetLatency () public double GetLatency ()
{ {
unsafe { unsafe
{
double* dptr = null; double* dptr = null;
IntPtr p = new IntPtr (dptr); IntPtr p = new IntPtr(dptr);
var ret = (SoundIoError) Natives.soundio_outstream_get_latency (handle, p);
var ret = (SoundIoError)Natives.soundio_outstream_get_latency(handle, p);
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
dptr = (double*) p; throw new SoundIOException(ret);
}
dptr = (double*)p;
return *dptr; return *dptr;
} }
} }
public void SetVolume (double volume) public void SetVolume (double volume)
{ {
var ret = (SoundIoError) Natives.soundio_outstream_set_volume (handle, volume); var ret = (SoundIoError)Natives.soundio_outstream_set_volume(handle, volume);
if (ret != SoundIoError.SoundIoErrorNone) if (ret != SoundIoError.SoundIoErrorNone)
throw new SoundIOException (ret); {
throw new SoundIOException(ret);
}
} }
} }
} }

71
Ryujinx.Audio/Native/libsoundio/SoundIORingBuffer.cs
View file

@ -3,59 +3,56 @@ namespace SoundIOSharp
{ {
public class SoundIORingBuffer : IDisposable public class SoundIORingBuffer : IDisposable
{ {
internal SoundIORingBuffer (IntPtr handle) internal SoundIORingBuffer(IntPtr handle)
{ {
this.handle = handle; this.handle = handle;
} }
IntPtr handle; IntPtr handle;
public int Capacity { public int Capacity
get { return Natives.soundio_ring_buffer_capacity (handle); }
}
public void Clear ()
{ {
Natives.soundio_ring_buffer_clear (handle); get { return Natives.soundio_ring_buffer_capacity(handle); }
} }
public void Dispose () public void Clear()
{ {
Natives.soundio_ring_buffer_destroy (handle); Natives.soundio_ring_buffer_clear(handle);
} }
public int FillCount { public void Dispose()
get {
return Natives.soundio_ring_buffer_fill_count (handle);
}
}
public int FreeCount {
get {
return Natives.soundio_ring_buffer_free_count (handle);
}
}
public IntPtr ReadPointer {
get {
return Natives.soundio_ring_buffer_read_ptr (handle);
}
}
public IntPtr WritePointer {
get {
return Natives.soundio_ring_buffer_write_ptr (handle);
}
}
public void AdvanceReadPointer (int count)
{ {
Natives.soundio_ring_buffer_advance_read_ptr (handle, count); Natives.soundio_ring_buffer_destroy(handle);
} }
public void AdvanceWritePointer (int count) public int FillCount
{ {
Natives.soundio_ring_buffer_advance_write_ptr (handle, count); get { return Natives.soundio_ring_buffer_fill_count(handle); }
}
public int FreeCount
{
get { return Natives.soundio_ring_buffer_free_count(handle); }
}
public IntPtr ReadPointer
{
get { return Natives.soundio_ring_buffer_read_ptr(handle); }
}
public IntPtr WritePointer
{
get { return Natives.soundio_ring_buffer_write_ptr(handle); }
}
public void AdvanceReadPointer(int count)
{
Natives.soundio_ring_buffer_advance_read_ptr(handle, count);
}
public void AdvanceWritePointer(int count)
{
Natives.soundio_ring_buffer_advance_write_ptr(handle, count);
} }
} }
} }

2
Ryujinx.Audio/Native/libsoundio/SoundIOSampleRateRange.cs
View file

@ -3,7 +3,7 @@ namespace SoundIOSharp
{ {
public struct SoundIOSampleRateRange public struct SoundIOSampleRateRange
{ {
internal SoundIOSampleRateRange (int min, int max) internal SoundIOSampleRateRange(int min, int max)
{ {
Min = min; Min = min;
Max = max; Max = max;

2
Ryujinx.Audio/Renderers/OpenAL/OpenALAudioOut.cs
View file

@ -367,7 +367,7 @@ namespace Ryujinx.Audio
{ {
lock (track) lock (track)
{ {
return track.Volume; return track.GetVolume();
} }
} }

10
Ryujinx.Audio/Renderers/OpenAL/OpenALAudioTrack.cs
View file

@ -11,7 +11,6 @@ namespace Ryujinx.Audio
public int SampleRate { get; private set; } public int SampleRate { get; private set; }
public ALFormat Format { get; private set; } public ALFormat Format { get; private set; }
public PlaybackState State { get; set; } public PlaybackState State { get; set; }
public float Volume { get; private set; }
public int HardwareChannels { get; } public int HardwareChannels { get; }
public int VirtualChannels { get; } public int VirtualChannels { get; }
@ -151,9 +150,14 @@ namespace Ryujinx.Audio
public void SetVolume(float volume) public void SetVolume(float volume)
{ {
Volume = volume; AL.Source(SourceId, ALSourcef.Gain, volume);
}
AL.Source(SourceId, ALSourcef.Gain, Volume); public float GetVolume()
{
AL.GetSource(SourceId, ALSourcef.Gain, out float volume);
return volume;
} }
public void Dispose() public void Dispose()

1
Ryujinx.Audio/Renderers/SoundIo/SoundIoAudioOut.cs
View file

@ -1,6 +1,5 @@
using Ryujinx.Audio.SoundIo; using Ryujinx.Audio.SoundIo;
using SoundIOSharp; using SoundIOSharp;
using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Ryujinx.Audio namespace Ryujinx.Audio

10
Ryujinx.HLE/HOS/Services/Audio/AudioOutManager/IAudioOut.cs
View file

@ -85,16 +85,16 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOutManager
{ {
long tag = context.RequestData.ReadInt64(); long tag = context.RequestData.ReadInt64();
context.ResponseData.Write(_audioOut.ContainsBuffer(_track, tag) ? 1 : 0); context.ResponseData.Write(_audioOut.ContainsBuffer(_track, tag));
return 0; return ResultCode.Success;
} }
[Command(7)] // 3.0.0+ [Command(7)] // 3.0.0+
// AppendAudioOutBufferAuto(u64 tag, buffer<nn::audio::AudioOutBuffer, 0x21>) // AppendAudioOutBufferAuto(u64 tag, buffer<nn::audio::AudioOutBuffer, 0x21>)
public ResultCode AppendAudioOutBufferAuto(ServiceCtx context) public ResultCode AppendAudioOutBufferAuto(ServiceCtx context)
{ {
(long position, long size) = context.Request.GetBufferType0x21(); (long position, _) = context.Request.GetBufferType0x21();
return AppendAudioOutBufferImpl(context, position); return AppendAudioOutBufferImpl(context, position);
} }
@ -103,9 +103,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOutManager
{ {
long tag = context.RequestData.ReadInt64(); long tag = context.RequestData.ReadInt64();
AudioOutData data = MemoryHelper.Read<AudioOutData>( AudioOutData data = MemoryHelper.Read<AudioOutData>(context.Memory, position);
context.Memory,
position);
// NOTE: Assume PCM16 all the time, change if new format are found. // NOTE: Assume PCM16 all the time, change if new format are found.
short[] buffer = new short[data.SampleBufferSize / sizeof(short)]; short[] buffer = new short[data.SampleBufferSize / sizeof(short)];

25
Ryujinx.HLE/HOS/Services/Audio/IAudioOutManager.cs
View file

@ -20,10 +20,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio
// ListAudioOuts() -> (u32 count, buffer<bytes, 6>) // ListAudioOuts() -> (u32 count, buffer<bytes, 6>)
public ResultCode ListAudioOuts(ServiceCtx context) public ResultCode ListAudioOuts(ServiceCtx context)
{ {
return ListAudioOutsImpl( return ListAudioOutsImpl(context, context.Request.ReceiveBuff[0].Position, context.Request.ReceiveBuff[0].Size);
context,
context.Request.ReceiveBuff[0].Position,
context.Request.ReceiveBuff[0].Size);
} }
[Command(1)] [Command(1)]
@ -31,12 +28,8 @@ namespace Ryujinx.HLE.HOS.Services.Audio
// -> (u32 sample_rate, u32 channel_count, u32 pcm_format, u32, object<nn::audio::detail::IAudioOut>, buffer<bytes, 6> name_out) // -> (u32 sample_rate, u32 channel_count, u32 pcm_format, u32, object<nn::audio::detail::IAudioOut>, buffer<bytes, 6> name_out)
public ResultCode OpenAudioOut(ServiceCtx context) public ResultCode OpenAudioOut(ServiceCtx context)
{ {
return OpenAudioOutImpl( return OpenAudioOutImpl(context, context.Request.SendBuff[0].Position, context.Request.SendBuff[0].Size,
context, context.Request.ReceiveBuff[0].Position, context.Request.ReceiveBuff[0].Size);
context.Request.SendBuff[0].Position,
context.Request.SendBuff[0].Size,
context.Request.ReceiveBuff[0].Position,
context.Request.ReceiveBuff[0].Size);
} }
[Command(2)] // 3.0.0+ [Command(2)] // 3.0.0+
@ -56,12 +49,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio
(long sendPosition, long sendSize) = context.Request.GetBufferType0x21(); (long sendPosition, long sendSize) = context.Request.GetBufferType0x21();
(long recvPosition, long recvSize) = context.Request.GetBufferType0x22(); (long recvPosition, long recvSize) = context.Request.GetBufferType0x22();
return OpenAudioOutImpl( return OpenAudioOutImpl(context, sendPosition, sendSize, recvPosition, recvSize);
context,
sendPosition,
sendSize,
recvPosition,
recvSize);
} }
private ResultCode ListAudioOutsImpl(ServiceCtx context, long position, long size) private ResultCode ListAudioOutsImpl(ServiceCtx context, long position, long size)
@ -88,10 +76,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio
private ResultCode OpenAudioOutImpl(ServiceCtx context, long sendPosition, long sendSize, long receivePosition, long receiveSize) private ResultCode OpenAudioOutImpl(ServiceCtx context, long sendPosition, long sendSize, long receivePosition, long receiveSize)
{ {
string deviceName = MemoryHelper.ReadAsciiString( string deviceName = MemoryHelper.ReadAsciiString(context.Memory, sendPosition, sendSize);
context.Memory,
sendPosition,
sendSize);
if (deviceName == string.Empty) if (deviceName == string.Empty)
{ {