Merge branch 'SineVector241:master' into master

Author: purpshell

OpusSharp.Android/OpusSharp.Android.nuspec

@@ -7,7 +7,7 @@
     <authors>The Opus Audio Codec Authors</authors>
     <projectUrl>https://opus-codec.org/</projectUrl>
     <dependencies>
-      <dependency id="OpusSharp.Core" version="1.0.3" />
+      <dependency id="OpusSharp.Core" version="1.0.4" />
     </dependencies>
   </metadata>
 

OpusSharp.Core/Disposable.cs

@@ -0,0 +1,61 @@
+/////////////////////////////////////////////////////////////////////////////////
+// paint.net                                                                   //
+// Copyright (C) dotPDN LLC, Rick Brewster, and contributors.                  //
+// All Rights Reserved.                                                        //
+/////////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Threading;
+
+namespace OpusSharp.Core
+{
+    /// <summary>
+    /// Provides a standard implementation of IDisposable and IIsDisposed.
+    /// </summary>
+    [Serializable]
+    public abstract class Disposable : IDisposable
+    {
+        private int isDisposed; // 0 for false, 1 for true
+
+        public bool IsDisposed
+        {
+            get => Volatile.Read(ref this.isDisposed) != 0;
+        }
+
+        protected Disposable()
+        {
+        }
+
+        ~Disposable()
+        {
+            int oldIsDisposed = Interlocked.Exchange(ref this.isDisposed, 1);
+            if (oldIsDisposed == 0)
+            {
+                Dispose(false);
+            }
+        }
+
+        public void Dispose()
+        {
+            int oldIsDisposed = Interlocked.Exchange(ref this.isDisposed, 1);
+            if (oldIsDisposed == 0)
+            {
+                try
+                {
+                    Dispose(true);
+                }
+                finally
+                {
+                    GC.SuppressFinalize(this);
+                }
+            }
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
+
+// https://gist.github.com/rickbrew/fc3e660c0930747f031e64ab7696c60d

OpusSharp.Core/Enums/Application.cs

@@ -1,10 +1,28 @@
-namespace OpusSharp.Enums
+namespace OpusSharp.Core.Enums
 {
+    /// <summary>
+    /// Decoder related Ctl's.
+    /// </summary>
     public enum DecoderCtl : int
     {
-        SET_GAIN = 4034,
-        GET_GAIN = 4045, //Someone inside opus made a mistake here, Apparently.
-        GET_LAST_PACKET_DURATION = 4039,
-        GET_PITCH = 4033
+        /// <summary>
+        /// Configures decoder gain adjustment.
+        /// </summary>
+        OPUS_SET_GAIN_REQUEST = 4034,
+
+        /// <summary>
+        /// Gets the decoder's configured gain adjustment.
+        /// </summary>
+        OPUS_GET_GAIN_REQUEST = 4045, //Someone inside opus made a mistake here, Apparently.
+
+        /// <summary>
+        /// Gets the duration (in samples) of the last packet successfully decoded or concealed.
+        /// </summary>
+        OPUS_GET_LAST_PACKET_DURATION_REQUEST = 4039,
+
+        /// <summary>
+        /// Gets the pitch of the last decoded frame, if available.
+        /// </summary>
+        OPUS_GET_PITCH_REQUEST = 4033
     }
 }

OpusSharp.Core/Enums/DecoderCtl.cs

@@ -1,39 +1,173 @@
-namespace OpusSharp.Enums
+namespace OpusSharp.Core.Enums
 {
     /// <summary>
     /// Encoder related CTL's.
     /// </summary>
     public enum EncoderCtl : int
     {
-        SET_COMPLEXITY = 4010,
-        GET_COMPLEXITY = 4011,
-        SET_BITRATE = 4002,
-        GET_BITRATE = 4003,
-        SET_VBR = 4006,
-        GET_VBR = 4007,
-        SET_VBR_CONSTRAINT = 4020,
-        GET_VBR_CONSTRAINT = 4021,
-        SET_FORCE_CHANNELS = 4022,
-        GET_FORCE_CHANNELS = 4023,
-        SET_MAX_BANDWIDTH = 4004,
-        GET_MAX_BANDWIDTH = 4005,
-        SET_BANDWIDTH = 4008,
-        SET_SIGNAL = 4024,
-        GET_SIGNAL = 4025,
-        SET_APPLICATION = 4000,
-        GET_APPLICATION = 4001,
-        GET_LOOKAHEAD = 4027,
-        SET_INBAND_FEC = 4012,
-        GET_INBAND_FEC = 4013,
-        SET_PACKET_LOSS_PERC = 4014,
-        GET_PACKET_LOSS_PERC = 4015,
-        SET_DTX = 4016,
-        GET_DTX = 4017,
-        SET_LSB_DEPTH = 4036,
-        GET_LSB_DEPTH = 4037,
-        SET_EXPERT_FRAME_DURATION = 4040,
-        GET_EXPERT_FRAME_DURATION = 4041,
-        SET_PREDICTION_DISABLED = 4042,
-        GET_PREDICTION_DISABLED = 4043
+        /// <summary>
+        /// Configures the encoder's computational complexity.
+        /// </summary>
+        OPUS_SET_COMPLEXITY_REQUEST = 4010,
+
+        /// <summary>
+        /// Gets the encoder's complexity configuration.
+        /// </summary>
+        OPUS_GET_COMPLEXITY_REQUEST = 4011,
+
+        /// <summary>
+        /// Configures the bitrate in the encoder.
+        /// </summary>
+        OPUS_SET_BITRATE_REQUEST = 4002,
+
+        /// <summary>
+        /// Gets the encoder's bitrate configuration.
+        /// </summary>
+        OPUS_GET_BITRATE_REQUEST = 4003,
+
+        /// <summary>
+        /// Enables or disables variable bitrate (VBR) in the encoder.
+        /// </summary>
+        OPUS_SET_VBR_REQUEST = 4006,
+
+        /// <summary>
+        /// Determine if variable bitrate (VBR) is enabled in the encoder.
+        /// </summary>
+        OPUS_GET_VBR_REQUEST = 4007,
+
+        /// <summary>
+        /// Enables or disables variable bitrate (VBR) in the encoder.
+        /// </summary>
+        OPUS_SET_VBR_CONSTRAINT_REQUEST = 4020,
+
+        /// <summary>
+        /// Determine if constrained VBR is enabled in the encoder.
+        /// </summary>
+        OPUS_GET_VBR_CONSTRAINT_REQUEST = 4021,
+
+        /// <summary>
+        /// Configures mono/stereo forcing in the encoder.
+        /// </summary>
+        OPUS_SET_FORCE_CHANNELS_REQUEST = 4022,
+
+        /// <summary>
+        /// Gets the encoder's forced channel configuration.
+        /// </summary>
+        OPUS_GET_FORCE_CHANNELS_REQUEST = 4023,
+
+        /// <summary>
+        /// Configures the maximum bandpass that the encoder will select automatically.
+        /// </summary>
+        OPUS_SET_MAX_BANDWIDTH_REQUEST = 4004,
+
+        /// <summary>
+        /// Gets the encoder's configured maximum allowed bandpass.
+        /// </summary>
+        OPUS_GET_MAX_BANDWIDTH_REQUEST = 4005,
+
+        /// <summary>
+        /// Sets the encoder's bandpass to a specific value.
+        /// </summary>
+        OPUS_SET_BANDWIDTH_REQUEST = 4008,
+
+        /// <summary>
+        /// Configures the type of signal being encoded.
+        /// </summary>
+        OPUS_SET_SIGNAL_REQUEST = 4024,
+
+        /// <summary>
+        /// Gets the encoder's configured signal type.
+        /// </summary>
+        OPUS_GET_SIGNAL_REQUEST = 4025,
+
+        /// <summary>
+        /// Configures the encoder's intended application.
+        /// </summary>
+        OPUS_SET_APPLICATION_REQUEST = 4000,
+
+        /// <summary>
+        /// Gets the encoder's configured application.
+        /// </summary>
+        OPUS_GET_APPLICATION_REQUEST = 4001,
+
+        /// <summary>
+        /// Gets the total samples of delay added by the entire codec.
+        /// </summary>
+        OPUS_GET_LOOKAHEAD_REQUEST = 4027,
+
+        /// <summary>
+        /// Configures the encoder's use of inband forward error correction (FEC).
+        /// </summary>
+        OPUS_SET_INBAND_FEC_REQUEST = 4012,
+
+        /// <summary>
+        /// Gets encoder's configured use of inband forward error correction.
+        /// </summary>
+        OPUS_GET_INBAND_FEC_REQUEST = 4013,
+
+        /// <summary>
+        /// Configures the encoder's expected packet loss percentage.
+        /// </summary>
+        OPUS_SET_PACKET_LOSS_PERC_REQUEST = 4014,
+
+        /// <summary>
+        /// Gets the encoder's configured packet loss percentage.
+        /// </summary>
+        OPUS_GET_PACKET_LOSS_PERC_REQUEST = 4015,
+
+        /// <summary>
+        /// Configures the encoder's use of discontinuous transmission (DTX).
+        /// </summary>
+        OPUS_SET_DTX_REQUEST = 4016,
+
+        /// <summary>
+        /// Gets encoder's configured use of discontinuous transmission.
+        /// </summary>
+        OPUS_GET_DTX_REQUEST = 4017,
+
+        /// <summary>
+        /// Configures the depth of signal being encoded.
+        /// </summary>
+        OPUS_SET_LSB_DEPTH_REQUEST = 4036,
+
+        /// <summary>
+        /// Gets the encoder's configured signal depth.
+        /// </summary>
+        OPUS_GET_LSB_DEPTH_REQUEST = 4037,
+
+        /// <summary>
+        /// Configures the encoder's use of variable duration frames.
+        /// </summary>
+        OPUS_SET_EXPERT_FRAME_DURATION_REQUEST = 4040,
+
+        /// <summary>
+        /// Gets the encoder's configured use of variable duration frames.
+        /// </summary>
+        OPUS_GET_EXPERT_FRAME_DURATION_REQUEST = 4041,
+
+        /// <summary>
+        /// If set to 1, disables almost all use of prediction, making frames almost completely independent.
+        /// </summary>
+        OPUS_SET_PREDICTION_DISABLED_REQUEST = 4042,
+
+        /// <summary>
+        /// Gets the encoder's configured prediction status.
+        /// </summary>
+        OPUS_GET_PREDICTION_DISABLED_REQUEST = 4043,
+
+        /// <summary>
+        /// If non-zero, enables Deep Redundancy (DRED) and use the specified maximum number of 10-ms redundant frames.
+        /// </summary>
+        OPUS_SET_DRED_DURATION_REQUEST = 4050,
+
+        /// <summary>
+        /// Gets the encoder's configured Deep Redundancy (DRED) maximum number of frames.
+        /// </summary>
+        OPUS_GET_DRED_DURATION_REQUEST = 4051,
+
+        /// <summary>
+        /// Provide external DNN weights from binary object (only when explicitly built without the weights).
+        /// </summary>
+        OPUS_SET_DNN_BLOB_REQUEST = 4052
     }
 }

OpusSharp.Core/Enums/EncoderCtl.cs

@@ -0,0 +1,43 @@
+namespace OpusSharp.Core.Enums
+{
+    /// <summary>
+    /// These macros are used with the Decoder and Encoder CTL calls to generate a particular request.
+    /// </summary>
+    public enum GenericCtl : int
+    {
+        /// <summary>
+        /// Resets the codec state to be equivalent to a freshly initialized state.
+        /// </summary>
+        OPUS_RESET_STATE = 4028,
+
+        /// <summary>
+        /// Gets the final state of the codec's entropy coder.
+        /// </summary>
+        OPUS_GET_FINAL_RANGE_REQUEST = 4031,
+
+        /// <summary>
+        /// Gets the encoder's configured bandpass or the decoder's last bandpass.
+        /// </summary>
+        OPUS_GET_BANDWIDTH_REQUEST = 4009,
+
+        /// <summary>
+        /// Gets the sampling rate the encoder or decoder was initialized with.
+        /// </summary>
+        OPUS_GET_SAMPLE_RATE_REQUEST = 4029,
+
+        /// <summary>
+        /// If set to 1, disables the use of phase inversion for intensity stereo, improving the quality of mono downmixes, but slightly reducing normal stereo quality.
+        /// </summary>
+        OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST = 4046,
+
+        /// <summary>
+        /// Gets the encoder's configured phase inversion status.
+        /// </summary>
+        OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST = 4047,
+
+        /// <summary>
+        /// Gets the DTX state of the encoder.
+        /// </summary>
+        OPUS_GET_IN_DTX_REQUEST = 4049
+    }
+}

OpusSharp.Core/Enums/GenericCtl.cs

@@ -1,12 +1,12 @@
-namespace OpusSharp.Enums
+namespace OpusSharp.Core.Enums
 {
     /// <summary>
     /// Specifies the type of opus error.
     /// </summary>
     public enum OpusError : int
     {
         /// <summary>
-        /// No error.
+        /// No error. This does not throw the <seealso cref="OpusException"/>
         /// </summary>
         OK = 0,
         /// <summary>