Merge branch 'replace-webrtc' into sipsorcery

immense · Apr 18, 2021 · f72acc8 · f72acc8
2 parents 107767a + 91a3ebf
commit f72acc8
Show file tree

Hide file tree

Showing 23 changed files with 148 additions and 306 deletions.
diff --git a/Desktop.Core/Desktop.Core.csproj b/Desktop.Core/Desktop.Core.csproj
@@ -46,8 +46,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="5.0.0" />
-    <PackageReference Include="Microsoft.MixedReality.WebRTC" Version="2.0.2" />
     <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
+    <PackageReference Include="SIPSorcery" Version="5.1.1" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
   </ItemGroup>
 

diff --git a/Desktop.Core/Services/CasterSocket.cs b/Desktop.Core/Services/CasterSocket.cs
@@ -28,7 +28,7 @@ public interface ICasterSocket
         Task SendCtrlAltDelToAgent();
         Task SendDeviceInfo(string serviceID, string machineName, string deviceID);
         Task SendDtoToViewer<T>(T baseDto, string viewerId);
-        Task SendIceCandidateToBrowser(string candidate, int sdpMlineIndex, string sdpMid, string viewerConnectionID);
+        Task SendIceCandidateToBrowser(string candidate, string sdpMid, ushort sdpMLineIndex, string usernameFragment, string viewerConnectionID);
         Task SendMessageToViewer(string viewerID, string message);
         Task SendRtcOfferToBrowser(string sdp, string viewerID, IceServerModel[] iceServers);
         Task SendViewerConnected(string viewerConnectionId);
@@ -164,9 +164,9 @@ public Task SendDtoToViewer<T>(T baseDto, string viewerId)
             var serializedDto = MessagePack.MessagePackSerializer.Serialize(baseDto);
             return Connection.SendAsync("SendDtoToBrowser", serializedDto, viewerId);
         }
-        public async Task SendIceCandidateToBrowser(string candidate, int sdpMlineIndex, string sdpMid, string viewerConnectionID)
+        public async Task SendIceCandidateToBrowser(string candidate, string sdpMid, ushort sdpMLineIndex, string usernameFragment, string viewerConnectionID)
         {
-            await Connection.SendAsync("SendIceCandidateToBrowser", candidate, sdpMlineIndex, sdpMid, viewerConnectionID);
+            await Connection.SendAsync("SendIceCandidateToBrowser", candidate, sdpMid, sdpMLineIndex, usernameFragment, viewerConnectionID);
         }
 
         public async Task SendRtcOfferToBrowser(string sdp, string viewerID, IceServerModel[] iceServers)
@@ -237,13 +237,13 @@ private void ApplyConnectionHandlers()
             });
 
 
-            Connection.On("ReceiveIceCandidate", (string candidate, int sdpMlineIndex, string sdpMid, string viewerID) =>
+            Connection.On("ReceiveIceCandidate", (string candidate, string sdpMid, ushort sdpMLineIndex, string usernameFragment, string viewerID) =>
             {
                 try
                 {
                     if (conductor.Viewers.TryGetValue(viewerID, out var viewer))
                     {
-                        viewer.RtcSession.AddIceCandidate(sdpMid, sdpMlineIndex, candidate);
+                        viewer.RtcSession.AddIceCandidate(candidate, sdpMid, sdpMLineIndex, usernameFragment);
                     }
                 }
                 catch (Exception ex)

diff --git a/Desktop.Core/Services/DtoMessageHandler.cs b/Desktop.Core/Services/DtoMessageHandler.cs
@@ -97,9 +97,6 @@ public async Task ParseMessage(Viewer viewer, byte[] message)
                     case BaseDtoType.ToggleBlockInput:
                         ToggleBlockInput(message);
                         break;
-                    case BaseDtoType.ToggleWebRtcVideo:
-                        ToggleWebRtcVideo(message, viewer);
-                        break;
                     case BaseDtoType.ClipboardTransfer:
                         await ClipboardTransfer(message);
                         break;
@@ -250,11 +247,5 @@ private void ToggleBlockInput(byte[] message)
             var dto = MessagePackSerializer.Deserialize<ToggleBlockInputDto>(message);
             KeyboardMouseInput.ToggleBlockInput(dto.ToggleOn);
         }
-
-        private void ToggleWebRtcVideo(byte[] message, Viewer viewer)
-        {
-            var dto = MessagePackSerializer.Deserialize<ToggleWebRtcVideoDto>(message);
-            viewer.ToggleWebRtcVideo(dto.ToggleOn);
-        }
     }
 }
diff --git a/Desktop.Core/Services/ScreenCaster.cs b/Desktop.Core/Services/ScreenCaster.cs
@@ -106,7 +106,7 @@ await viewer.SendScreenCapture(new CaptureFrame()
                 }
 
 
-                if (EnvironmentHelper.IsWindows && screenCastRequest.UseWebRtc)
+                if (screenCastRequest.UseWebRtc)
                 {
                     await viewer.InitializeWebRtc();
                 }
@@ -118,11 +118,6 @@ await viewer.SendScreenCapture(new CaptureFrame()
                 {
                     try
                     {
-                        if (viewer.IsUsingWebRtcVideo)
-                        {
-                            Thread.Sleep(100);
-                            continue;
-                        }
                         if (viewer.IsStalled)
                         {
                             // Viewer isn't responding.  Abort sending.

diff --git a/Desktop.Core/Services/Viewer.cs b/Desktop.Core/Services/Viewer.cs
@@ -11,8 +11,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Diagnostics;
-using System.Threading;
+using System.Text.Json;
 
 namespace Remotely.Desktop.Core.Services
 {
@@ -59,14 +58,6 @@ public bool IsUsingWebRtc
             }
         }
 
-        public bool IsUsingWebRtcVideo
-        {
-            get
-            {
-                return RtcSession?.IsPeerConnected == true && RtcSession?.IsVideoTrackConnected == true;
-            }
-        }
-
         public string Name { get; set; }
 
         public double AverageBytesPerSecond { get; set; }
@@ -109,11 +100,15 @@ public async Task InitializeWebRtc()
 
                 RtcSession.LocalSdpReady += async (sender, sdp) =>
                 {
-                    await CasterSocket.SendRtcOfferToBrowser(sdp.Content, ViewerConnectionID, iceServers);
+                    await CasterSocket.SendRtcOfferToBrowser(sdp.sdp, ViewerConnectionID, iceServers);
                 };
                 RtcSession.IceCandidateReady += async (sender, candidate) =>
                 {
-                    await CasterSocket.SendIceCandidateToBrowser(candidate.Content, candidate.SdpMlineIndex, candidate.SdpMid, ViewerConnectionID);
+                    await CasterSocket.SendIceCandidateToBrowser(candidate.candidate, 
+                        candidate.sdpMid, 
+                        candidate.sdpMLineIndex,
+                        candidate.usernameFragment,
+                        ViewerConnectionID);
                 };
 
                 await RtcSession.Init(iceServers);
@@ -306,11 +301,6 @@ public void ThrottleIfNeeded()
                 TimeSpan.FromSeconds(10));
         }
 
-        public void ToggleWebRtcVideo(bool toggleOn)
-        {
-            RtcSession.ToggleWebRtcVideo(toggleOn);
-        }
-
         private async void AudioCapturer_AudioSampleReady(object sender, byte[] sample)
         {
             await SendAudioSample(sample);