From df969325795a9f155d8f1739977e2b6ccc64eca3 Mon Sep 17 00:00:00 2001
From: Jared <translucency@outlook.com>
Date: Fri, 19 Mar 2021 06:03:59 -0700
Subject: [PATCH] Track of refresh is needed.

---
 Desktop.Core/Services/ScreenCaster.cs | 14 +++++++++-----
 Tests/ManualTests.cs                  | 12 ++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Desktop.Core/Services/ScreenCaster.cs b/Desktop.Core/Services/ScreenCaster.cs
index 58fb349a..4088f4d1 100644
--- a/Desktop.Core/Services/ScreenCaster.cs
+++ b/Desktop.Core/Services/ScreenCaster.cs
@@ -45,7 +45,8 @@ namespace Remotely.Desktop.Core.Services
             try
             {
                 var sendFramesLock = new SemaphoreSlim(1, 1);
-                var lastFullscreen = DateTimeOffset.Now;
+                var refreshTimer = Stopwatch.StartNew();
+                var refreshNeeded = false;
                 var currentQuality = _maxQuality;
                 Bitmap currentFrame = null;
                 Bitmap previousFrame = null;
@@ -144,7 +145,7 @@ namespace Remotely.Desktop.Core.Services
                             continue;
                         }
 
-                        if (DateTimeOffset.Now - lastFullscreen > TimeSpan.FromSeconds(3))
+                        if (refreshNeeded && refreshTimer.Elapsed.TotalSeconds > 3)
                         {
                             viewer.Capturer.CaptureFullscreen = true;
                         }
@@ -165,17 +166,20 @@ namespace Remotely.Desktop.Core.Services
                         if (viewer.Capturer.CaptureFullscreen)
                         {
                             currentQuality = _maxQuality;
-                            lastFullscreen = DateTimeOffset.Now;
+                            refreshTimer.Restart();
+                            refreshNeeded = false;
                         }
 
-                        if (viewer.PendingSentFrames.Any())
+                        if (viewer.PendingSentFrames.Count > 1)
                         {
-                            currentQuality = Math.Min(_minQuality, currentQuality - viewer.PendingSentFrames.Count);
+                            refreshNeeded = true;
+                            currentQuality = Math.Max(_minQuality, currentQuality - viewer.PendingSentFrames.Count);
                         }
 
                         if (viewer.PendingSentFrames.TryPeek(out var oldestFrame) &&
                             DateTimeOffset.Now - oldestFrame > TimeSpan.FromMilliseconds(100))
                         {
+                            refreshNeeded = true;
                             currentQuality = Math.Max(_minQuality, currentQuality - 10);
                         }
                         else
diff --git a/Tests/ManualTests.cs b/Tests/ManualTests.cs
index 254230e3..28576013 100644
--- a/Tests/ManualTests.cs
+++ b/Tests/ManualTests.cs
@@ -68,6 +68,18 @@ namespace Remotely.Tests
             _viewer.Dispose();
         }
 
+        [TestMethod]
+        [Ignore("Manual test.")]
+        public async Task EncodingSizeTests()
+        {
+            await Task.Delay(5000);
+            var screen = _capturer.GetNextFrame();
+            var a = ImageUtils.EncodeWithSkia(screen, SkiaSharp.SKEncodedImageFormat.Jpeg, 70);
+            Debug.WriteLine("JPEG Size: " + a.Length.ToString("N0"));
+            var b = ImageUtils.EncodeWithSkia(screen, SkiaSharp.SKEncodedImageFormat.Webp, 70);
+            Debug.WriteLine("WEBP Size: " + b.Length.ToString("N0"));
+        }
+
         [TestMethod]
         [Ignore("Manual test.")]
         public void EncodingTests()