Add "stream mode" as an option for WebRTC video.

Desktop.Core/Models/Viewer.cs

@@ -15,10 +15,9 @@ namespace Remotely.Desktop.Core.Models
 {
     public class Viewer : IDisposable
     {
+        private readonly int defaultImageQuality = 60;
         private int imageQuality;
         private DateTimeOffset lastQualityAdjustment;
-        private readonly int defaultImageQuality = 60;
-
         public Viewer(CasterSocket casterSocket,
             IScreenCapturer screenCapturer,
             IClipboardService clipboardService,
@@ -68,6 +67,30 @@ public int ImageQuality
         }
 
         public bool IsConnected => CasterSocket.IsConnected;
+        public bool IsStalled
+        {
+            get
+            {
+                return PendingSentFrames.TryPeek(out var result) && DateTimeOffset.Now - result > TimeSpan.FromSeconds(15);
+            }
+        }
+
+        public bool IsUsingWebRtc
+        {
+            get
+            {
+                return RtcSession?.IsPeerConnected == true && RtcSession?.IsDataChannelOpen == true;
+            }
+        }
+
+        public bool IsUsingWebRtcVideo
+        {
+            get
+            {
+                return RtcSession?.IsPeerConnected == true && RtcSession?.IsVideoTrackConnected == true;
+            }
+        }
+
         public string Name { get; set; }
         public ConcurrentQueue<DateTimeOffset> PendingSentFrames { get; } = new ConcurrentQueue<DateTimeOffset>();
         public WebRtcSession RtcSession { get; set; }
@@ -106,31 +129,6 @@ public async Task InitializeWebRtc()
                 Logger.Write(ex);
             }
         }
-
-        public bool IsUsingWebRtcVideo
-        {
-            get
-            {
-                return RtcSession?.IsPeerConnected == true && RtcSession?.IsVideoTrackConnected == true;
-            }
-        }
-
-        public bool IsStalled
-        {
-            get
-            {
-                return PendingSentFrames.TryPeek(out var result) && DateTimeOffset.Now - result > TimeSpan.FromSeconds(15);
-            }
-        }
-
-        public bool IsUsingWebRtc
-        {
-            get
-            {
-                return RtcSession?.IsPeerConnected == true && RtcSession?.IsDataChannelOpen == true;
-            }
-        }
-
         public async Task SendAudioSample(byte[] audioSample)
         {
             await SendToViewer(() => RtcSession.SendAudioSample(audioSample),
@@ -203,14 +201,18 @@ public void ThrottleIfNeeded()
                     ImageQuality = defaultImageQuality;
                 }
             }
-            
+
             TaskHelper.DelayUntil(() => PendingSentFrames.Count < 5 &&
                 (
                     !PendingSentFrames.TryPeek(out var result) || DateTimeOffset.Now - result < TimeSpan.FromSeconds(1)
                 ),
                 TimeSpan.MaxValue);
         }
 
+        public void ToggleWebRtcVideo(bool toggleOn)
+        {
+            RtcSession.ToggleWebRtcVideo(toggleOn);
+        }
         private async void AudioCapturer_AudioSampleReady(object sender, byte[] sample)
         {
             await SendAudioSample(sample);

Desktop.Core/Services/CasterSocket.cs

@@ -435,6 +435,14 @@ private void ApplyConnectionHandlers()
                 }
             });
 
+            Connection.On("ToggleWebRtcVideo", (bool toggleOn, string viewerID) =>
+            {
+                if (conductor.Viewers.TryGetValue(viewerID, out var viewer))
+                {
+                    viewer.ToggleWebRtcVideo(toggleOn);
+                }
+            });
+
             Connection.On("TouchDown", (string viewerID) =>
             {
                 if (conductor.Viewers.TryGetValue(viewerID, out var viewer) && viewer.HasControl)

Desktop.Core/Services/RtcMessageHandler.cs

@@ -111,6 +111,9 @@ public async Task ParseMessage(byte[] message)
                     case BinaryDtoType.ToggleBlockInput:
                         ToggleBlockInput(message);
                         break;
+                    case BinaryDtoType.ToggleWebRtcVideo:
+                        ToggleWebRtcVideo(message);
+                        break;
                     case BinaryDtoType.ClipboardTransfer:
                         ClipboardTransfer(message);
                         break;
@@ -180,6 +183,7 @@ private void HandleFrameReceived()
                 }
             }
         }
