diff --git a/src/BizHawk.BizInvoke/BizInvoker.cs b/src/BizHawk.BizInvoke/BizInvoker.cs index c01d652071..cf4a36dd53 100644 --- a/src/BizHawk.BizInvoke/BizInvoker.cs +++ b/src/BizHawk.BizInvoke/BizInvoker.cs @@ -298,7 +298,7 @@ namespace BizHawk.BizInvoke var paramTypes = paramInfos.Select(p => p.ParameterType).ToArray(); var nativeParamTypes = new List(); var returnType = baseMethod.ReturnType; - if (returnType != typeof(void) && !returnType.IsPrimitive && !returnType.IsPointer) + if (returnType != typeof(void) && !returnType.IsPrimitive && !returnType.IsPointer && !returnType.IsEnum) { throw new InvalidOperationException("Only primitive return types are supported"); } diff --git a/src/BizHawk.BizInvoke/MemoryBlockLinuxPal.cs b/src/BizHawk.BizInvoke/MemoryBlockLinuxPal.cs index 48caa1595e..2cf882897c 100644 --- a/src/BizHawk.BizInvoke/MemoryBlockLinuxPal.cs +++ b/src/BizHawk.BizInvoke/MemoryBlockLinuxPal.cs @@ -31,7 +31,6 @@ namespace BizHawk.BizInvoke /// public MemoryBlockLinuxPal(ulong start, ulong size) { - // Console.WriteLine($".ctor {start:x16} {size:x16}"); _start = start; _size = size; _fd = memfd_create("MemoryBlockUnix", 1 /*MFD_CLOEXEC*/); @@ -74,11 +73,10 @@ namespace BizHawk.BizInvoke { throw new InvalidOperationException($"{nameof(mmap)}() failed with error {Marshal.GetLastWin32Error()}"); } - // Console.WriteLine($"Add {_start} {_committedSize}"); - if ((IntPtr)LinGuard.AddTripGuard(Z.UU(_start), Z.UU(_committedSize)) == IntPtr.Zero) - { - throw new InvalidOperationException($"{nameof(LinGuard.AddTripGuard)}() returned NULL"); - } + } + if ((IntPtr)LinGuard.AddTripGuard(Z.UU(_start), Z.UU(_size)) == IntPtr.Zero) + { + throw new InvalidOperationException($"{nameof(LinGuard.AddTripGuard)}() returned NULL"); } _active = true; } @@ -90,22 +88,27 @@ namespace BizHawk.BizInvoke var errorCode = munmap(Z.US(_start), Z.UU(_committedSize)); if (errorCode != 0) throw new InvalidOperationException($"{nameof(munmap)}() failed with error {Marshal.GetLastWin32Error()}"); - // Console.WriteLine($"Remove {_start} {_committedSize}"); - if (!LinGuard.RemoveTripGuard(Z.UU(_start), Z.UU(_committedSize))) - throw new InvalidOperationException($"{nameof(LinGuard.RemoveTripGuard)}() returned FALSE"); } + if (!LinGuard.RemoveTripGuard(Z.UU(_start), Z.UU(_size))) + throw new InvalidOperationException($"{nameof(LinGuard.RemoveTripGuard)}() returned FALSE"); _active = false; } - public void Commit(ulong length) + public void Commit(ulong newCommittedSize) { - // Console.WriteLine($"commit {length:x16}"); - Deactivate(); - var errorCode = ftruncate(_fd, Z.US(length)); + var errorCode = ftruncate(_fd, Z.US(newCommittedSize)); if (errorCode != 0) throw new InvalidOperationException($"{nameof(ftruncate)}() failed with error {Marshal.GetLastWin32Error()}"); - _committedSize = length; - Activate(); + // map in the previously unmapped portions contiguously + var ptr = mmap(Z.US(_start + _committedSize), Z.UU(newCommittedSize - _committedSize), + MemoryProtection.Read | MemoryProtection.Write | MemoryProtection.Execute, + 17, // MAP_SHARED | MAP_FIXED + _fd, Z.US(_committedSize)); + if (ptr != Z.US(_start + _committedSize)) + { + throw new InvalidOperationException($"{nameof(mmap)}() failed with error {Marshal.GetLastWin32Error()}"); + } + _committedSize = newCommittedSize; } private static MemoryProtection ToMemoryProtection(Protection prot) @@ -133,7 +136,6 @@ namespace BizHawk.BizInvoke public void Protect(ulong start, ulong size, Protection prot) { - // Console.WriteLine($"protect {start:x16} {size:x16} {prot}"); var errorCode = mprotect( Z.US(start), Z.UU(size), @@ -145,26 +147,18 @@ namespace BizHawk.BizInvoke public void GetWriteStatus(WriteDetectionStatus[] dest, Protection[] pagedata) { - if (_committedSize > 0) - { - // Console.WriteLine($"Examine {_start} {_committedSize}"); - var p = (IntPtr)LinGuard.ExamineTripGuard(Z.UU(_start), Z.UU(_committedSize)); - if (p == IntPtr.Zero) - throw new InvalidOperationException($"{nameof(LinGuard.ExamineTripGuard)}() returned NULL!"); - Marshal.Copy(p, (byte[])(object)dest, 0, (int)(_committedSize >> WaterboxUtils.PageShift)); - } + var p = (IntPtr)LinGuard.ExamineTripGuard(Z.UU(_start), Z.UU(_size)); + if (p == IntPtr.Zero) + throw new InvalidOperationException($"{nameof(LinGuard.ExamineTripGuard)}() returned NULL!"); + Marshal.Copy(p, (byte[])(object)dest, 0, dest.Length); } public void SetWriteStatus(WriteDetectionStatus[] src) { - if (_committedSize > 0) - { - // Console.WriteLine($"Examine {_start} {_committedSize}"); - var p = (IntPtr)LinGuard.ExamineTripGuard(Z.UU(_start), Z.UU(_committedSize)); - if (p == IntPtr.Zero) - throw new InvalidOperationException($"{nameof(LinGuard.ExamineTripGuard)}() returned NULL!"); - Marshal.Copy((byte[])(object)src, 0, p, (int)(_committedSize >> WaterboxUtils.PageShift)); - } + var p = (IntPtr)LinGuard.ExamineTripGuard(Z.UU(_start), Z.UU(_size)); + if (p == IntPtr.Zero) + throw new InvalidOperationException($"{nameof(LinGuard.ExamineTripGuard)}() returned NULL!"); + Marshal.Copy((byte[])(object)src, 0, p, src.Length); } private static unsafe class LinGuard diff --git a/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj index 192e17f609..3a82dc6f33 100644 --- a/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj +++ b/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj @@ -7,6 +7,7 @@ + diff --git a/src/BizHawk.Emulation.Common/Sound/LibSpeexDSP.cs b/src/BizHawk.Emulation.Common/Sound/LibSpeexDSP.cs new file mode 100644 index 0000000000..9765f219fc --- /dev/null +++ b/src/BizHawk.Emulation.Common/Sound/LibSpeexDSP.cs @@ -0,0 +1,232 @@ +using System; +using System.Runtime.InteropServices; +using BizHawk.BizInvoke; +using static BizHawk.Emulation.Common.SpeexResampler; + +namespace BizHawk.Emulation.Common +{ + public abstract class LibSpeexDSP + { + public enum RESAMPLER_ERR + { + SUCCESS = 0, + ALLOC_FAILED = 1, + BAD_STATE = 2, + INVALID_ARG = 3, + PTR_OVERLAP = 4, + MAX_ERROR + } + + /// + /// Create a new resampler with integer input and output rates. + /// + /// Number of channels to be processed + /// Input sampling rate (integer number of Hz). + /// Output sampling rate (integer number of Hz). + /// Resampling quality between 0 and 10, where 0 has poor quality and 10 has very high quality. + /// The error state + /// Newly created resampler state + [BizImport(CallingConvention.Cdecl)] + public abstract IntPtr speex_resampler_init(uint nb_channels, uint in_rate, uint out_rate, Quality quality, ref RESAMPLER_ERR err); + + /// + /// Create a new resampler with fractional input/output rates. The sampling + /// rate ratio is an arbitrary rational number with both the numerator and + /// denominator being 32-bit integers. + /// + /// Number of channels to be processed + /// Numerator of the sampling rate ratio + /// Denominator of the sampling rate ratio + /// Input sampling rate rounded to the nearest integer (in Hz). + /// Output sampling rate rounded to the nearest integer (in Hz). + /// Resampling quality between 0 and 10, where 0 has poor quality and 10 has very high quality. + /// The error state + /// Newly created resampler state + [BizImport(CallingConvention.Cdecl)] + public abstract IntPtr speex_resampler_init_frac(uint nb_channels, uint ratio_num, uint ratio_den, uint in_rate, uint out_rate, Quality quality, ref RESAMPLER_ERR err); + + /// + /// Destroy a resampler state. + /// + /// Resampler state + [BizImport(CallingConvention.Cdecl)] + public abstract void speex_resampler_destroy(IntPtr st); + + /// + /// Resample a float array. The input and output buffers must *not* overlap. + /// + /// Resampler state + /// Index of the channel to process for the multi-channel base (0 otherwise) + /// Input buffer + /// Number of input samples in the input buffer. Returns the number of samples processed + /// Output buffer + /// Size of the output buffer. Returns the number of samples written + [BizImport(CallingConvention.Cdecl)] + public abstract RESAMPLER_ERR speex_resampler_process_float(IntPtr st, uint channel_index, float[] inp, ref uint in_len, float[] outp, ref uint out_len); + + /// + /// Resample an int array. The input and output buffers must *not* overlap. + /// + /// Resampler state + /// Index of the channel to process for the multi-channel base (0 otherwise) + /// Input buffer + /// Number of input samples in the input buffer. Returns the number of samples processed + /// Output buffer + /// Size of the output buffer. Returns the number of samples written + [BizImport(CallingConvention.Cdecl)] + public abstract RESAMPLER_ERR speex_resampler_process_int(IntPtr st, uint channel_index, short[] inp, ref uint in_len, short[] outp, ref uint out_len); + + /// + /// Resample an interleaved float array. The input and output buffers must *not* overlap. + /// + /// Resampler state + /// Input buffer + /// Number of input samples in the input buffer. Returns the number of samples processed. This is all per-channel. + /// Output buffer + /// Size of the output buffer. Returns the number of samples written. This is all per-channel. + [BizImport(CallingConvention.Cdecl)] + public abstract RESAMPLER_ERR speex_resampler_process_interleaved_float(IntPtr st, float[] inp, ref uint in_len, float[] outp, ref uint out_len); + + /// + /// Resample an interleaved int array. The input and output buffers must *not* overlap. + /// + /// Resampler state + /// Input buffer + /// Number of input samples in the input buffer. Returns the number of samples processed. This is all per-channel. + /// Output buffer + /// Size of the output buffer. Returns the number of samples written. This is all per-channel. + [BizImport(CallingConvention.Cdecl)] + public abstract RESAMPLER_ERR speex_resampler_process_interleaved_int(IntPtr st, short[] inp, ref uint in_len, short[] outp, ref uint out_len); + + /// + /// Set (change) the input/output sampling rates (integer value). + /// + /// Resampler state + /// Input sampling rate (integer number of Hz). + /// Output sampling rate (integer number of Hz). + [BizImport(CallingConvention.Cdecl)] + public abstract RESAMPLER_ERR speex_resampler_set_rate(IntPtr st, uint in_rate, uint out_rate); + + /// + /// Get the current input/output sampling rates (integer value). + /// + /// Resampler state + /// Input sampling rate (integer number of Hz) copied. + /// Output sampling rate (integer number of Hz) copied. + [BizImport(CallingConvention.Cdecl)] + public abstract void speex_resampler_get_rate(IntPtr st, ref uint in_rate, ref uint out_rate); + + /// + /// Set (change) the input/output sampling rates and resampling ratio (fractional values in Hz supported). + /// + /// resampler state + /// Numerator of the sampling rate ratio + /// Denominator of the sampling rate ratio + /// Input sampling rate rounded to the nearest integer (in Hz). + /// Output sampling rate rounded to the nearest integer (in Hz). + [BizImport(CallingConvention.Cdecl)] + public abstract RESAMPLER_ERR speex_resampler_set_rate_frac(IntPtr st, uint ratio_num, uint ratio_den, uint in_rate, uint out_rate); + + /// + /// Get the current resampling ratio. This will be reduced to the least common denominator. + /// + /// Resampler state + /// Numerator of the sampling rate ratio copied + /// Denominator of the sampling rate ratio copied + [BizImport(CallingConvention.Cdecl)] + public abstract void speex_resampler_get_ratio(IntPtr st, ref uint ratio_num, ref uint ratio_den); + + /// + /// Set (change) the conversion quality. + /// + /// Resampler state + /// Resampling quality between 0 and 10, where 0 has poor quality and 10 has very high quality. + [BizImport(CallingConvention.Cdecl)] + public abstract RESAMPLER_ERR speex_resampler_set_quality(IntPtr st, Quality quality); + + /// + /// Get the conversion quality. + /// + /// Resampler state + /// Resampling quality between 0 and 10, where 0 has poor quality and 10 has very high quality. + [BizImport(CallingConvention.Cdecl)] + public abstract void speex_resampler_get_quality(IntPtr st, ref Quality quality); + + /// + /// Set (change) the input stride. + /// + /// Resampler state + /// Input stride + [BizImport(CallingConvention.Cdecl)] + public abstract void speex_resampler_set_input_stride(IntPtr st, uint stride); + + /// + /// Get the input stride. + /// + /// Resampler state + /// Input stride copied + [BizImport(CallingConvention.Cdecl)] + public abstract void speex_resampler_get_input_stride(IntPtr st, ref uint stride); + + /// + /// Set (change) the output stride. + /// + /// Resampler state + /// Output stride + [BizImport(CallingConvention.Cdecl)] + public abstract void speex_resampler_set_output_stride(IntPtr st, uint stride); + + /// + /// Get the output stride. + /// + /// Resampler state + /// Output stride copied + [BizImport(CallingConvention.Cdecl)] + public abstract void speex_resampler_get_output_stride(IntPtr st, ref uint stride); + + /*these two functions don't exist in our version of the dll + + /// + /// Get the latency in input samples introduced by the resampler. + /// + /// Resampler state + [BizImport(CallingConvention.Cdecl)] + public abstract int speex_resampler_get_input_latency(IntPtr st); + + /// + /// Get the latency in output samples introduced by the resampler. + /// + /// Resampler state + [BizImport(CallingConvention.Cdecl)] + public abstract int speex_resampler_get_output_latency(IntPtr st); + + */ + + /// + /// Make sure that the first samples to go out of the resampler don't have + /// leading zeros. This is only useful before starting to use a newly created + /// resampler. It is recommended to use that when resampling an audio file, as + /// it will generate a file with the same length. For real-time processing, + /// it is probably easier not to use this call (so that the output duration + /// is the same for the first frame). + /// + /// Resampler state + [BizImport(CallingConvention.Cdecl)] + public abstract RESAMPLER_ERR speex_resampler_skip_zeros(IntPtr st); + + /// + /// Reset a resampler so a new (unrelated) stream can be processed. + /// + /// Resampler state + [BizImport(CallingConvention.Cdecl)] + public abstract RESAMPLER_ERR speex_resampler_reset_mem(IntPtr st); + + /// + /// Returns the English meaning for an error code + /// + /// Error code + /// English string + [BizImport(CallingConvention.Cdecl, Compatibility = true)] + public abstract string speex_resampler_strerror(RESAMPLER_ERR err); + } +} diff --git a/src/BizHawk.Emulation.Common/Sound/SpeexResampler.cs b/src/BizHawk.Emulation.Common/Sound/SpeexResampler.cs index 8a168f224a..e8c6b5d02d 100644 --- a/src/BizHawk.Emulation.Common/Sound/SpeexResampler.cs +++ b/src/BizHawk.Emulation.Common/Sound/SpeexResampler.cs @@ -1,5 +1,6 @@ using System; -using System.Runtime.InteropServices; +using BizHawk.BizInvoke; +using BizHawk.Common; // ReSharper disable UnusedMember.Local // ReSharper disable UnusedMember.Global @@ -13,6 +14,14 @@ namespace BizHawk.Emulation.Common /// public class SpeexResampler : IDisposable, ISoundProvider { + private static readonly LibSpeexDSP NativeDSP; + private static readonly IImportResolver NativeDLL; + static SpeexResampler() + { + NativeDLL = new DynamicLibraryImportResolver(OSTailoredCode.IsUnixHost ? "libspeexdsp.so.1" : "libspeexdsp.dll"); + NativeDSP = BizInvoker.GetInvoker(NativeDLL, CallingConventionAdapters.Native); + } + // to accept an ISyncSoundProvider input private readonly ISoundProvider _input; @@ -34,231 +43,6 @@ namespace BizHawk.Emulation.Common QUALITY_DESKTOP = 5 } - private static class LibSpeexDSP - { - public enum RESAMPLER_ERR - { - SUCCESS = 0, - ALLOC_FAILED = 1, - BAD_STATE = 2, - INVALID_ARG = 3, - PTR_OVERLAP = 4, - MAX_ERROR - } - - /// - /// Create a new resampler with integer input and output rates. - /// - /// Number of channels to be processed - /// Input sampling rate (integer number of Hz). - /// Output sampling rate (integer number of Hz). - /// Resampling quality between 0 and 10, where 0 has poor quality and 10 has very high quality. - /// The error state - /// Newly created resampler state - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr speex_resampler_init(uint nb_channels, uint in_rate, uint out_rate, Quality quality, ref RESAMPLER_ERR err); - - /// - /// Create a new resampler with fractional input/output rates. The sampling - /// rate ratio is an arbitrary rational number with both the numerator and - /// denominator being 32-bit integers. - /// - /// Number of channels to be processed - /// Numerator of the sampling rate ratio - /// Denominator of the sampling rate ratio - /// Input sampling rate rounded to the nearest integer (in Hz). - /// Output sampling rate rounded to the nearest integer (in Hz). - /// Resampling quality between 0 and 10, where 0 has poor quality and 10 has very high quality. - /// The error state - /// Newly created resampler state - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern IntPtr speex_resampler_init_frac(uint nb_channels, uint ratio_num, uint ratio_den, uint in_rate, uint out_rate, Quality quality, ref RESAMPLER_ERR err); - - /// - /// Destroy a resampler state. - /// - /// Resampler state - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern void speex_resampler_destroy(IntPtr st); - - /// - /// Resample a float array. The input and output buffers must *not* overlap. - /// - /// Resampler state - /// Index of the channel to process for the multi-channel base (0 otherwise) - /// Input buffer - /// Number of input samples in the input buffer. Returns the number of samples processed - /// Output buffer - /// Size of the output buffer. Returns the number of samples written - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern RESAMPLER_ERR speex_resampler_process_float(IntPtr st, uint channel_index, float[] inp, ref uint in_len, float[] outp, ref uint out_len); - - /// - /// Resample an int array. The input and output buffers must *not* overlap. - /// - /// Resampler state - /// Index of the channel to process for the multi-channel base (0 otherwise) - /// Input buffer - /// Number of input samples in the input buffer. Returns the number of samples processed - /// Output buffer - /// Size of the output buffer. Returns the number of samples written - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern RESAMPLER_ERR speex_resampler_process_int(IntPtr st, uint channel_index, short[] inp, ref uint in_len, short[] outp, ref uint out_len); - - /// - /// Resample an interleaved float array. The input and output buffers must *not* overlap. - /// - /// Resampler state - /// Input buffer - /// Number of input samples in the input buffer. Returns the number of samples processed. This is all per-channel. - /// Output buffer - /// Size of the output buffer. Returns the number of samples written. This is all per-channel. - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern RESAMPLER_ERR speex_resampler_process_interleaved_float(IntPtr st, float[] inp, ref uint in_len, float[] outp, ref uint out_len); - - /// - /// Resample an interleaved int array. The input and output buffers must *not* overlap. - /// - /// Resampler state - /// Input buffer - /// Number of input samples in the input buffer. Returns the number of samples processed. This is all per-channel. - /// Output buffer - /// Size of the output buffer. Returns the number of samples written. This is all per-channel. - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern RESAMPLER_ERR speex_resampler_process_interleaved_int(IntPtr st, short[] inp, ref uint in_len, short[] outp, ref uint out_len); - - /// - /// Set (change) the input/output sampling rates (integer value). - /// - /// Resampler state - /// Input sampling rate (integer number of Hz). - /// Output sampling rate (integer number of Hz). - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern RESAMPLER_ERR speex_resampler_set_rate(IntPtr st, uint in_rate, uint out_rate); - - /// - /// Get the current input/output sampling rates (integer value). - /// - /// Resampler state - /// Input sampling rate (integer number of Hz) copied. - /// Output sampling rate (integer number of Hz) copied. - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern void speex_resampler_get_rate(IntPtr st, ref uint in_rate, ref uint out_rate); - - /// - /// Set (change) the input/output sampling rates and resampling ratio (fractional values in Hz supported). - /// - /// resampler state - /// Numerator of the sampling rate ratio - /// Denominator of the sampling rate ratio - /// Input sampling rate rounded to the nearest integer (in Hz). - /// Output sampling rate rounded to the nearest integer (in Hz). - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern RESAMPLER_ERR speex_resampler_set_rate_frac(IntPtr st, uint ratio_num, uint ratio_den, uint in_rate, uint out_rate); - - /// - /// Get the current resampling ratio. This will be reduced to the least common denominator. - /// - /// Resampler state - /// Numerator of the sampling rate ratio copied - /// Denominator of the sampling rate ratio copied - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern void speex_resampler_get_ratio(IntPtr st, ref uint ratio_num, ref uint ratio_den); - - /// - /// Set (change) the conversion quality. - /// - /// Resampler state - /// Resampling quality between 0 and 10, where 0 has poor quality and 10 has very high quality. - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern RESAMPLER_ERR speex_resampler_set_quality(IntPtr st, Quality quality); - - /// - /// Get the conversion quality. - /// - /// Resampler state - /// Resampling quality between 0 and 10, where 0 has poor quality and 10 has very high quality. - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern void speex_resampler_get_quality(IntPtr st, ref Quality quality); - - /// - /// Set (change) the input stride. - /// - /// Resampler state - /// Input stride - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern void speex_resampler_set_input_stride(IntPtr st, uint stride); - - /// - /// Get the input stride. - /// - /// Resampler state - /// Input stride copied - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern void speex_resampler_get_input_stride(IntPtr st, ref uint stride); - - /// - /// Set (change) the output stride. - /// - /// Resampler state - /// Output stride - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern void speex_resampler_set_output_stride(IntPtr st, uint stride); - - /// - /// Get the output stride. - /// - /// Resampler state - /// Output stride copied - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern void speex_resampler_get_output_stride(IntPtr st, ref uint stride); - - /*these two functions don't exist in our version of the dll - - /// - /// Get the latency in input samples introduced by the resampler. - /// - /// Resampler state - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern int speex_resampler_get_input_latency(IntPtr st); - - /// - /// Get the latency in output samples introduced by the resampler. - /// - /// Resampler state - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern int speex_resampler_get_output_latency(IntPtr st); - - */ - - /// - /// Make sure that the first samples to go out of the resampler don't have - /// leading zeros. This is only useful before starting to use a newly created - /// resampler. It is recommended to use that when resampling an audio file, as - /// it will generate a file with the same length. For real-time processing, - /// it is probably easier not to use this call (so that the output duration - /// is the same for the first frame). - /// - /// Resampler state - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern RESAMPLER_ERR speex_resampler_skip_zeroes(IntPtr st); - - /// - /// Reset a resampler so a new (unrelated) stream can be processed. - /// - /// Resampler state - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern RESAMPLER_ERR speex_resampler_reset_mem(IntPtr st); - - /// - /// Returns the English meaning for an error code - /// - /// Error code - /// English string - [DllImport("libspeexdsp.dll", CallingConvention = CallingConvention.Cdecl)] - public static extern string speex_resampler_strerror(RESAMPLER_ERR err); - } - // opaque pointer to state private IntPtr _st = IntPtr.Zero; @@ -308,7 +92,7 @@ namespace BizHawk.Emulation.Common } var err = LibSpeexDSP.RESAMPLER_ERR.SUCCESS; - _st = LibSpeexDSP.speex_resampler_init_frac(2, rationum, ratioden, sratein, srateout, quality, ref err); + _st = NativeDSP.speex_resampler_init_frac(2, rationum, ratioden, sratein, srateout, quality, ref err); if (_st == IntPtr.Zero) { @@ -330,7 +114,7 @@ namespace BizHawk.Emulation.Common /// sampling rate out, rounded to nearest hz public void ChangeRate(uint rationum, uint ratioden, uint sratein, uint srateout) { - CheckError(LibSpeexDSP.speex_resampler_set_rate_frac(_st, rationum, ratioden, sratein, srateout)); + CheckError(NativeDSP.speex_resampler_set_rate_frac(_st, rationum, ratioden, sratein, srateout)); _outbuf = new short[(_inbuf.Length * ratioden / rationum / 2 * 2) + 128]; } @@ -379,7 +163,7 @@ namespace BizHawk.Emulation.Common uint outal = (uint)_outbuf.Length / 2; - LibSpeexDSP.speex_resampler_process_interleaved_int(_st, _inbuf, ref inal, _outbuf, ref outal); + NativeDSP.speex_resampler_process_interleaved_int(_st, _inbuf, ref inal, _outbuf, ref outal); // reset inbuf if (inal != _inbufpos / 2) @@ -395,7 +179,7 @@ namespace BizHawk.Emulation.Common { if (_st != IntPtr.Zero) { - LibSpeexDSP.speex_resampler_destroy(_st); + NativeDSP.speex_resampler_destroy(_st); _st = IntPtr.Zero; GC.SuppressFinalize(this); } diff --git a/src/BizHawk.Emulation.Cores/Waterbox/WaterboxHost.cs b/src/BizHawk.Emulation.Cores/Waterbox/WaterboxHost.cs index 50eb12060d..497021b016 100644 --- a/src/BizHawk.Emulation.Cores/Waterbox/WaterboxHost.cs +++ b/src/BizHawk.Emulation.Cores/Waterbox/WaterboxHost.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; +using System.Threading; namespace BizHawk.Emulation.Cores.Waterbox { @@ -73,6 +74,14 @@ namespace BizHawk.Emulation.Cores.Waterbox public class WaterboxHost : Swappable, IImportResolver, IBinaryStateable { + static WaterboxHost() + { + if (OSTailoredCode.IsUnixHost) + { + WaterboxLibcoLinuxStartup.Setup(); + } + } + /// /// usual starting point for the executable /// @@ -434,4 +443,30 @@ namespace BizHawk.Emulation.Cores.Waterbox } } } + + internal static class WaterboxLibcoLinuxStartup + { + // TODO: This is a giant mess and get rid of it entirely + internal static void Setup() + { + // Our libco implementation plays around with stuff in the TEB block. This is bad for a few reasons: + // 1. It's windows specific + // 2. It's only doing this to satisfy some msvs __stkchk code that should never run + // 3. That code is only running because memory allocations in a cothread still send you back + // to managed land where things like the .NET jit might run on the costack, oof. + + // We need to stop #3 from happening, probably by making the waterboxhost unmanaged code. Then if we + // still need "GS fiddling" we can have it be part of our syscall layer without having a managed transition + + // Until then, just fake a TEB block for linux -- nothing else uses GS anyway. + var ptr = Marshal.AllocHGlobal(0x40); + WaterboxUtils.ZeroMemory(ptr, 0x40); + Marshal.WriteIntPtr(ptr, 0x30, ptr); + if (ArchPrCtl(0x1001 /* SET_GS */, Z.SU((long)ptr)) != 0) + throw new InvalidOperationException("ArchPrCtl failed!"); + } + + [DllImport("libc.so.6", EntryPoint = "arch_prctl")] + private static extern int ArchPrCtl(int code, UIntPtr addr); + } }