Merge pull request #30 from pollen-robotics/29-signal-when-data-command-channel-is-opened

enhancement #29: emit signal when command channel is opened.

Author: FabienDanieau

Plugin/src/GstDataPipeline.cpp

@@ -28,6 +28,10 @@ void GstDataPipeline::DestroyPipeline()
     gst_webrtc_data_channel_close(channel_command_);
     gst_webrtc_data_channel_close(channel_audit_);
 
+    channel_service_ = nullptr;
+    channel_audit_ = nullptr;
+    channel_command_ = nullptr;
+
     GstBasePipeline::DestroyPipeline();
 }
 
@@ -186,10 +190,10 @@ void GstDataPipeline::on_data_channel(GstElement* webrtcbin, GstWebRTCDataChanne
 
         g_signal_connect(channel, "on-message-data", G_CALLBACK(on_message_data_service), nullptr);
 
-        if (callbackChannelServiceOpenInstance != nullptr)
-        {
-            callbackChannelServiceOpenInstance();
-        }   
+        if (callbackChannelServiceOpenInstance != nullptr)        
+            callbackChannelServiceOpenInstance();   
+        else
+            Debug::Log("Fails to notify opening of service channel", Level::Warning);
     }
     else if (starts_with(label_str,CHANNEL_REACHY_STATE))
     {
@@ -202,6 +206,10 @@ void GstDataPipeline::on_data_channel(GstElement* webrtcbin, GstWebRTCDataChanne
     else if (starts_with(label_str, CHANNEL_REACHY_COMMAND))
     {
         self->channel_command_ = channel;
+        if (callbackChannelCommandOpenInstance != nullptr)        
+            callbackChannelCommandOpenInstance();    
+        else
+            Debug::Log("Fails to notify opening of command channel", Level::Warning);
     }
     else
     {
@@ -290,7 +298,8 @@ GstElement* GstDataPipeline::add_webrtcbin()
 // Create a callback delegate
 void RegisterICECallback(FuncCallBackICE cb) { callbackICEInstance = cb; }
 void RegisterSDPCallback(FuncCallBackSDP cb) { callbackSDPInstance = cb; }
-void RegisterChannelServiceOpenCallback(FuncCallBackChannelServiceOpen cb) { callbackChannelServiceOpenInstance = cb; }
+void RegisterChannelCommandOpenCallback(FuncCallBackChannelOpen cb) { callbackChannelCommandOpenInstance = cb; }
+void RegisterChannelServiceOpenCallback(FuncCallBackChannelOpen cb) { callbackChannelServiceOpenInstance = cb; }
 void RegisterChannelServiceDataCallback(FuncCallBackChannelData cb) { callbackChannelServiceDataInstance = cb; }
 void RegisterChannelStateDataCallback(FuncCallBackChannelData cb) { callbackChannelStateDataInstance = cb; }
 void RegisterChannelAuditDataCallback(FuncCallBackChannelData cb) { callbackChannelAuditDataInstance = cb; }

Plugin/src/GstDataPipeline.h

@@ -21,9 +21,12 @@ extern "C"
     static FuncCallBackSDP callbackSDPInstance = nullptr;
     DLLExport void RegisterSDPCallback(FuncCallBackSDP cb);
 
-    typedef void (*FuncCallBackChannelServiceOpen)();
-    static FuncCallBackChannelServiceOpen callbackChannelServiceOpenInstance = nullptr;
-    DLLExport void RegisterChannelServiceOpenCallback(FuncCallBackChannelServiceOpen cb);
+    typedef void (*FuncCallBackChannelOpen)();
+    static FuncCallBackChannelOpen callbackChannelServiceOpenInstance = nullptr;
+    DLLExport void RegisterChannelServiceOpenCallback(FuncCallBackChannelOpen cb);
+
+    static FuncCallBackChannelOpen callbackChannelCommandOpenInstance = nullptr;
+    DLLExport void RegisterChannelCommandOpenCallback(FuncCallBackChannelOpen cb);
 
     typedef void (*FuncCallBackChannelData)(const uint8_t * message, int size);
     static FuncCallBackChannelData callbackChannelServiceDataInstance = nullptr;

UnityProject/Packages/com.pollenrobotics.gstreamerwebrtc/Runtime/Plugins/x86_64/UnityGStreamerPlugin.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16fd1d25ac7fe2b2c49020fe60f09464654f0f50299e18926410074420dbbd35
+oid sha256:704f9ac33cae4bcf5a8f354a9e81ed4437d60904352b37d67feb1ad00f638ac5
 size 53248

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

@@ -80,6 +80,14 @@ public class GStreamerDataPlugin
         static extern void RegisterChannelServiceOpenCallback(channelServiceOpenCallback cb);
         delegate void channelServiceOpenCallback();
 
+#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST || PLATFORM_SWITCH) && !UNITY_EDITOR
+    [DllImport("__Internal")]
+#else
+        [DllImport("UnityGStreamerPlugin")]
+#endif
+        static extern void RegisterChannelCommandOpenCallback(channelCommandOpenCallback cb);
+        delegate void channelCommandOpenCallback();
+
 #if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST || PLATFORM_SWITCH) && !UNITY_EDITOR
     [DllImport("__Internal")]
 #else
@@ -116,6 +124,7 @@ public class GStreamerDataPlugin
 
         private static UnityEvent<string, int> event_OnICE;
         public static UnityEvent event_OnChannelServiceOpen;
+        public static UnityEvent event_OnChannelCommandOpen;
         public static UnityEvent<byte[]> event_OnChannelServiceData;
         public static UnityEvent<byte[]> event_OnChannelStateData;
         public static UnityEvent<byte[]> event_OnChannelAuditData;
@@ -130,6 +139,7 @@ public GStreamerDataPlugin(string ip_address)
             RegisterICECallback(OnICECallback);
             RegisterSDPCallback(OnSDPCallback);
             RegisterChannelServiceOpenCallback(OnChannelServiceOpenCallback);
+            RegisterChannelCommandOpenCallback(OnChannelCommandOpenCallback);
             RegisterChannelServiceDataCallback(OnChannelServiceDataCallback);
             RegisterChannelStateDataCallback(OnChannelStateDataCallback);
             RegisterChannelAuditDataCallback(OnChannelAuditDataCallback);
@@ -152,6 +162,7 @@ public GStreamerDataPlugin(string ip_address)
             event_OnICE.AddListener(OnICE);
 
             event_OnChannelServiceOpen = new UnityEvent();
+            event_OnChannelCommandOpen = new UnityEvent();
             event_OnChannelServiceData = new UnityEvent<byte[]>();
             event_OnChannelStateData = new UnityEvent<byte[]>();
             event_OnChannelAuditData = new UnityEvent<byte[]>();
@@ -226,6 +237,12 @@ static void OnChannelServiceOpenCallback()
             event_OnChannelServiceOpen.Invoke();
         }
 
+        [MonoPInvokeCallback(typeof(channelCommandOpenCallback))]
+        static void OnChannelCommandOpenCallback()
+        {
+            event_OnChannelCommandOpen.Invoke();
+        }
+
         [MonoPInvokeCallback(typeof(channelServiceDataCallback))]
         static void OnChannelServiceDataCallback(IntPtr data, int size)
         {
@@ -251,4 +268,4 @@ static void OnChannelAuditDataCallback(IntPtr data, int size)
         }
 
     }
-}
+}

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

@@ -114,6 +114,11 @@ void Update()
             renderingPlugin.Render();
         }
 
+        protected virtual void OnChannelCommandOpen()
+        {
+            Debug.Log("Channel command open");
+        }
+
         //Data channels
         protected virtual void OnChannelServiceOpen()
         {
@@ -133,4 +138,4 @@ protected void SendCommandToChannel(byte[] commands)
             GStreamerDataPlugin.SendBytesChannelCommand(commands, commands.Length);
         }
     }
-}
+}