com.adrenak.univoice 4.0.0 → 4.1.0

package/README.md

@@ -12,11 +12,13 @@ Some features of UniVoice:
   * 🔊 __Configurable Audio Output__:  UniVoice is audio output agnostic. Out of the box is supports playing peer audio using Unity AudioSource. You can divert incoming audio to anywhere you want by implementing the `IAudioOutput` interface.  
 
   * 🌐 __Configurable Network__: UniVoice is network agnostic and supports Mirror out of the box. You can implement the `IAudioClient` and `IAudioServer` interfaces using the networking plugin of your choice to make it compatible with it.
+
+  * ✏️ __Audio Filters__: Modify outgoing and incoming audio by implementing the `IAudioFilter` interface. Gaussian blurring for denoising and Opus (Concentus) encoding & decoding for lower bandwidth consumption are provided out of the box.
   
 ## Installation
 ⚠️ [OpenUPM](https://openupm.com/packages/com.adrenak.univoice/?subPage=versions) may not have up to date releases. Install using NPM registry instead 👇
 
-Ensure you have the NPM registry in the `packages.json` file of your Unity project with the following scopes:
+Ensure you have the NPM registry in the `manifest.json` file of your Unity project with the following scopes:
 ```
 "scopedRegistries": [
     {
@@ -27,11 +29,12 @@ Ensure you have the NPM registry in the `packages.json` file of your Unity proje
             "com.adrenak.univoice",
             "com.adrenak.brw",
             "com.adrenak.unimic",
-            "com.adrenak.unityopus"
+            "com.adrenak.concentus-unity"
         ]
     }
 }
 ```
+Then add `com.adrenak.univoice:x.y.z` to the `dependencies` in your `manifest.json` file (where x.y.z is the version you wish to install). The list of versions is available on [the UniVoice NPM page](https://www.npmjs.com/package/com.adrenak.univoice?activeTab=versions).
 
 ## Docs
 Am API reference is available: http://www.vatsalambastha.com/univoice
@@ -42,11 +45,11 @@ This repository contains a sample scene for the Mirror network, which is the bes
 To try the sample, import Mirror and add the `UNIVOICE_MIRROR_NETWORK` compilation symbol to your project.
   
 ## Dependencies
-[com.adrenak.brw](https://www.github.com/adrenak/brw)`@1.0.1` for reading and writing messages for communication. See `MirrorServer.cs` and `MirrorClient.cs` where they're used.  
+[com.adrenak.brw](https://www.github.com/adrenak/brw) for reading and writing messages for communication. See `MirrorServer.cs` and `MirrorClient.cs` where they're used.  
 
-[com.adrenak.unimic](https://www.github.com/adrenak/unimic)`@3.2.1` for easily capturing audio from any connected mic devices. See `UniMicInput.cs` for usage.  
+[com.adrenak.unimic](https://www.github.com/adrenak/unimic) for easily capturing audio from any connected mic devices. See `UniMicInput.cs` for usage. Also used for streaming audio playback. See `StreamedAudioSourceOutput.cs` for usage.
 
-[com.adrenak.unityopus](https://www.github.com/adrenak/unityopus)`@1.0.0` for Opus encoding and decoding. See `OpusFilter.cs` for usage
+[com.adrenak.concentus-unity](https://www.github.com/adrenak/concentus-unity) for Opus encoding and decoding. See `ConcentusEncodeFilter.cs` and `ConcentusDecodeFilter.cs` for usage
 
 ## License and Support
 This project is under the [MIT license](https://github.com/adrenak/univoice/blob/master/LICENSE).
@@ -60,3 +63,4 @@ The developer can be reached at the following links:
 [LinkedIn](https://www.linkedin.com/in/vatsalAmbastha)  
 [GitHub](https://www.github.com/adrenak)  
 [Twitter](https://www.twitter.com/vatsalAmbastha)  
+Discord: `adrenak#1934`

package/Runtime/Adrenak.UniVoice.Runtime.asmdef

@@ -1,11 +1,12 @@
 {
     "name": "Adrenak.UniVoice.Runtime",
+    "rootNamespace": "",
     "references": [
         "GUID:f87ecb857e752164ab814a3de8eb0262",
         "GUID:1f776cd02c03a7b4280b6b649d7758e2",
         "GUID:30817c1a0e6d646d99c048fc403f5979",
         "GUID:725ee7191c021de4dbf9269590ded755",
-        "GUID:34d15e3fb5fa4b541b5a93a6dc182cc5"
+        "GUID:b118fd5a40c85ad4e9b38e8c4a42bbb1"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

package/Runtime/ClientSession.cs

@@ -77,8 +77,8 @@ namespace Adrenak.UniVoice {
                         foreach (var filter in OutputFilters)
                             audioFrame = filter.Run(audioFrame);
                     }
-
-                    PeerOutputs[id].Feed(audioFrame);
+                    if(audioFrame.samples.Length > 0)
+                        PeerOutputs[id].Feed(audioFrame);
                 };
             }
         }
@@ -99,7 +99,8 @@ namespace Adrenak.UniVoice {
                             frame = filter.Run(frame);
                     }
 
-                    Client.SendAudioFrame(frame);
+                    if(frame.samples.Length > 0)
+                        Client.SendAudioFrame(frame);
                 };
             }
         }

package/Runtime/Impl/Filters/Concentus Opus Filters/ConcentusDecodeFilter.cs

@@ -0,0 +1,80 @@
+using Concentus;
+using System;
+
+/*
+ * Opus encoding and decoding are VERY important for any real world use of UniVoice as without
+ * encoding the size of audio data is much (over 10x) larger.
+ * For more info see https://www.github.com/adrenak/concentus-unity
+ */
+namespace Adrenak.UniVoice.Filters {
+    /// <summary>
+    /// Decodes Opus encoded audio. Use this as a filter for incoming client audio.
+    /// </summary>
+    public class ConcentusDecodeFilter : IAudioFilter {
+        IOpusDecoder decoder;
+        float[] decodeBuffer;
+        int inputChannelCount;
+        int inputFrequency;
+        byte[] floatsToBytes;
+
+        /// <summary>
+        /// Creates a Concentus decode filter.
+        /// </summary>
+        /// <param name="decodeBufferLength">
+        /// The length of the decode buffer. Default is 11520 to fit a large sample
+        /// with frequency 48000, duration 120ms and 2 channels. This should be enough
+        /// for almost all scenarios. Increase if you need more.
+        /// </param>
+        public ConcentusDecodeFilter(int decodeBufferLength = 11520) {
+            decodeBuffer = new float[decodeBufferLength];
+        }
+
+        public AudioFrame Run(AudioFrame input) {
+            inputChannelCount = input.channelCount;
+            inputFrequency = input.frequency;
+
+            CreateNewDecoderIfNeeded();
+
+            var decodeResult = Decode(input.samples, out Span<float> decoded);
+            if (decodeResult > 0) {
+                floatsToBytes = Utils.Bytes.FloatsToBytes(decoded.ToArray());
+                return new AudioFrame {
+                    timestamp = input.timestamp,
+                    samples = floatsToBytes,
+                    channelCount = inputChannelCount,
+                    frequency = inputFrequency
+                };
+            }
+            else {
+                return new AudioFrame {
+                    timestamp = input.timestamp,
+                    samples = new byte[0],
+                    channelCount = inputChannelCount,
+                    frequency = inputFrequency
+                };
+            }
+        }
+
+        int Decode(Span<byte> toDecode, out Span<float> decoded) {
+            // Decode the Opus packet into preallocated buffer
+            int samplesPerChannel = decoder.Decode(toDecode, decodeBuffer, decodeBuffer.Length);
+
+            if (samplesPerChannel > 0) {
+                int totalSamples = samplesPerChannel * inputChannelCount; // Total samples across all channels
+                decoded = decodeBuffer.AsSpan(0, totalSamples); // Trim to valid samples
+            }
+            else {
+                decoded = Span<float>.Empty;
+            }
+
+            return samplesPerChannel; // Return number of samples per channel or 0 on failure
+        }
+
+        void CreateNewDecoderIfNeeded() {
+            if (decoder == null || decoder.SampleRate != inputFrequency || decoder.NumChannels != inputChannelCount) {
+                decoder?.Dispose();
+                decoder = OpusCodecFactory.CreateDecoder(inputFrequency, inputChannelCount);
+            }
+        }
+    }
+}

package/Runtime/Impl/Filters/Concentus Opus Filters/ConcentusEncodeFilter.cs

@@ -0,0 +1,156 @@
+using Concentus;
+using Concentus.Enums;
+using System;
+
+/*
+ * Opus encoding and decoding are VERY important for any real world use of UniVoice as without
+ * encoding the size of audio data is much (over 10x) larger.
+ * For more info see https://www.github.com/adrenak/concentus-unity
+ */
+namespace Adrenak.UniVoice.Filters {
+    /// <summary>
+    /// A filter that encodes audio using Opus. Use this as an output filter
+    /// to reduce the size of outgoing client audio
+    /// </summary>
+    public class ConcentusEncodeFilter : IAudioFilter {
+        public ConcentusFrequencies SamplingFrequency { get; private set; }
+        IOpusEncoder encoder;
+        IResampler resampler;
+        byte[] encodeBuffer;
+        float[] resampleBuffer;
+        int inputDuration;
+        int inputChannels;
+        int inputFrequency;
+        int resamplerChannelCount;
+        float[] bytesToFloats;
+        byte[] floatsToBytes;
+        int resamplerQuality;
+        int encoderComplexity;
+        int encoderBitrate;
+
+        /// <summary>
+        /// Creates a Concentus encode filter
+        /// </summary>
+        /// <param name="encodeFrequency">
+        /// The frequency the encoder runs at.
+        /// If the input audio frequency is different from this value, it will be resampled before encode.
+        /// </param>
+        /// <param name="resamplerQuality">Resampler quality [1, 10]</param>
+        /// <param name="encoderComplexity">Encoder complexity [1, 10]</param>
+        /// <param name="encoderBitrate">Encoder bitrate [16000, 256000]. Set to -1 to enable variable bitrate.</param>
+        /// <param name="encodeBufferLength">
+        /// The length of the encode buffer. Default is 46080 to fit a large sample
+        /// with frequency 48000, duration 120ms and 2 channels. This should be enough
+        /// for almost all scenarios. Increase if you need more.
+        /// </param>
+        public ConcentusEncodeFilter(
+            ConcentusFrequencies encodeFrequency = ConcentusFrequencies.Frequency_16000,
+            int resamplerQuality = 2,
+            int encoderComplexity = 3,
+            int encoderBitrate = 64000,
+            int encodeBufferLength = 46080
+        ) {
+            SamplingFrequency = encodeFrequency;
+            this.resamplerQuality = Math.Clamp(resamplerQuality, 1, 10);
+            this.encoderComplexity = Math.Clamp(encoderComplexity, 1, 10);
+            this.encoderBitrate = Math.Clamp(encoderBitrate, 16000, 256000);
+            encodeBuffer = new byte[encodeBufferLength];
+        }
+
+        public AudioFrame Run(AudioFrame input) {
+            inputChannels = input.channelCount;
+            inputFrequency = input.frequency;
+            inputDuration = ((input.samples.Length / 4) * 1000) / (input.frequency * input.channelCount);
+
+            CreateNewResamplerAndEncoderIfNeeded();
+
+            Span<float> toEncode;
+            bytesToFloats = Utils.Bytes.BytesToFloats(input.samples);
+            toEncode = bytesToFloats;
+
+            if (inputFrequency != (int)SamplingFrequency) 
+                toEncode = Resample(bytesToFloats);
+
+            var encodeResult = Encode(toEncode, out Span<byte> encoded);
+            if (encodeResult > 0) {
+                floatsToBytes = encoded.ToArray();
+                return new AudioFrame {
+                    timestamp = input.timestamp,
+                    channelCount = inputChannels,
+                    samples = floatsToBytes,
+                    frequency = (int)SamplingFrequency
+                };
+            }
+            else {
+                return new AudioFrame {
+                    timestamp = input.timestamp,
+                    channelCount = inputChannels,
+                    samples = new byte[0],
+                    frequency = (int)SamplingFrequency
+                };
+            }
+        }
+
+        void CreateNewResamplerAndEncoderIfNeeded() {
+            if (resampleBuffer == null || resampleBuffer.Length != (int)SamplingFrequency * inputDuration * inputChannels / 1000)
+                resampleBuffer = new float[(int)SamplingFrequency * inputDuration * inputChannels / 1000];
+
+            if (resampler == null) {
+                resamplerChannelCount = inputChannels;
+                resampler = ResamplerFactory.CreateResampler(inputChannels, inputFrequency, (int)SamplingFrequency, resamplerQuality);
+            }
+            else {
+                resampler.GetRates(out int in_rate, out int out_rate);
+                if (in_rate != inputFrequency || out_rate != (int)SamplingFrequency || resamplerChannelCount != inputChannels) {
+                    resampler.Dispose();
+                    resamplerChannelCount = inputChannels;
+                    resampler = ResamplerFactory.CreateResampler(inputChannels, inputFrequency, (int)SamplingFrequency, resamplerQuality);
+                }
+            }
+
+            if (encoder == null || encoder.SampleRate != (int)SamplingFrequency || encoder.NumChannels != inputChannels) {
+                encoder?.Dispose();
+                encoder = OpusCodecFactory.CreateEncoder((int)SamplingFrequency, inputChannels, OpusApplication.OPUS_APPLICATION_VOIP);
+                encoder.Complexity = encoderComplexity;
+                if(encoderBitrate == -1) 
+                    encoder.UseVBR = true;
+                else {
+                    encoder.UseVBR = false;
+                    encoder.Bitrate = encoderBitrate;
+                }
+            }
+        }
+
+        Span<float> Resample(Span<float> samples) {
+            // Calculate input and output lengths
+            int in_len = samples.Length / inputChannels; // Input samples per channel
+            int out_len = (int)SamplingFrequency * inputDuration / 1000; // Output samples per channel
+
+            // Perform resampling into preallocated buffer
+            resampler.ProcessInterleaved(samples, ref in_len, resampleBuffer, ref out_len);
+
+            // Return only the valid portion of resampled data
+            return resampleBuffer.AsSpan(0, out_len * inputChannels); // Trim to valid samples
+        }
+
+        int Encode(Span<float> toEncode, out Span<byte> encoded) {
+            int frameSize = (int)SamplingFrequency * inputDuration / 1000; // Samples per channel
+            int totalSamples = frameSize * inputChannels; // Total interleaved samples
+
+            if (toEncode.Length < totalSamples) {
+                encoded = Span<byte>.Empty;
+                return 0;
+            }
+
+            // Use preallocated encodeBuffer
+            int result = encoder.Encode(toEncode.Slice(0, totalSamples), frameSize, encodeBuffer, encodeBuffer.Length);
+
+            if (result > 0) 
+                encoded = encodeBuffer.AsSpan(0, result); // Trim to actual encoded size
+            else 
+                encoded = Span<byte>.Empty;
+
+            return result; // Return number of bytes written or 0 on failure
+        }
+    }
+}

package/Runtime/Impl/Filters/Concentus Opus Filters/ConcentusEncodeFilter.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7e548eaedfb8c1b49812a12b3fba2c8a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Impl/Filters/Concentus Opus Filters/ConcentusFrequencies.cs

@@ -0,0 +1,31 @@
+namespace Adrenak.UniVoice.Filters {
+    /// <summary>
+    /// Defines supported sampling frequencies for the Opus codec via Concentus.
+    /// </summary>
+    public enum ConcentusFrequencies : int {
+        /// <summary>
+        /// 8 kHz sampling frequency, typically used for narrowband audio.
+        /// </summary>
+        Frequency_8000 = 8000,
+
+        /// <summary>
+        /// 12 kHz sampling frequency, suitable for medium-band audio.
+        /// </summary>
+        Frequency_12000 = 12000,
+
+        /// <summary>
+        /// 16 kHz sampling frequency, commonly used for wideband speech.
+        /// </summary>
+        Frequency_16000 = 16000,
+
+        /// <summary>
+        /// 24 kHz sampling frequency, providing good quality for music and audio.
+        /// </summary>
+        Frequency_24000 = 24000,
+
+        /// <summary>
+        /// 48 kHz sampling frequency, offering the highest audio quality.
+        /// </summary>
+        Frequency_48000 = 48000,
+    }
+}

package/Runtime/Impl/Filters/Concentus Opus Filters/ConcentusFrequencies.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 53ba54c62b14cf4439d3b71fe7b1d08c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Impl/Filters/Concentus Opus Filters.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d3ce124588cebfb4e812cb9b91e46525
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Impl/Inputs/UniMicInput.cs

@@ -11,14 +11,24 @@ namespace Adrenak.UniVoice.Inputs {
     /// </summary>
     public class UniMicInput : IAudioInput {
         const string TAG = "UniMicInput";
-
         public event Action<AudioFrame> OnFrameReady;
 
-        public Mic.Device Device { get; private set; }
+        public Mic.Device device;
+        public Mic.Device Device { 
+            get => device;
+            set {
+                if (device == value)
+                    return;
+                if(device != null)
+                    device.OnFrameCollected -= OnFrameCollected;
+                device = value;
+                if(device != null)
+                    device.OnFrameCollected += OnFrameCollected;
+            } 
+        }
 
         public UniMicInput(Mic.Device device) {
             Device = device;
-            device.OnFrameCollected += OnFrameCollected;
         }
 
         private void OnFrameCollected(int frequency, int channels, float[] samples) {
@@ -32,7 +42,8 @@ namespace Adrenak.UniVoice.Inputs {
         }
 
         public void Dispose() {
-            Device.OnFrameCollected -= OnFrameCollected;
+            if(Device != null)
+                Device.OnFrameCollected -= OnFrameCollected;
             Debug.unityLogger.Log(TAG, "Disposed");
         }
     }

package/Samples~/Group Chat Sample/Scenes/GroupVoiceCallSample-Mirror.unity

@@ -43,7 +43,7 @@ RenderSettings:
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 12
   m_GIWorkflowMode: 0
   m_GISettings:
     serializedVersion: 2
@@ -98,7 +98,8 @@ LightmapSettings:
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 1
+  m_LightingSettings: {fileID: 4890085278179872738, guid: ad4b002903bb1474ca81b5d0f5e89dd8,
+    type: 2}
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -118,6 +119,8 @@ NavMeshSettings:
     manualTileSize: 0
     tileSize: 256
     accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
@@ -149,6 +152,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1116173713}
   m_Father: {fileID: 1726461497}
@@ -174,6 +178,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -241,6 +246,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 153, y: 294.1, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 3
@@ -273,6 +279,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 983083073}
   m_Father: {fileID: 1726461497}
@@ -298,6 +305,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -399,6 +407,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -566,6 +575,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1917147245}
   m_Father: {fileID: 965416053}
@@ -605,6 +615,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1790122419}
   m_Father: {fileID: 909505741}
@@ -629,6 +640,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -678,6 +690,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -758,6 +771,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
 --- !u!223 &877991846
 Canvas:
   m_ObjectHideFlags: 0
@@ -789,6 +803,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1796628514}
   - {fileID: 1726461497}
@@ -829,6 +844,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1798840738}
   - {fileID: 965416053}
@@ -886,6 +902,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.392}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -937,6 +954,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 741068687}
   m_Father: {fileID: 909505741}
@@ -961,6 +979,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -989,7 +1008,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1917147246}
   m_HandleRect: {fileID: 1917147245}
   m_Direction: 0
-  m_Value: 1
+  m_Value: 0
   m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -1010,6 +1029,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1060,6 +1080,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 667953547}
   m_RootOrder: 0
