livekit · cloudwebrtc · Apr 19, 2024 · Apr 19, 2024 · Apr 19, 2024 · Apr 19, 2024
diff --git a/.gitattributes b/.gitattributes
@@ -11,7 +11,7 @@ Runtime/Plugins/ffi-macos-arm64/liblivekit_ffi.dylib filter=lfs diff=lfs merge=l
 Runtime/Plugins/ffi-macos-x86_64/liblivekit_ffi.dylib filter=lfs diff=lfs merge=lfs -text
 Runtime/Plugins/ffi-linux-arm64/liblivekit_ffi.so filter=lfs diff=lfs merge=lfs -text
 Runtime/Plugins/ffi-linux-x86_64/liblivekit_ffi.so filter=lfs diff=lfs merge=lfs -text
-Runtime/Plugins/ffi-windows-x86_64/liblivekit_ffi.dll filter=lfs diff=lfs merge=lfs -text
-Runtime/Plugins/ffi-windows-arm64/liblivekit_ffi.dll filter=lfs diff=lfs merge=lfs -text
+Runtime/Plugins/ffi-windows-x86_64/livekit_ffi.dll filter=lfs diff=lfs merge=lfs -text
+Runtime/Plugins/ffi-windows-arm64/livekit_ffi.dll filter=lfs diff=lfs merge=lfs -text
 Runtime/Plugins/Google.Protobuf.dll filter=lfs diff=lfs merge=lfs -text
 Runtime/Plugins/System.Runtime.CompilerServices.Unsafe.dll filter=lfs diff=lfs merge=lfs -text
diff --git a/NOTICE.meta b/NOTICE.meta
diff --git a/Runtime/Plugins/ffi-android-arm64/liblivekit_ffi.so b/Runtime/Plugins/ffi-android-arm64/liblivekit_ffi.so
diff --git a/Runtime/Plugins/ffi-android-armv7/liblivekit_ffi.so b/Runtime/Plugins/ffi-android-armv7/liblivekit_ffi.so
diff --git a/Runtime/Plugins/ffi-android-x86_64/liblivekit_ffi.so b/Runtime/Plugins/ffi-android-x86_64/liblivekit_ffi.so
diff --git a/Runtime/Plugins/ffi-linux-arm64/liblivekit_ffi.so b/Runtime/Plugins/ffi-linux-arm64/liblivekit_ffi.so
diff --git a/Runtime/Plugins/ffi-linux-x86_64/liblivekit_ffi.so b/Runtime/Plugins/ffi-linux-x86_64/liblivekit_ffi.so
diff --git a/Runtime/Plugins/ffi-macos-arm64/liblivekit_ffi.dylib b/Runtime/Plugins/ffi-macos-arm64/liblivekit_ffi.dylib
diff --git a/Runtime/Plugins/ffi-macos-x86_64/liblivekit_ffi.dylib b/Runtime/Plugins/ffi-macos-x86_64/liblivekit_ffi.dylib
diff --git a/Runtime/Plugins/ffi-windows-arm64/livekit_ffi.dll b/Runtime/Plugins/ffi-windows-arm64/livekit_ffi.dll
diff --git a/Runtime/Plugins/ffi-windows-x86_64/livekit_ffi.dll b/Runtime/Plugins/ffi-windows-x86_64/livekit_ffi.dll
diff --git a/Runtime/Scripts/Proto/Room.cs b/Runtime/Scripts/Proto/Room.cs
diff --git a/Runtime/Scripts/Proto/Stats.cs b/Runtime/Scripts/Proto/Stats.cs
diff --git a/Runtime/Scripts/Proto/Track.cs b/Runtime/Scripts/Proto/Track.cs
diff --git a/Runtime/Scripts/Room.cs b/Runtime/Scripts/Room.cs
@@ -120,6 +120,7 @@ public class Room
         public delegate void SpeakersChangeDelegate(List<Participant> speakers);
         public delegate void ConnectionQualityChangeDelegate(ConnectionQuality quality, Participant participant);
         public delegate void DataDelegate(byte[] data, Participant participant, DataPacketKind kind, string topic);
+        public delegate void SipDtmfDelegate(Participant participant, UInt32 code, string digit);
         public delegate void ConnectionStateChangeDelegate(ConnectionState connectionState);
         public delegate void ConnectionDelegate(Room room);
         public delegate void E2EeStateChangedDelegate(Participant participant, EncryptionState state);
@@ -146,6 +147,7 @@ public class Room
         public event SpeakersChangeDelegate ActiveSpeakersChanged;
         public event ConnectionQualityChangeDelegate ConnectionQualityChanged;
         public event DataDelegate DataReceived;
+        public event SipDtmfDelegate SipDtmfReceived;
         public event ConnectionStateChangeDelegate ConnectionStateChanged;
         public event ConnectionDelegate Connected;
         public event ConnectionDelegate Disconnected;
@@ -338,13 +340,31 @@ internal void OnEventReceived(RoomEvent e)
                         ConnectionQualityChanged?.Invoke(quality, participant);
                     }
                     break;
-                case RoomEvent.MessageOneofCase.DataReceived:
+                case RoomEvent.MessageOneofCase.DataPacketReceived:
                     {
-                        var dataInfo = e.DataReceived;
-                        var data = new byte[dataInfo.Data.Data.DataLen];
-                        Marshal.Copy((IntPtr)dataInfo.Data.Data.DataPtr, data, 0, data.Length);
-                        var participant = GetParticipant(e.DataReceived.ParticipantSid);
-                        DataReceived?.Invoke(data, participant, dataInfo.Kind, dataInfo.Topic);
+                        var valueType = e.DataPacketReceived.ValueCase;
+                        switch(valueType)
+                        {
+                            case DataPacketReceived.ValueOneofCase.None:
+                                //do nothing.
+                                break;
+                            case DataPacketReceived.ValueOneofCase.User:
+                                {
+                                    var dataInfo = e.DataPacketReceived.User;
+                                    var data = new byte[dataInfo.Data.Data.DataLen];
+                                    Marshal.Copy((IntPtr)dataInfo.Data.Data.DataPtr, data, 0, data.Length);
+                                    var participant = GetParticipant(e.DataPacketReceived.ParticipantSid);
+                                    DataReceived?.Invoke(data, participant, e.DataPacketReceived.Kind, dataInfo.Topic);
+                                }
+                                break;
+                            case DataPacketReceived.ValueOneofCase.SipDtmf:
+                                {
+                                    var dtmfInfo = e.DataPacketReceived.SipDtmf;
+                                    var participant = GetParticipant(e.DataPacketReceived.ParticipantSid);
+                                    SipDtmfReceived?.Invoke(participant, dtmfInfo.Code, dtmfInfo.Digit);
+                                }
+                                break;
+                        }
                     }
                     break;
                 case RoomEvent.MessageOneofCase.ConnectionStateChanged:

diff --git a/client-sdk-rust~ b/client-sdk-rust~