Re-implement auto quality toggle.

immense · May 8, 2021 · a606372 · a606372
1 parent 85c4fad
commit a606372
Show file tree

Hide file tree

Showing 34 changed files with 129 additions and 45 deletions.
diff --git a/Desktop.Core/Services/DtoMessageHandler.cs b/Desktop.Core/Services/DtoMessageHandler.cs
@@ -91,6 +91,9 @@ public async Task ParseMessage(Viewer viewer, byte[] message)
                     case BaseDtoType.CtrlAltDel:
                         await viewer.SendCtrlAltDel();
                         break;
+                    case BaseDtoType.ToggleAutoQuality:
+                        ToggleAutoQuality(message, viewer);
+                        break;
                     case BaseDtoType.ToggleAudio:
                         ToggleAudio(message);
                         break;
@@ -261,6 +264,11 @@ private void ToggleAudio(byte[] message)
             var dto = MessagePackSerializer.Deserialize<ToggleAudioDto>(message);
             AudioCapturer.ToggleAudio(dto.ToggleOn);
         }
+        private void ToggleAutoQuality(byte[] message, Viewer viewer)
+        {
+            var dto = MessagePackSerializer.Deserialize<ToggleAutoQualityDto>(message);
+            viewer.AutoQuality = dto.ToggleOn;
+        }
 
         private void ToggleBlockInput(byte[] message)
         {

diff --git a/Desktop.Core/Services/ScreenCaster.cs b/Desktop.Core/Services/ScreenCaster.cs
@@ -149,8 +149,7 @@ await viewer.SendScreenCapture(new CaptureFrame()
                             continue;
                         }
 
-                        if (refreshTimer.Elapsed.TotalSeconds > 10 ||
-                            refreshNeeded && refreshTimer.Elapsed.TotalSeconds > 5)
+                        if (refreshNeeded && refreshTimer.Elapsed.TotalSeconds > 5)
                         {
                             viewer.Capturer.CaptureFullscreen = true;
                         }
@@ -179,12 +178,16 @@ await viewer.SendScreenCapture(new CaptureFrame()
                         }
                         else
                         {
-                            if (viewer.AverageBytesPerSecond > 0)
+                            if (!viewer.AutoQuality)
+                            {
+                                currentQuality = _maxQuality;
+                            }
+                            else if (viewer.AverageBytesPerSecond > 0)
                             {
                                 var expectedSize = diffArea.Height * diffArea.Width * 4 * .1;
                                 var timeToSend = expectedSize / viewer.AverageBytesPerSecond;
                                 currentQuality = Math.Max(_minQuality, Math.Min(_maxQuality, (int)(.1 / timeToSend * _maxQuality)));
-                                if (currentQuality < _maxQuality - 10)
+                                if (currentQuality < _maxQuality - 5)
                                 {
                                     refreshNeeded = true;
                                     Debug.WriteLine($"Quality Reduced: {currentQuality}");

diff --git a/Desktop.Core/Services/Viewer.cs b/Desktop.Core/Services/Viewer.cs
@@ -42,6 +42,7 @@ public Viewer(ICasterSocket casterSocket,
         public bool DisconnectRequested { get; set; }
         public EncoderParameters EncoderParams { get; private set; }
         public bool HasControl { get; set; } = true;
+        public bool AutoQuality { get; set; } = true;
         public bool IsConnected => CasterSocket.IsConnected;
 
         public bool IsStalled
@@ -78,6 +79,7 @@ public bool IsUsingWebRtcVideo
         public string ViewerConnectionID { get; set; }
         private IAudioCapturer AudioCapturer { get; }
 
+
         private ICasterSocket CasterSocket { get; }
 
         private IClipboardService ClipboardService { get; }

diff --git a/Server/Pages/RemoteControl.cshtml b/Server/Pages/RemoteControl.cshtml
@@ -134,6 +134,10 @@
         </div>
 
         <div>
+            <button id="autoQualityButton" class="toggled option-button" title="Automatically reduce image quality on slower connections.">
+                Auto Quality <i class="fas 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>

diff --git a/Server/wwwroot/src/RemoteControl/App.js b/Server/wwwroot/src/RemoteControl/App.js
diff --git a/Server/wwwroot/src/RemoteControl/App.js.map b/Server/wwwroot/src/RemoteControl/App.js.map
diff --git a/Server/wwwroot/src/RemoteControl/App.ts b/Server/wwwroot/src/RemoteControl/App.ts
@@ -37,6 +37,8 @@ export const ViewerApp = {
 
         ApplyInputHandlers();
 
+        UI.UpdateAutoQualityToggled(ViewerApp.Settings.autoQuality);
+
         if (UI.RequesterNameInput.value) {
             ViewerApp.RequesterName = UI.RequesterNameInput.value;
         }

diff --git a/Server/wwwroot/src/RemoteControl/DtoMessageHandler.js b/Server/wwwroot/src/RemoteControl/DtoMessageHandler.js
diff --git a/Server/wwwroot/src/RemoteControl/DtoMessageHandler.js.map b/Server/wwwroot/src/RemoteControl/DtoMessageHandler.js.map
diff --git a/Server/wwwroot/src/RemoteControl/DtoMessageHandler.ts b/Server/wwwroot/src/RemoteControl/DtoMessageHandler.ts
@@ -114,6 +114,7 @@ export class DtoMessageHandler {
     }
     HandleScreenData(screenDataDto: ScreenDataDto) {
         UI.UpdateDisplays(screenDataDto.SelectedScreen, screenDataDto.DisplayNames);
+        ViewerApp.MessageSender.SendToggleAutoQuality(ViewerApp.Settings.autoQuality);
     }
 
     HandleScreenSize(screenSizeDto: ScreenSizeDto) {

diff --git a/Server/wwwroot/src/RemoteControl/Enums/BaseDtoType.js b/Server/wwwroot/src/RemoteControl/Enums/BaseDtoType.js
diff --git a/Server/wwwroot/src/RemoteControl/Enums/BaseDtoType.js.map b/Server/wwwroot/src/RemoteControl/Enums/BaseDtoType.js.map
diff --git a/Server/wwwroot/src/RemoteControl/Enums/BaseDtoType.ts b/Server/wwwroot/src/RemoteControl/Enums/BaseDtoType.ts
@@ -15,6 +15,7 @@
     KeyDown = 13,
     KeyUp = 14,
     CtrlAltDel = 15,
+    ToggleAutoQuality = 16,
     ToggleAudio = 17,
     ToggleBlockInput = 18,
     ClipboardTransfer = 19,