+
         private void KeyDown(byte[] message)
         {
             var dto = MessagePackSerializer.Deserialize<KeyDownDto>(message);
@@ -260,6 +264,7 @@ private void SetKeyStatesUp()
         {
             KeyboardMouseInput.SetKeyStatesUp();
         }
+
         private void Tap(byte[] message)
         {
             var dto = MessagePackSerializer.Deserialize<TapDto>(message);
@@ -278,5 +283,11 @@ private void ToggleBlockInput(byte[] message)
             var dto = MessagePackSerializer.Deserialize<ToggleBlockInputDto>(message);
             KeyboardMouseInput.ToggleBlockInput(dto.ToggleOn);
         }
+
+        private void ToggleWebRtcVideo(byte[] message)
+        {
+            var dto = MessagePackSerializer.Deserialize<ToggleWebRtcVideoDto>(message);
+            Viewer.ToggleWebRtcVideo(dto.ToggleOn);
+        }
     }
 }

Desktop.Core/Services/WebRtcSession.cs

@@ -28,14 +28,6 @@ public WebRtcSession(Viewer viewer, IRtcMessageHandler rtcMessageHandler)
         public ulong CurrentBuffer { get; private set; }
         public bool IsDataChannelOpen => CaptureChannel?.State == DataChannel.ChannelState.Open;
         public bool IsPeerConnected => PeerSession?.IsConnected == true;
-        private DataChannel CaptureChannel { get; set; }
-        private IceServerModel[] IceServers { get; set; }
-        private PeerConnection PeerSession { get; set; }
-        private IRtcMessageHandler RtcMessageHandler { get; }
-        private Transceiver Transceiver { get; set; }
-        private ExternalVideoTrackSource VideoSource { get; set; }
-        private Viewer Viewer { get; }
-
         public bool IsVideoTrackConnected
         {
             get
@@ -44,6 +36,13 @@ public bool IsVideoTrackConnected
             }
         }
 
+        private DataChannel CaptureChannel { get; set; }
+        private IceServerModel[] IceServers { get; set; }
+        private PeerConnection PeerSession { get; set; }
+        private IRtcMessageHandler RtcMessageHandler { get; }
+        private Transceiver Transceiver { get; set; }
+        private ExternalVideoTrackSource VideoSource { get; set; }
+        private Viewer Viewer { get; }
         public void AddIceCandidate(string sdpMid, int sdpMlineIndex, string candidate)
         {
             PeerSession.AddIceCandidate(new IceCandidate()
@@ -106,10 +105,6 @@ public async Task Init(IceServerModel[] iceServers)
 
             VideoSource = ExternalVideoTrackSource.CreateFromArgb32Callback(GetCaptureFrame);
             Transceiver = PeerSession.AddTransceiver(MediaKind.Video);
-            Transceiver.LocalVideoTrack = LocalVideoTrack.CreateFromSource(VideoSource, new LocalVideoTrackInitConfig()
-            {
-                trackName = "ScreenCapture"
-            });
 
             PeerSession.CreateOffer();
         }
@@ -195,12 +190,28 @@ await PeerSession.SetRemoteDescriptionAsync(new SdpMessage()
             }
         }
 
+        public void ToggleWebRtcVideo(bool toggleOn)
+        {
+            if (Transceiver?.LocalVideoTrack != null)
+            {
+                Transceiver.LocalVideoTrack.Dispose();
+                Transceiver.LocalVideoTrack = null;
+            }
+
+            if (toggleOn)
+            {
+                Transceiver.LocalVideoTrack = LocalVideoTrack.CreateFromSource(VideoSource, new LocalVideoTrackInitConfig()
+                {
+                    trackName = "ScreenCapture"
+                });
+            }
+        }
+
         private async void CaptureChannel_MessageReceived(byte[] obj)
         {
             Logger.Debug($"DataChannel message received.  Size: {obj.Length}");
             await RtcMessageHandler.ParseMessage(obj);
         }