@@ -1084,6 +1105,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1138,6 +1160,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1726461497}
   m_RootOrder: 2
@@ -1162,6 +1185,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1216,6 +1240,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 159342650}
   m_RootOrder: 0
@@ -1240,6 +1265,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1294,6 +1320,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1798840738}
   m_RootOrder: 0
@@ -1342,6 +1369,7 @@ MonoBehaviour:
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1001 &1206482348
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1507,6 +1535,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1790122419}
   m_RootOrder: 0
@@ -1531,6 +1560,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1581,6 +1611,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1726461497}
   m_RootOrder: 1
@@ -1605,6 +1636,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.8962264, g: 0.8962264, b: 0.8962264, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1657,6 +1689,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 909505741}
   - {fileID: 1480403820}
@@ -1699,6 +1732,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1423776684}
   m_Father: {fileID: 789642335}
@@ -1737,6 +1771,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 877991847}
   m_RootOrder: 0
@@ -1761,6 +1796,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1812,6 +1848,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1188574985}
   m_Father: {fileID: 909505741}
@@ -1850,6 +1887,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -1900,6 +1938,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 741068687}
   m_RootOrder: 0
@@ -1924,6 +1963,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -2008,6 +2048,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 2
@@ -2039,7 +2080,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2117923849}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3}
   m_Name: 
