fix video or audio stream not starting bug, refactor start stop transmission

Author: FireDragonGameStudio

Assets/SimpleWebRTC/Runtime/Scenes/WebRTC-SingleClient-STUNConnection.unity

@@ -2744,6 +2744,10 @@ PrefabInstance:
       propertyPath: IsVideoAudioSender
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2360244695844763642, guid: 2884c322692e8cb4fa7aeed7d35cb11a, type: 3}
+      propertyPath: IsVideoAudioReceiver
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 2360244695844763642, guid: 2884c322692e8cb4fa7aeed7d35cb11a, type: 3}
       propertyPath: WebSocketConnectionChanged.m_PersistentCalls.m_Calls.Array.size
       value: 0
@@ -2756,6 +2760,10 @@ PrefabInstance:
       propertyPath: WebSocketConnectionChanged.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 4742940825921038815, guid: 2884c322692e8cb4fa7aeed7d35cb11a, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5412547114386104584, guid: 2884c322692e8cb4fa7aeed7d35cb11a, type: 3}
       propertyPath: m_Name
       value: Client-STUNConnection

Assets/SimpleWebRTC/Runtime/Scripts/Connections/WebRTCConnection.cs

@@ -1,4 +1,6 @@
 using NativeWebSocket;
+using System.Collections;
+using Unity.WebRTC;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -56,6 +58,8 @@ public class WebRTCConnection : MonoBehaviour {
         public UnityEvent AudioTransmissionReceived;
 
         private WebRTCManager webRTCManager;
+        private VideoStreamTrack videoStreamTrack;
+        private AudioStreamTrack audioStreamTrack;
 
         private void Awake() {
             SimpleWebRTCLogger.EnableLogging = ShowLogs;
@@ -117,28 +121,22 @@ private void Update() {
 
             if (StartStopVideoTransmission && !IsVideoTransmissionActive && IsVideoAudioSender) {
                 IsVideoTransmissionActive = !IsVideoTransmissionActive;
-                StreamingCamera.gameObject.SetActive(IsVideoTransmissionActive);
-                webRTCManager.AddVideoTrack(StreamingCamera, VideoResolution.x, VideoResolution.y);
+                StartVideoTransmission();
             }
 
             if (!StartStopVideoTransmission && IsVideoTransmissionActive) {
                 IsVideoTransmissionActive = !IsVideoTransmissionActive;
-                StreamingCamera.gameObject.SetActive(IsVideoTransmissionActive);
-                webRTCManager.RemoveVideoTrack();
+                StopVideoTransmission();
             }
 
             if (StartStopAudioTransmission && !IsAudioTransmissionActive && IsVideoAudioSender) {
                 IsAudioTransmissionActive = !IsAudioTransmissionActive;
-                StreamingAudioSource.gameObject.SetActive(IsAudioTransmissionActive);
-                StreamingAudioSource.Play();
-                webRTCManager.AddAudioTrack(StreamingAudioSource);
+                StartAudioTransmission();
             }
 
             if (!StartStopAudioTransmission && IsAudioTransmissionActive) {
                 IsAudioTransmissionActive = !IsAudioTransmissionActive;
-                StreamingAudioSource.Stop();
-                StreamingAudioSource.gameObject.SetActive(IsAudioTransmissionActive);
-                webRTCManager.RemoveAudioTrack();
+                StopAudioTransmission();
             }
         }
 
@@ -254,29 +252,78 @@ public void SendDataChannelMessageToPeer(string targetPeerId, string message) {
         }
 
         public void StartVideoTransmission() {
+            StopCoroutine(StartVideoTransmissionAsync());
+            StartCoroutine(StartVideoTransmissionAsync());
+        }
+
+        private IEnumerator StartVideoTransmissionAsync() {
+
+            StreamingCamera.gameObject.SetActive(true);
+
+            // camera activation delay?
+            yield return new WaitForSeconds(1f);
+
             if (IsVideoTransmissionActive) {
                 // for restarting without stopping
                 webRTCManager.RemoveVideoTrack();
-                webRTCManager.AddVideoTrack(StreamingCamera, VideoResolution.x, VideoResolution.y);
             }
+            videoStreamTrack = StreamingCamera.CaptureStreamTrack(VideoResolution.x, VideoResolution.y);
+            webRTCManager.AddVideoTrack(videoStreamTrack);
+
             StartStopVideoTransmission = true;
+            IsVideoTransmissionActive = true;
         }
 
         public void StopVideoTransmission() {
+
+            StopCoroutine(StartVideoTransmissionAsync());
+
+            StreamingCamera.gameObject.SetActive(false);
+
+            webRTCManager.RemoveVideoTrack();
+
             StartStopVideoTransmission = false;
+            IsVideoTransmissionActive = false;
         }
 
         public void StartAudioTransmission() {
+            StopCoroutine(StartAudioTransmissionAsync());
+            StartCoroutine(StartAudioTransmissionAsync());
+        }
+
+        private IEnumerator StartAudioTransmissionAsync() {
+
+            StopCoroutine(StartAudioTransmissionAsync());
+
+            StreamingAudioSource.gameObject.SetActive(IsAudioTransmissionActive);
+
+            // audio activation delay?
+            yield return new WaitForSeconds(1f);
+
+            StreamingAudioSource.Play();
+
             if (IsAudioTransmissionActive) {
                 // for restarting without stopping
                 webRTCManager.RemoveAudioTrack();
-                webRTCManager.AddAudioTrack(StreamingAudioSource);
             }
+            audioStreamTrack = new AudioStreamTrack(StreamingAudioSource) {
+                Loopback = true
+            };
+            webRTCManager.AddAudioTrack(audioStreamTrack);
+
             StartStopAudioTransmission = true;
+            IsAudioTransmissionActive = true;
         }
 
         public void StopAudioTransmission() {
+
+            StreamingAudioSource.Stop();
+            StreamingAudioSource.gameObject.SetActive(IsAudioTransmissionActive);
+
+            webRTCManager.RemoveAudioTrack();
+
             StartStopAudioTransmission = false;
+            IsAudioTransmissionActive = false;
         }
     }
 }

Assets/SimpleWebRTC/Runtime/Scripts/Connections/WebRTCManager.cs

@@ -459,8 +459,7 @@ public void SendViaDataChannel(string targetPeerId, string message) {
             senderDataChannels[targetPeerId]?.Send(message);
         }
 
-        public void AddVideoTrack(Camera streamingCamera, int width, int height) {
-            var videoStreamTrack = streamingCamera.CaptureStreamTrack(width, height);
+        public void AddVideoTrack(VideoStreamTrack videoStreamTrack) {
 
             // optional video stream preview
             if (connectionGameObject.OptionalPreviewRawImage != null) {
@@ -486,10 +485,8 @@ public void RemoveVideoTrack() {
             }
         }
 
-        public void AddAudioTrack(AudioSource streamingAudioSource) {
-            var audioStreamTrack = new AudioStreamTrack(streamingAudioSource) {
-                Loopback = true
-            };
+        public void AddAudioTrack(AudioStreamTrack audioStreamTrack) {
+
             foreach (var peerConnection in peerConnections) {
                 audioTrackSenders.Add(peerConnection.Key, peerConnection.Value.AddTrack(audioStreamTrack));
             }

Assets/SimpleWebRTC/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.firedragongamestudio.simplewebrtc",
   "displayName": "SimpleWebRTC",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "unity": "2022.3",
   "description": "Unity-based WebRTC wrapper that facilitates peer-to-peer audio, video, and data communication over WebRTC.",
   "dependencies": {