Auto quality tweaks.

immense · Apr 6, 2020 · 28d2d15 · 28d2d15
1 parent b5810fd
commit 28d2d15
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 21 deletions.
diff --git a/ScreenCast.Core/Models/Viewer.cs b/ScreenCast.Core/Models/Viewer.cs
@@ -12,11 +12,10 @@ namespace Remotely.ScreenCast.Core.Models
 {
     public class Viewer : IDisposable
     {
-        private long imageQuality;
+        private int imageQuality;
 
         public Viewer()
         {
-            EncoderParams = new EncoderParameters();
             ImageQuality = 60;
         }
         public bool AutoAdjustQuality { get; internal set; } = true;
@@ -25,7 +24,7 @@ public Viewer()
         public EncoderParameters EncoderParams { get; private set; }
         public bool FullScreenRefreshNeeded { get; internal set; }
         public bool HasControl { get; set; }
-        public long ImageQuality
+        public int ImageQuality
         {
             get
             {
@@ -43,14 +42,19 @@ public long ImageQuality
                 }
                 imageQuality = value;
 
-                EncoderParams.Param[0] = new EncoderParameter(Encoder.Quality, value);
+                EncoderParams = new EncoderParameters()
+                {
+                    Param = new[]
+                    {
+                        new EncoderParameter(Encoder.Quality, value)
+                    }
+                };
             }
         }
         public string Name { get; set; }
-        public int WebSocketBuffer { get; set; }
         public WebRtcSession RtcSession { get; set; }
         public string ViewerConnectionID { get; set; }
-
+        public int WebSocketBuffer { get; set; }
         public void Dispose()
         {
             RtcSession?.Dispose();
@@ -61,6 +65,11 @@ public bool IsStalled()
             return RtcSession?.CurrentBuffer > 1_000_000 || WebSocketBuffer > 1_000_000;
         }
 
+        public bool IsUsingWebRtc()
+        {
+            return RtcSession?.IsPeerConnected == true && RtcSession?.IsDataChannelOpen == true;
+        }
+
         public async Task ThrottleIfNeeded()
         {
             var currentBuffer = IsUsingWebRtc() ? 
@@ -71,23 +80,18 @@ public async Task ThrottleIfNeeded()
             {
                 if (AutoAdjustQuality)
                 {
-                    ImageQuality -= 10;
+                    ImageQuality = Math.Max(ImageQuality - 1, 0);
                     Logger.Debug($"Auto-adjusting image quality.  Quality: {ImageQuality}");
                 }
 
                 var delay = (int)Math.Ceiling((currentBuffer - 100_000) * .0025);
                 Logger.Debug($"Throttling output due to buffer size.  Size: {currentBuffer}.  Delay: {delay}");
                 await Task.Delay(delay);
             }
-            else
+            else if (AutoAdjustQuality)
             {
-                ImageQuality = Math.Min(ImageQuality + 10, 60);
+                ImageQuality = Math.Min(ImageQuality + 1, 60);
             }
         }
-
-        public bool IsUsingWebRtc()
-        {
-            return RtcSession?.IsPeerConnected == true && RtcSession?.IsDataChannelOpen == true;
-        }
     }
 }
diff --git a/ScreenCast.Core/Services/ScreenCasterBase.cs b/ScreenCast.Core/Services/ScreenCasterBase.cs
@@ -122,8 +122,7 @@ await casterSocket.SendScreenData(
                             else
                             {
                                 await casterSocket.SendScreenCapture(encodedImageBytes, viewerID, diffArea.Left, diffArea.Top, diffArea.Width, diffArea.Height, viewer.ImageQuality);
-                                // Shave some off so it doesn't get deadlocked by dropped frames.
-                                viewer.WebSocketBuffer += (int)(encodedImageBytes.Length * .9);
+                                viewer.WebSocketBuffer += encodedImageBytes.Length;
                             }
                         }
                     }

diff --git a/ScreenCast.Core/Utilities/ImageUtils.cs b/ScreenCast.Core/Utilities/ImageUtils.cs
@@ -19,7 +19,6 @@ public static byte[] EncodeBitmap(Bitmap bitmap, EncoderParameters encoderParams
         {
             using (var ms = new MemoryStream())
             {
-                //bitmap.Save(ms, ImageFormat.Jpeg);
                 bitmap.Save(ms, JpegEncoder, encoderParams);
                 return ms.ToArray();
             }

diff --git a/Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js b/Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js
diff --git a/Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js.map b/Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js.map
diff --git a/Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.ts b/Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.ts
@@ -162,7 +162,8 @@ export class RCBrowserSockets {
             //console.log("Websocket frame received.");
             this.SendBufferUpdate(buffer.byteLength);
 
-            if (Number(UI.QualitySlider.value) != imageQuality) {
+            if (UI.AutoQualityAdjustCheckBox.checked &&
+                Number(UI.QualitySlider.value) != imageQuality) {
                 UI.QualitySlider.value = String(imageQuality);
             }
 

diff --git a/Server/wwwroot/scripts/RemoteControl/RtcSession.js b/Server/wwwroot/scripts/RemoteControl/RtcSession.js
diff --git a/Server/wwwroot/scripts/RemoteControl/RtcSession.js.map b/Server/wwwroot/scripts/RemoteControl/RtcSession.js.map
diff --git a/Server/wwwroot/scripts/RemoteControl/RtcSession.ts b/Server/wwwroot/scripts/RemoteControl/RtcSession.ts
@@ -76,6 +76,11 @@ export class RtcSession {
         }
     }
     ProcessFrameInfo(frameInfo: FrameInfo) {
+        if (UI.AutoQualityAdjustCheckBox.checked &&
+            Number(UI.QualitySlider.value) != frameInfo.ImageQuality) {
+            UI.QualitySlider.value = String(frameInfo.ImageQuality);
+        }
+
         if (frameInfo.EndOfFrame) {
             var url = window.URL.createObjectURL(new Blob(this.PartialFrames));
             var img = document.createElement("img");