com.adrenak.univoice 1.2.1 → 2.0.1

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [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)
 
 

package/Runtime/ChatroomAgent.cs

@@ -140,47 +140,40 @@ namespace Adrenak.UniVoice {
             // Node client events
             Network.OnJoinedChatroom += id => {
                 CurrentMode = ChatroomAgentMode.Guest;
-                EnsurePeerSettings(0);
             };
             Network.OnLeftChatroom += () =>
                 RemoveAllPeers();
-            Network.OnPeerJoinedChatroom += id =>
-                EnsurePeerSettings(id);
+            Network.OnPeerJoinedChatroom += id => 
+                AddPeer(id);
             Network.OnPeerLeftChatroom += id =>
                 RemovePeer(id);
 
             // Stream the incoming audio data using the right peer output
-            Network.OnAudioReceived += data => {
+            Network.OnAudioReceived += (peerID, data) => {
                 // if we're muting all, no point continuing.
                 if (MuteOthers) return;
 
-                var id = data.id;
                 var index = data.segmentIndex;
                 var frequency = data.frequency;
                 var channels = data.channelCount;
                 var samples = data.samples;
 
-                EnsurePeerStreamer(id, frequency, channels, samples.Length);
-
-                if (HasSettingsForPeer(id) && !PeerSettings[id].muteThem)
-                    PeerOutputs[id].Feed(index, frequency, channels, samples);
+                if (HasSettingsForPeer(peerID) && !PeerSettings[peerID].muteThem)
+                    PeerOutputs[peerID].Feed(index, frequency, channels, samples);
             };
 
-
             AudioInput.OnSegmentReady += (index, samples) => {
                 if (MuteSelf) return;
 
                 // Get all the recipients we haven't muted ourselves to
                 var recipients = Network.PeerIDs
                     .Where(x => {
-                        return HasSettingsForPeer(x)
-                        && !PeerSettings[x].muteSelf;
+                        return HasSettingsForPeer(x) && !PeerSettings[x].muteSelf;
                     });
 
                 // Send the audio segment to every deserving recipient
                 foreach (var recipient in recipients)
-                    Network.SendAudioSegment(new ChatroomAudioSegment {
-                        id = recipient,
+                    Network.SendAudioSegment(recipient, new ChatroomAudioSegment {
                         segmentIndex = index,
                         frequency = AudioInput.Frequency,
                         channelCount = AudioInput.ChannelCount,
@@ -189,11 +182,24 @@ namespace Adrenak.UniVoice {
             };
         }
 
+        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[id].Dispose();
                 PeerOutputs.Remove(id);
             }
@@ -202,27 +208,7 @@ namespace Adrenak.UniVoice {
         void RemoveAllPeers() =>
             PeerSettings.Keys.ToList().ForEach(x => RemovePeer(x));
 
-        void EnsurePeerSettings(short id) =>
-            PeerSettings.EnsureKey(id, new ChatroomPeerSettings());
-
         bool HasSettingsForPeer(short id) => PeerSettings.ContainsKey(id);
-
-        void EnsurePeerStreamer(
-            short id, 
-            int frequency, 
-            int channels, 
-            int segmentLength
-        ) {
-            if (!PeerOutputs.ContainsKey(id) && PeerSettings.ContainsKey(id)) {
-                var output = AudioOutputFactory.Create(
-                    frequency,
-                    channels,
-                    segmentLength
-                );
-                output.ID = id.ToString();
-                PeerOutputs.Add(id, output);
-            }
-        }
         #endregion
     }
 }

package/Runtime/Interfaces/IAudioInput.cs

@@ -26,8 +26,10 @@ namespace Adrenak.UniVoice {
         /// <summary>
         /// The number of segments (a segment is a sequence of audio samples)
         /// that are emitted from the source every second.
-        /// A 16000 Hz source with a rate of 10 will output an array of
-        /// 1600 samples every 100 milliseconds.
+        /// A 16000 Hz source with one channel at a rate of 10 
+        /// will output an array of 1600 samples every 100 milliseconds.
+        /// A 44000 Hz source with two channels at a rate of 10 
+        /// will output an array of 8800 samples every 100 milliseconds.
         /// </summary>
         int SegmentRate { get; }
     }

package/Runtime/Interfaces/IAudioOutput.cs

@@ -10,6 +10,8 @@ namespace Adrenak.UniVoice {
     /// destination doesn't matter.
     /// </summary>
     public interface IAudioOutput : IDisposable {
+        // TODO: Maybe introduce a PeerID property?
+
         /// <summary>
         /// An ID associated with this audio output
         /// </summary>

package/Runtime/Interfaces/IChatroomNetwork.cs

@@ -20,7 +20,7 @@ namespace Adrenak.UniVoice {
         /// Provides an exception as event data.
         /// </summary>
         event Action<Exception> OnChatroomCreationFailed;
-        
+
         /// <summary>
         /// Fired when a chatroom is closed.
         /// </summary>
@@ -46,6 +46,8 @@ namespace Adrenak.UniVoice {
         /// <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;
 
@@ -58,12 +60,12 @@ namespace Adrenak.UniVoice {
         /// <summary>
         /// Fired when the network receives audio data from a peer. 
         /// </summary>
-        event Action<ChatroomAudioSegment> OnAudioReceived;
+        event Action<short, ChatroomAudioSegment> OnAudioReceived;
 
         /// <summary>
         /// Fired when the local user sets audio data to a peer.
         /// </summary>
-        event Action<ChatroomAudioSegment> OnAudioSent;
+        event Action<short, ChatroomAudioSegment> OnAudioSent;
         #endregion
 
         // ====================================================================
@@ -111,7 +113,7 @@ namespace Adrenak.UniVoice {
         /// Sends audio data over the network
         /// </summary>
         /// <param name="data">The data to be transmitted.</param>
-        void SendAudioSegment(ChatroomAudioSegment data);
+        void SendAudioSegment(short peerID, ChatroomAudioSegment data);
         #endregion
     }
 }

package/Runtime/Types/ChatroomAgentMode.cs

@@ -1,4 +1,5 @@
 namespace Adrenak.UniVoice {
+    [System.Serializable]
     /// <summary>
     /// Represents the mode that a <see cref="ChatroomAgent"/> is in.
     /// </summary>

package/Runtime/Types/ChatroomAudioSegment.cs

@@ -4,11 +4,6 @@
     /// A data structure representing the audio transmitted over the network.
     /// </summary>
     public struct ChatroomAudioSegment {
-        /// <summary>
-        /// ID of the peer that has sent the data
-        /// </summary>
-        public short id;
-
         /// <summary>
         /// The segment index of the audio samples
         /// </summary>

package/Runtime/Types/ChatroomPeerSettings.cs

@@ -1,4 +1,5 @@
 namespace Adrenak.UniVoice {
+    [System.Serializable]
     /// <summary>
     /// Represents settings associated with a peer in the chatroom
     /// </summary>

package/package.json

@@ -1,20 +1,20 @@
-{
-  "name": "com.adrenak.univoice",
-  "version": "1.2.1",
-  "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": "2.0.1",
+  "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"
+  }
+}