@@ -2095,7 +2136,7 @@ MonoBehaviour:
   offlineScene: 
   onlineScene: 
   offlineSceneLoadDelay: 0
-  transport: {fileID: 2117923854}
+  transport: {fileID: 2117923850}
   networkAddress: localhost
   maxConnections: 100
   disconnectInactiveConnections: 0
@@ -2130,6 +2171,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 1489.682, y: 663.6068, z: 178.25}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 4
@@ -2141,7 +2183,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2117923849}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: c7424c1070fad4ba2a7a96b02fbeb4bb, type: 3}
   m_Name: 

package/Samples~/Group Chat Sample/Scripts/GroupVoiceCallMirrorSample.cs

@@ -7,12 +7,11 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.Android;
 
+using Adrenak.UniMic;
 using Adrenak.UniVoice.Networks;
 using Adrenak.UniVoice.Outputs;
 using Adrenak.UniVoice.Inputs;
 using Adrenak.UniVoice.Filters;
-using Adrenak.UniMic;
-using Adrenak.UnityOpus;
 
 namespace Adrenak.UniVoice.Samples {
     public class GroupVoiceCallMirrorSample : MonoBehaviour {
@@ -83,35 +82,14 @@ namespace Adrenak.UniVoice.Samples {
             // We add some filters to the input audio
             // - The first is audio blur, so that the audio that's been captured by this client
             // has lesser noise
-            var outgoingBlur = new GaussianAudioBlur();
-
+            session.InputFilters.Add(new GaussianAudioBlur());
             // - The next one is the Opus encoder filter. This is VERY important. Without this the
             // outgoing data would be very large, usually by a factor of 10 or more.
-            // To do this we first create the encoder, then use it to create an instance of 
-            // of the OpusEncodeFilter class 
-            var encoder = new Encoder(
-                (SamplingFrequency)mic.SamplingFrequency,
-                (NumChannels)mic.ChannelCount,
-                OpusApplication.VoIP
-            );
-            var outgoingEncode = new OpusEncodeFilter(encoder);
-
-            // Finally, we add both the input filters to the session. Note that session.InputFilters
-            // is a list and the filters are run in the order they are added to it.
-            session.InputFilters.Add(outgoingBlur);
-            session.InputFilters.Add(outgoingEncode);
-
-            // Next, for incoming audio we create some filters.
-            // - first is the decoder, because the audio that we are expecting would be encoded.
-            // So we create a decoder, use that to create a OpusDecodeFilter and add it to the sessions 
-            // output filters
-            var decoder = new Decoder(
-                (SamplingFrequency)mic.SamplingFrequency, 
-                (NumChannels)mic.ChannelCount
-            );
-            var incomingDecode = new OpusDecodeFilter(decoder);
-
-            session.OutputFilters.Add(incomingDecode);
+            session.InputFilters.Add(new ConcentusEncodeFilter());
+
+            // Next, for incoming audio we register the Concentus decode filter as the audio we'd
+            // receive from other clients would be encoded and not readily playable
+            session.OutputFilters.Add(new ConcentusDecodeFilter());
 
             // Subscribe to some server events 
             server.OnServerStart += () => {

package/package.json

@@ -1,9 +1,9 @@
 {
     "name": "com.adrenak.univoice",
-    "version": "4.0.0",
+    "version": "4.1.0",
     "displayName": "Adrenak.UniVoice",
-    "description": "Network agnostic voice chat/VoIP framework for Unity.",
-    "unity": "2019.4",
+    "description": "Voice chat/VoIP framework for Unity.",
+    "unity": "2021.2",
     "author": {
         "name": "Vatsal Ambastha",
         "email": "ambastha.vatsal@gmail.com",
@@ -19,7 +19,10 @@
         "Unity3d",
         "VR",
         "AR",
-        "Metaverse"
+        "Metaverse",
+        "mic",
+        "opus",
+        "concentus"
     ],
     "samples": [
 		{
@@ -28,12 +31,9 @@
 			"path": "Samples~"
 		}
 	],
-    "publishConfig": {
-        "registry": "https://registry.npmjs.org"
-    },
     "dependencies": {
         "com.adrenak.brw": "1.0.1",
-        "com.adrenak.unimic": "3.2.1",
-        "com.adrenak.unityopus": "1.0.0"
+        "com.adrenak.unimic": "3.2.2",
+        "com.adrenak.concentus-unity": "1.0.1"
     }
 }

package/Runtime/Impl/Filters/OpusFilter.cs

@@ -1,85 +0,0 @@
-using Adrenak.UnityOpus;
-
-using System;
-
-/*
- * Opus encoding and decoding are VERY important for any real world use of UniVoice as without
- * encoding the size of audio data is much (over 10x) larger.
- * For more info see https://www.github.com/adrenak/UnityOpus
- */
-namespace Adrenak.UniVoice.Filters {
-    /// <summary>
-    /// A filter that encodes audio using Opus. Use this as an output filter
-    /// to reduce the size of outgoing client audio
-    /// </summary>
-    public class OpusEncodeFilter : IAudioFilter {
-        Encoder encoder;
-        byte[] outputBuffer;
-
-        public OpusEncodeFilter(Encoder encoder) {
-            this.encoder = encoder;
-        }
-
-        public AudioFrame Run(AudioFrame input) {
-            if(outputBuffer == null)
-                outputBuffer = new byte[input.samples.Length * 4];
-            else if(input.samples.Length != outputBuffer.Length * 4)
-                outputBuffer = new byte[input.samples.Length * 4];
-
-            int encodeResult = encoder.Encode(Utils.Bytes.BytesToFloats(input.samples), outputBuffer);
-            if (encodeResult > 0) {
-                byte[] encodedBytes = new byte[encodeResult];
-                Array.Copy(outputBuffer, encodedBytes, encodedBytes.Length);
-                return new AudioFrame {
-                    timestamp = 0,
-                    frequency = input.frequency,
-                    channelCount = input.channelCount,
-                    samples = encodedBytes
-                };
-            }
-            else {
-                return new AudioFrame {
-                    timestamp = 0,
-                    frequency = input.frequency,
-                    channelCount = input.channelCount,
-                    samples = null
-                };
-            }
-        }
-    }
-
-    /// <summary>
-    /// Decodes Opus encoded audio. Use this as a filter for incoming client audio.
-    /// </summary>
-    public class OpusDecodeFilter : IAudioFilter {
-        Decoder decoder;
-        float[] outputBuffer;
-
-        public OpusDecodeFilter(Decoder decoder, int outputBufferLength = 48000) {
-            this.decoder = decoder;
-            outputBuffer = new float[outputBufferLength];
-        }
-
-        public AudioFrame Run(AudioFrame input) {
-            var decodeResult = decoder.Decode(input.samples, input.samples.Length, outputBuffer);
-            if(decodeResult > 0) {
-                float[] decoded = new float[decodeResult];
-                Array.Copy(outputBuffer, decoded, decoded.Length);
-                return new AudioFrame {
-                    timestamp = 0,
-                    frequency = input.frequency,
-                    channelCount = input.channelCount,
-                    samples = Utils.Bytes.FloatsToBytes(decoded)
-                };
-            }
-            else {
-                return new AudioFrame {
-                    timestamp = 0,
-                    frequency = input.frequency,
-                    channelCount = input.channelCount,
-                    samples = null
-                };
-            }
-        }
-    }
-}