-
         private async void CaptureChannel_StateChanged()
         {
             Logger.Debug($"DataChannel state changed.  New State: {CaptureChannel.State}");

Server/Hubs/RCBrowserHub.cs

@@ -302,6 +302,11 @@ public Task SendToggleBlockInput(bool toggleOn)
         {
             return CasterHubContext.Clients.Client(ScreenCasterID).SendAsync("ToggleBlockInput", toggleOn, Context.ConnectionId);
         }
+        public Task SendToggleWebRtcVideo(bool toggleOn)
+        {
+            return CasterHubContext.Clients.Client(ScreenCasterID).SendAsync("ToggleWebRtcVideo", toggleOn, Context.ConnectionId);
+        }
+
         public Task Tap(double percentX, double percentY)
         {
             return CasterHubContext.Clients.Client(ScreenCasterID).SendAsync("Tap", percentX, percentY, Context.ConnectionId);

Server/Pages/RemoteControl.cshtml

@@ -94,14 +94,35 @@
         </div>
 
         <div>
-            <button id="clipboardTransferButton" class="option-button">Clipboard  <i class="fas fa-clipboard"></i></button>
-            <button id="blockInputButton" class="option-button">Block Remote Input <i class="fas fa-mouse"></i></button>
+            <button id="clipboardTransferButton" class="option-button" title="Type the current clipboard text on the remote computer.">
+                Clipboard  <i class="fas fa-clipboard"></i>
+            </button>
+
+            <button id="blockInputButton" class="option-button" title="Prevent remote user from using keyboard and mouse.">
+                Block Remote Input <i class="fas fa-mouse"></i>
+            </button>
+
             <button id="inviteButton" class="option-button">Invite Others  <i class="fas fa-user-plus"></i></button>
-            <button id="audioButton" class="option-button">Audio <i class="fas fa-volume-up"></i></button>
-            <button id="fileTransferButton" class="option-button">File Transfer  <i class="fas fa-file-upload"></i></button>
-            <button id="ctrlAltDelButton" class="option-button">Ctrl+Alt+Del <i class="fas fa-sign-in-alt"></i></button>
-            <button id="keyboardButton" hidden="hidden" class="option-button">Keyboard  <i class="fas fa-keyboard"></i></button>
-            <button id="disconnectButton" class="option-button">Disconnect <i class="fas fa-window-close"></i></button>
+
+            <button id="audioButton" class="option-button" title="Windows only.  Stream the remote audio to the browser.">
+                Audio <i class="fas fa-volume-up"></i>
+            </button>
+
+            <button id="fileTransferButton" class="option-button" title="Transfer files to the remote computer.">
+                File Transfer  <i class="fas fa-file-upload"></i>
+            </button>
+
+            <button id="ctrlAltDelButton" class="option-button" title="Simulate the Ctrl+Alt+Del command on the remote computer.">
+                Ctrl+Alt+Del <i class="fas fa-sign-in-alt"></i>
+            </button>
+
+            <button id="keyboardButton" hidden="hidden" class="option-button" title="Invoke the mobile touch keyboard.">
+                Keyboard  <i class="fas fa-keyboard"></i>
+            </button>
+
+            <button id="disconnectButton" class="option-button" title="Disconnect from the current session.">
+                Disconnect <i class="fas fa-window-close"></i>
+            </button>
         </div>
 
 
@@ -110,9 +131,21 @@
         </div>
 
         <div>
-            <button id="changeScreenButton" class="option-button">Monitors <i class="fas fa-desktop"></i></button>
-            <button id="fitToScreenButton" class="toggled option-button">Fit <i class="fas fa-expand"></i></button>
-            <button id="qualityButton" class="option-button">Quality <i class="far fa-image"></i></button>
+            <button id="streamVideoButton" class="option-button" hidden title="Reduce bandwidth and increase FPS, but increase input delay.">
+                Stream Mode <i class="fas fa-video"></i>
+            </button>
+
+            <button id="changeScreenButton" class="option-button" title="Switch monitors on remote multi-monitor setups.">
+                Monitors <i class="fas fa-desktop"></i>
+            </button>
+
+            <button id="fitToScreenButton" class="toggled option-button" title="If toggled, will resize image to fit in the window.">
+                Fit <i class="fas fa-expand"></i>
+            </button>
+
+            <button id="qualityButton" class="option-button" title="Adjust the image quality when not in Stream Mode.">
+                Quality <i class="far fa-image"></i>
+            </button>
         </div>
 
 
@@ -121,15 +154,21 @@
         </div>
 
         <div>
-            <button id="recordSessionButton" class="option-button">Start <i class="fas fa-record-vinyl"></i></button>
-            <button id="downloadRecordingButton" class="option-button">Download <i class="fas fa-download"></i></button>
+            <button id="recordSessionButton" class="option-button" title="Record session as a WEBM video in the browser.">
+                Start <i class="fas fa-record-vinyl"></i>
+            </button>
+
+            <button id="downloadRecordingButton" class="option-button" title="Download the recorded session as a WEBM file.">
+                Download <i class="fas fa-download"></i>
+            </button>
         </div>
 
         <div class="menu-options-header">
             Windows Session
         </div>
         <div>
             <select id="windowsSessionSelect"
+                    title="Switch to a different Windows session."
                     class="option-button"
                     style="height: 30px; width: 90%; margin: 5px 0;"></select>
         </div>

Server/wwwroot/scripts/Enums/BinaryDtoType.ts

@@ -24,5 +24,6 @@
     File = 22,
     WindowsSessions = 23,
     SetKeyStatesUp = 24,
-    FrameReceived = 25
+    FrameReceived = 25,
+    ToggleWebRtcVideo = 26
 }