Merge branch 'develop' into 26-keyed_mutex-is-null

Author: FabienDanieau

UnityProject/Packages/com.pollenrobotics.gstreamerwebrtc/Runtime/Scripts/BaseSignalling.cs

@@ -58,10 +58,10 @@ public class BaseSignalling
         protected CancellationTokenSource _cts;
 
         private const int MAX_CONNECTION_ATTEMPTS = 100;
+        private const int PAUSE_BETWEEN_CONNECTION_ATTEMPTS_MS = 5000;
 
         private bool request_stop = false;
 
-
         public BaseSignalling(string url, string remote_producer_name = "")
         {
             if (remote_producer_name == "")
@@ -112,7 +112,6 @@ public async void Connect()
                     else
                     {
                         Debug.LogWarning("Failed to connect to WebSocket server. Attempt " + i);
-
                     }
                 }
                 catch (WebSocketException ex)
@@ -121,7 +120,7 @@ public async void Connect()
                     if (request_stop)
                         break;
                 }
-
+                await Task.Delay(PAUSE_BETWEEN_CONNECTION_ATTEMPTS_MS);
             }
             if (webSocket.State != WebSocketState.Open && !request_stop)
                 Debug.LogError("Failed to connect to WebSocket server.");
@@ -217,6 +216,14 @@ protected virtual void ProcessMessage(string message)
                         Close();
                     }
                 }
+                else if (msg.type == MessageType.SessionEnded.ToString())
+                {
+                    Debug.Log("Session ended");
+                    sessionStatus = SessionStatus.Ended;
+                    if (!request_stop)
+                        event_OnRemotePeerLeft.Invoke();
+                    Close();
+                }
                 else
                 {
                     Debug.LogWarning("Message not processed " + msg);

UnityProject/Packages/com.pollenrobotics.gstreamerwebrtc/Runtime/Scripts/GStreamerDataPlugin.cs

@@ -119,6 +119,7 @@ public class GStreamerDataPlugin
         public string remote_producer_name = "grpc_webrtc_bridge";
 
         public UnityEvent event_OnPipelineStarted;
+        public UnityEvent event_OnPipelineStopped;
 
         private static UnityEvent<string> event_OnSDPAnswer;
 
@@ -129,12 +130,10 @@ public class GStreamerDataPlugin
         public static UnityEvent<byte[]> event_OnChannelStateData;
         public static UnityEvent<byte[]> event_OnChannelAuditData;
 
-        //private bool _started = false;
         private bool _autoreconnect = false;
 
         public GStreamerDataPlugin(string ip_address)
         {
-            //_started = false;
             _autoreconnect = true;
             RegisterICECallback(OnICECallback);
             RegisterSDPCallback(OnSDPCallback);
@@ -154,6 +153,7 @@ public GStreamerDataPlugin(string ip_address)
             _signalling.event_OnICECandidate.AddListener(OnReceivedICE);
 
             event_OnPipelineStarted = new UnityEvent();
+            event_OnPipelineStopped = new UnityEvent();
 
             event_OnSDPAnswer = new UnityEvent<string>();
             event_OnSDPAnswer.AddListener(SendSDPAnswer);
@@ -175,15 +175,14 @@ public void Connect()
 
         void StartPipeline(string remote_peer_id)
         {
-            Debug.Log("start pipe " + remote_peer_id);
+            Debug.Log("start data pipe " + remote_peer_id);
             CreateDataPipeline();
             event_OnPipelineStarted.Invoke();
-            // _started = true;
         }
 
         void StopPipeline()
         {
-            // _started = false;
+            event_OnPipelineStopped.Invoke();
             if (_autoreconnect)
                 Connect();
         }

UnityProject/Packages/com.pollenrobotics.gstreamerwebrtc/Runtime/Scripts/GstreamerPlugin.cs

@@ -5,6 +5,7 @@ LICENSE file in the root directory of this source tree. */
 using UnityEngine;
 using UnityEngine.UI;
 using System.Threading;
+using UnityEngine.Events;
 
 namespace GstreamerWebRTC
 {
@@ -26,6 +27,8 @@ public class GStreamerPlugin : MonoBehaviour
         private Thread cleaning_thread = null;
         private Thread init_thread = null;
 
+        public UnityEvent<bool> event_OnPipelineRenderingRunning = new UnityEvent<bool>();
+        public UnityEvent<bool> event_OnPipelineDataRunning = new UnityEvent<bool>();
 
         void OnEnable()
         {
@@ -70,13 +73,15 @@ protected virtual void InitAV()
             leftRawImage.texture = left;
             rightRawImage.texture = right;
             renderingPlugin.event_OnPipelineStarted.AddListener(PipelineStarted);
+            renderingPlugin.event_OnPipelineStopped.AddListener(PipelineStopped);
             renderingPlugin.Connect();
         }
 
         protected virtual void InitData()
         {
             dataPlugin = new GStreamerDataPlugin(ip_address);
             dataPlugin.event_OnPipelineStarted.AddListener(PipelineDataStarted);
+            dataPlugin.event_OnPipelineStopped.AddListener(PipelineDataStopped);
             GStreamerDataPlugin.event_OnChannelServiceOpen.AddListener(OnChannelServiceOpen);
             GStreamerDataPlugin.event_OnChannelServiceData.AddListener(OnChannelServiceData);
             dataPlugin.Connect();
@@ -85,11 +90,25 @@ protected virtual void InitData()
         protected virtual void PipelineStarted()
         {
             Debug.Log("Pipeline started");
+            event_OnPipelineRenderingRunning.Invoke(true);
         }
 
         protected virtual void PipelineDataStarted()
         {
             Debug.Log("Pipeline data started");
+            event_OnPipelineDataRunning.Invoke(true);
+        }
+
+        protected virtual void PipelineStopped()
+        {
+            Debug.Log("Pipeline stopped");
+            event_OnPipelineRenderingRunning.Invoke(false);
+        }
+
+        protected virtual void PipelineDataStopped()
+        {
+            Debug.Log("Pipeline data stopped");
+            event_OnPipelineDataRunning.Invoke(false);
         }
 
         protected virtual void OnDisable()

UnityProject/Packages/com.pollenrobotics.gstreamerwebrtc/Runtime/Scripts/GstreamerRenderingPlugin.cs

@@ -81,6 +81,7 @@ public class GStreamerRenderingPlugin
         const uint height = 720;
 
         public UnityEvent event_OnPipelineStarted;
+        public UnityEvent event_OnPipelineStopped;
 
         CommandBuffer _command = null;
 
@@ -99,6 +100,7 @@ public GStreamerRenderingPlugin(string ip_address, ref Texture leftTexture, ref
             _signalling.event_OnRemotePeerLeft.AddListener(StopPipeline);
 
             event_OnPipelineStarted = new UnityEvent();
+            event_OnPipelineStopped = new UnityEvent();
             _command = new CommandBuffer();
 
             CreateDevice();
@@ -128,17 +130,17 @@ Texture CreateRenderTexture(bool left, ref IntPtr textureNativePtr)
 
         void StartPipeline(string remote_peer_id)
         {
-            Debug.Log("start pipe " + remote_peer_id);
+            Debug.Log("start rendering pipe " + remote_peer_id);
             CreatePipeline(_signallingServerURL, remote_peer_id);
             event_OnPipelineStarted.Invoke();
             _started = true;
         }
 
         void StopPipeline()
         {
-            Debug.Log("Stop");
             _started = false;
             DestroyPipeline();
+            event_OnPipelineStopped.Invoke();
             if (_autoreconnect)
                 Connect();
         }