com.adrenak.univoice 2.0.2 → 4.0.0

package/Samples~/Group Chat Sample/Sprites/speaker.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: f614e31fdd0562a4ebb9b6c2126ebf8a
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 3622c0ab7514b294e91e1e29cbfae826
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Samples~/Group Chat Sample/Sprites.meta

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

package/Samples~/Group Chat Sample.meta

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

package/package.json

@@ -1,20 +1,39 @@
-{
-  "name": "com.adrenak.univoice",
-  "version": "2.0.2",
-  "displayName": "Adrenak.UniVoice",
-  "description": "Voice chat/VoIP solution for Unity.",
-  "unity": "2019.4",
-  "author": "Vatsal Ambastha <ambastha.vatsal@gmail.com> (http://www.vatsalambastha.com)",
-  "license": "MIT",
-  "keywords": [
-    "Peer To Peer",
-    "WebRTC",
-    "P2P",
-    "Networking",
-    "Voice Chat",
-    "voip"
-  ],
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org"
-  }
-}
+{
+    "name": "com.adrenak.univoice",
+    "version": "4.0.0",
+    "displayName": "Adrenak.UniVoice",
+    "description": "Network agnostic voice chat/VoIP framework for Unity.",
+    "unity": "2019.4",
+    "author": {
+        "name": "Vatsal Ambastha",
+        "email": "ambastha.vatsal@gmail.com",
+        "url": "http://www.vatsalambastha.com"
+    },
+    "license": "MIT",
+    "keywords": [
+        "Mirror",
+        "Networking",
+        "Voice Chat",
+        "voip",
+        "Unity",
+        "Unity3d",
+        "VR",
+        "AR",
+        "Metaverse"
+    ],
+    "samples": [
+		{
+			"displayName": "Samples",
+			"description": "UniVoice Samples to get you started",
+			"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"
+    }
+}

package/package.json.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 5677af848094d404f835a6468b36f003
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 5677af848094d404f835a6468b36f003
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/CHANGELOG.md

@@ -1,67 +0,0 @@
-## [2.0.2](https://github.com/adrenak/univoice/compare/v2.0.1...v2.0.2) (2022-11-02)
-
-
-### Bug Fixes
-
-* remove comment about possible PeerID in IAudioOutput ([2246bb2](https://github.com/adrenak/univoice/commit/2246bb2bef234b84bdf6cd55a9faf87e09133953))
-
-## [1.2.1](https://github.com/adrenak/univoice/compare/v1.2.0...v1.2.1) (2022-10-10)
-
-
-### Bug Fixes
-
-* PeersOutputs gets filled as peers join, not when they start ([42eaeb9](https://github.com/adrenak/univoice/commit/42eaeb95eef4eea7ee559da9fdbcac78ceb941b4))
-
-# [1.2.0](https://github.com/adrenak/univoice/compare/v1.1.4...v1.2.0) (2022-09-20)
-
-
-### Bug Fixes
-
-* Update README.md ([5c234ee](https://github.com/adrenak/univoice/commit/5c234ee1e6aad430f72b4879a401bb98f3e68b88))
-
-
-### Features
-
-* Remove inbuilt implementations. Remove samples. ([dbfc4c0](https://github.com/adrenak/univoice/commit/dbfc4c0a1ffd99d03aefe72aec0e27debe68525a))
-
-## [1.1.4](https://github.com/adrenak/univoice/compare/v1.1.3...v1.1.4) (2021-08-10)
-
-
-### Bug Fixes
-
-* Spell-fix in README ([fcbc7c6](https://github.com/adrenak/univoice/commit/fcbc7c6c28c84415a50050d7014ecdfc39347309))
-
-## [1.1.3](https://github.com/adrenak/univoice/compare/v1.1.2...v1.1.3) (2021-06-03)
-
-
-### Bug Fixes
-
-* Add missing mute others toggle in sample scene. ([cff9574](https://github.com/adrenak/univoice/commit/cff9574bdd4b769de519f451e489b9dcdb76f649))
-
-## [1.1.2](https://github.com/adrenak/univoice/compare/v1.1.1...v1.1.2) (2021-06-02)
-
-
-### Bug Fixes
-
-* README fix ([d03db44](https://github.com/adrenak/univoice/commit/d03db449e1fe2557a57df75ccfc8fe4a310f308f))
-
-## [1.1.1](https://github.com/adrenak/univoice/compare/v1.1.0...v1.1.1) (2021-06-02)
-
-
-### Bug Fixes
-
-* Prevent sample app screen from sleeping. ([545d96f](https://github.com/adrenak/univoice/commit/545d96f16b858ba1dbdb01de5298ba62c06c2725))
-
-# [1.1.0](https://github.com/adrenak/univoice/compare/v1.0.0...v1.1.0) (2021-06-02)
-
-
-### Features
-
-* InbuiltAudioOutput now also accepts minimum segment count and ([294bfef](https://github.com/adrenak/univoice/commit/294bfef5677d49cd941b513c421980cf6a5e393f))
-
-# 1.0.0 (2021-06-02)
-
-
-### Features
-
-* Full rebuild with AirPeer 1.2.0 ([9327b2a](https://github.com/adrenak/univoice/commit/9327b2a05da766e91bad5f8e6288e5c328ded429))

package/Runtime/ChatroomAgent.cs

@@ -1,215 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-
-namespace Adrenak.UniVoice {
-    /// <summary>
-    /// Provides the means to host or connect to a chatroom.
-    /// </summary>
-    public class ChatroomAgent : IDisposable {
-        // ====================================================================
-        #region PROPERTIES
-        // ====================================================================
-        /// <summary>
-        /// The underlying network which the agent uses to host or connect to 
-        /// chatrooms, and send and receive data to and from peers
-        /// </summary>
-        public IChatroomNetwork Network { get; private set; }
-
-        /// <summary>
-        /// Source of outgoing audio that can be 
-        /// transmitted over the network to peers
-        /// </summary>
-        public IAudioInput AudioInput { get; private set; }
-
-        /// <summary>
-        /// A factory that returns an <see cref="IAudioOutput"/> 
-        /// instance. Used every time a Peer connects for that peer to get
-        /// an output for that peer.
-        /// </summary>
-        public IAudioOutputFactory AudioOutputFactory { get; private set; }
-
-        /// <summary>
-        /// There is a <see cref="IAudioOutput"/> for each peer that gets
-        /// created using the provided <see cref="AudioOutputFactory"/>
-        /// The <see cref="IAudioOutput"/> instance corresponding to a peer is
-        /// responsible for playing the audio that we receive that peer. 
-        /// </summary>
-        public Dictionary<short, IAudioOutput> PeerOutputs;
-
-        /// <summary>
-        /// The current <see cref="ChatroomAgentMode"/> of this agent
-        /// </summary>
-        public ChatroomAgentMode CurrentMode { get; private set; }
-
-        /// <summary>
-        /// Mutes all the peers. If set to true, no incoming audio from other 
-        /// peers will be played. If you want to selectively mute a peer, use
-        /// the <see cref="ChatroomPeerSettings.muteThem"/> flag in the 
-        /// <see cref="PeerSettings"/> instance for that peer.
-        /// Note that setting this will not change <see cref="PeerSettings"/>
-        /// </summary>
-        public bool MuteOthers { get; set; }
-
-        /// <summary>
-        /// Whether this agent is muted or not. If set to true, voice data will
-        /// not be sent to ANY peer. If you want to selectively mute yourself 
-        /// to a peer, use the <see cref="ChatroomPeerSettings.muteSelf"/> 
-        /// flag in the <see cref="PeerSettings"/> instance for that peer.
-        /// Note that setting this will not change <see cref="PeerSettings"/>
-        /// </summary>
-        public bool MuteSelf { get; set; }
-
-        /// <summary>
-        /// <see cref="ChatroomPeerSettings"/> for each peer which allows you
-        /// to read or change the settings for a specific peer. Use [id] to get
-        /// settings for a peer with ID id;
-        /// </summary>
-        public Dictionary<short, ChatroomPeerSettings> PeerSettings;
-        #endregion
-
-        // ====================================================================
-        #region CONSTRUCTION / DISPOSAL
-        // ====================================================================
-        /// <summary>
-        /// Creates and returns a new agent using the provided dependencies.
-        /// The instance then makes the dependencies work together.
-        /// </summary>
-        /// 
-        /// <param name="chatroomNetwork">The chatroom network implementation
-        /// for chatroom access and sending data to peers in a chatroom.
-        /// </param>
-        /// 
-        /// <param name="audioInput">The source of the outgoing audio</param>
-        /// 
-        /// <param name="audioOutputFactory">
-        /// The factory used for creating <see cref="IAudioOutput"/> instances 
-        /// for peers so that incoming audio from peers can be played.
-        /// </param>
-        public ChatroomAgent(
-            IChatroomNetwork chatroomNetwork,
-            IAudioInput audioInput,
-            IAudioOutputFactory audioOutputFactory
-        ) {
-            AudioInput = audioInput ??
-            throw new ArgumentNullException(nameof(audioInput));
-
-            Network = chatroomNetwork ??
-            throw new ArgumentNullException(nameof(chatroomNetwork));
-
-            AudioOutputFactory = audioOutputFactory ??
-            throw new ArgumentNullException(nameof(audioOutputFactory));
-
-            CurrentMode = ChatroomAgentMode.Unconnected;
-            MuteOthers = false;
-            MuteSelf = false;
-            PeerSettings = new Dictionary<short, ChatroomPeerSettings>();
-            PeerOutputs = new Dictionary<short, IAudioOutput>();
-
-            LinkDependencies();
-        }
-
-        /// <summary>
-        /// Disposes the instance. WARNING: Calling this method will
-        /// also dispose the dependencies passed to it in the constructor.
-        /// Be mindful of this if you're sharing dependencies between multiple
-        /// instances and/or using them outside this instance.
-        /// </summary>
-        public void Dispose() {
-            AudioInput.Dispose();
-
-            RemoveAllPeers();
-            PeerSettings.Clear();
-            PeerOutputs.Clear();
-
-            Network.Dispose();
-        }
-        #endregion
-
-        // ====================================================================
-        #region INTERNAL 
-        // ====================================================================
-        void LinkDependencies() {
-            // Network events
-            Network.OnCreatedChatroom += () =>
-                CurrentMode = ChatroomAgentMode.Host;
-            Network.OnClosedChatroom += () => {
-                CurrentMode = ChatroomAgentMode.Unconnected;
-                RemoveAllPeers();
-            };
-            Network.OnJoinedChatroom += id => {
-                CurrentMode = ChatroomAgentMode.Guest;
-            };
-            Network.OnLeftChatroom += () => {
-                RemoveAllPeers();
-                CurrentMode = ChatroomAgentMode.Unconnected;
-            };
-            Network.OnPeerJoinedChatroom += id => 
-                AddPeer(id);
-            Network.OnPeerLeftChatroom += id =>
-                RemovePeer(id);
-
-            // Stream the incoming audio data using the right peer output
-            Network.OnAudioReceived += (peerID, data) => {
-                // if we're muting all, no point continuing.
-                if (MuteOthers) return;
-
-                var index = data.segmentIndex;
-                var frequency = data.frequency;
-                var channels = data.channelCount;
-                var samples = data.samples;
-
-                if (PeerSettings.ContainsKey(peerID) && !PeerSettings[peerID].muteThem)
-                    PeerOutputs[peerID].Feed(index, frequency, channels, samples);
-            };
-
-            AudioInput.OnSegmentReady += (index, samples) => {
-                // If we're muting ourselves to all, no point continuing
-                if (MuteSelf) return;
-
-                // Get all the recipients we haven't muted ourselves to
-                var recipients = Network.PeerIDs
-                    .Where(x => PeerSettings.ContainsKey(x) && !PeerSettings[x].muteSelf);
-
-                // Send the audio segment to every deserving recipient
-                foreach (var recipient in recipients)
-                    Network.SendAudioSegment(recipient, new ChatroomAudioSegment {
-                        segmentIndex = index,
-                        frequency = AudioInput.Frequency,
-                        channelCount = AudioInput.ChannelCount,
-                        samples = samples
-                    });
-            };
-        }
-
-        void AddPeer(short id) {
-            if (!PeerSettings.ContainsKey(id))
-                PeerSettings.Add(id, new ChatroomPeerSettings());
-            if(!PeerOutputs.ContainsKey(id)) {
-                var output = AudioOutputFactory.Create(
-                    AudioInput.Frequency,
-                    AudioInput.ChannelCount,
-                    AudioInput.Frequency * AudioInput.ChannelCount / AudioInput.SegmentRate
-                );
-                output.ID = id.ToString();
-                PeerOutputs.Add(id, output);
-            }
-        }
-
-        void RemovePeer(short id) {
-            if (PeerSettings.ContainsKey(id))
-                PeerSettings.Remove(id);
-            if (PeerOutputs.ContainsKey(id)) {
-                PeerOutputs[id].Dispose();
-                PeerOutputs.Remove(id);
-            }
-        }
-
-        void RemoveAllPeers() {
-            var peers = Network.PeerIDs;
-            foreach(var peer in peers) 
-                RemovePeer(peer);
-        }
-        #endregion
-    }
-}

package/Runtime/Extensions.cs

@@ -1,39 +0,0 @@
-using System.Collections.Generic;
-
-using UnityEngine;
-
-namespace Adrenak.UniVoice {
-    public static class Extensions {
-        /// <summary>
-        /// Returns the normalized position of the AudioSource on its AudioClip
-        /// </summary>
-        public static float GetCurrentPosition(this AudioSource source) {
-            return (float)source.timeSamples / source.clip.samples;
-        }
-
-        /// <summary>
-        /// Adds the given key to the dictionary with a value if the key
-        /// is not present before.
-        /// </summary>
-        /// <param name="t">The key to check and add</param>
-        /// <param name="k">The value if the key is added</param>
-        public static void EnsureKey<T, K>
-        (this Dictionary<T, K> dict, T t, K k) {
-            if (!dict.ContainsKey(t))
-                dict.Add(t, k);
-        }
-
-        /// <summary>
-        /// Ensures a key and value pair are in the dictionary
-        /// </summary>
-        /// <param name="t">The key to ensure</param>
-        /// <param name="k">The value associated with the key</param>
-        public static void EnsurePair<T, K>
-        (this Dictionary<T, K> dict, T t, K k) {
-            if (dict.ContainsKey(t))
-                dict[t] = k;
-            else
-                dict.Add(t, k);
-        }
-    }
-}

package/Runtime/Extensions.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 646602ab062d77543b3742e51d16658f
-timeCreated: 1547895114
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Runtime/Interfaces/IChatroomNetwork.cs

@@ -1,121 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Adrenak.UniVoice {
-    /// <summary>
-    /// A chatroom specific networking interface for creating & joining 
-    /// chatrooms and sending & receiving data to and from chatroom peers. 
-    /// </summary>
-    public interface IChatroomNetwork : IDisposable {
-        // ====================================================================
-        #region EVENTS
-        // ====================================================================
-        /// <summary>
-        /// Fired when a chatroom is created. 
-        /// </summary>
-        event Action OnCreatedChatroom;
-
-        /// <summary>
-        /// Fired when the attempt to create a chatroom fails. 
-        /// Provides an exception as event data.
-        /// </summary>
-        event Action<Exception> OnChatroomCreationFailed;
-
-        /// <summary>
-        /// Fired when a chatroom is closed.
-        /// </summary>
-        event Action OnClosedChatroom;
-
-        /// <summary>
-        /// Fired when the local user joins a chatroom. 
-        /// Provides the chatroom ID assigned as event data.
-        /// </summary>
-        event Action<short> OnJoinedChatroom;
-
-        /// <summary>
-        /// Fired when an attempt to join a chatroom fails. 
-        /// Provides an exception as event data.
-        /// </summary>
-        event Action<Exception> OnChatroomJoinFailed;
-
-        /// <summary>
-        /// Fired when the local user leaves a chatroom
-        /// </summary>
-        event Action OnLeftChatroom;
-
-        /// <summary>
-        /// Fired when a peer joins the chatroom. 
-        /// Provides the ID of the peer as event data.
-        /// This action also MUST be called for all previously
-        /// existing peers when we connect to a network.
-        /// </summary>
-        event Action<short> OnPeerJoinedChatroom;
-
-        /// <summary>
-        /// Fired when a peer leaves the chatroom. 
-        /// Provides the ID of the peer as event data.
-        /// This also also MUST be called for all peers
-        /// when we leave a network.
-        /// </summary>
-        event Action<short> OnPeerLeftChatroom;
-
-        /// <summary>
-        /// Fired when the network receives audio data from a peer. 
-        /// </summary>
-        event Action<short, ChatroomAudioSegment> OnAudioReceived;
-
-        /// <summary>
-        /// Fired when the local user sets audio data to a peer.
-        /// </summary>
-        event Action<short, ChatroomAudioSegment> OnAudioSent;
-        #endregion
-
-        // ====================================================================
-        #region PROPERTIES
-        // ====================================================================
-        /// <summary>
-        /// The ID of the local user in the current chatroom 
-        /// </summary>
-        short OwnID { get; }
-
-        /// <summary>
-        /// IDs of all the peers in the current chatroom (excluding <see cref="OwnID"/>)
-        /// </summary>
-        List<short> PeerIDs { get; }
-        #endregion
-
-        // ====================================================================
-        #region METHODS
-        // ====================================================================
-        /// <summary>
-        /// Creates a chatroom 
-        /// </summary>
-        /// <param name="data">Any arguments for hosting a chatroom</param>
-        void HostChatroom(object data = null);
-
-        /// <summary>
-        /// Closes a chatroom that the local user is hosting
-        /// </summary>
-        /// <param name="data">Any arguments for closing the room</param>
-        void CloseChatroom(object data = null);
-
-        /// <summary>
-        /// Joins a chatroom
-        /// </summary>
-        /// <param name="data">The name of the chatroom to join</param>
-        void JoinChatroom(object data = null);
-
-        /// <summary>
-        /// Leaves the chatroom the local user is currently in, if any
-        /// </summary>
-        /// <param name="data">Any arguments for leaving the room</param>
-        void LeaveChatroom(object data = null);
-
-        /// <summary>
-        /// Sends audio data over the network
-        /// </summary>
-        /// <param name="data">The data to be transmitted.</param>
-        void SendAudioSegment(short peerID, ChatroomAudioSegment data);
-        #endregion
-    }
-}

package/Runtime/Types/ChatroomAgentMode.cs

@@ -1,22 +0,0 @@
-namespace Adrenak.UniVoice {
-    [System.Serializable]
-    /// <summary>
-    /// Represents the mode that a <see cref="ChatroomAgent"/> is in.
-    /// </summary>
-    public enum ChatroomAgentMode {
-        /// <summary>
-        /// The agent is neither connected to a chatroom nor hosting one.
-        /// </summary>
-        Unconnected,
-
-        /// <summary>
-        /// The agent is hosting a chatroom. May or may not have guests
-        /// </summary>
-        Host,
-
-        /// <summary>
-        /// The agent has joined a chatroom and is a guest there
-        /// </summary>
-        Guest
-    }
-}