From c362a93a3688cd13b8befc11ca1a75a59d8172cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Jan 2024 02:18:20 +0900
Subject: [PATCH 1/2] Change frame stable catch-up method to allow for much
 faster sync

---
 .../Gameplay/TestSceneFrameStabilityContainer.cs       |  4 +---
 .../Visual/Gameplay/TestSceneSongProgress.cs           |  5 +----
 osu.Game/Rulesets/UI/FrameStabilityContainer.cs        | 10 ++++++----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFrameStabilityContainer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFrameStabilityContainer.cs
index 534348bed3..98a97e1d23 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFrameStabilityContainer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFrameStabilityContainer.cs
@@ -129,10 +129,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             checkRate(1);
         }
 
-        private const int max_frames_catchup = 50;
-
         private void createStabilityContainer(double gameplayStartTime = double.MinValue) => AddStep("create container", () =>
-            mainContainer.Child = new FrameStabilityContainer(gameplayStartTime) { MaxCatchUpFrames = max_frames_catchup }
+            mainContainer.Child = new FrameStabilityContainer(gameplayStartTime)
                 .WithChild(consumer = new ClockConsumingChild()));
 
         private void seekManualTo(double time) => AddStep($"seek manual clock to {time}", () => manualClock.CurrentTime = time);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index e975a85401..19bb5cdde1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -45,10 +45,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 },
                 gameplayClockContainer = new MasterGameplayClockContainer(Beatmap.Value, skip_target_time)
                 {
-                    Child = frameStabilityContainer = new FrameStabilityContainer
-                    {
-                        MaxCatchUpFrames = 1
-                    }
+                    Child = frameStabilityContainer = new FrameStabilityContainer()
                 }
             });
 
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index 2af9916a6b..c07bd3aef5 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -25,9 +25,9 @@ namespace osu.Game.Rulesets.UI
         public ReplayInputHandler? ReplayInputHandler { get; set; }
 
         /// <summary>
-        /// The number of frames (per parent frame) which can be run in an attempt to catch-up to real-time.
+        /// The number of CPU milliseconds to spend at most during seek catch-up.
         /// </summary>
-        public int MaxCatchUpFrames { get; set; } = 5;
+        private const double max_catchup_milliseconds = 10;
 
         /// <summary>
         /// Whether to enable frame-stable playback.
@@ -61,6 +61,8 @@ namespace osu.Game.Rulesets.UI
         /// </summary>
         private readonly FramedClock framedClock;
 
+        private readonly Stopwatch stopwatch = new Stopwatch();
+
         /// <summary>
         /// The current direction of playback to be exposed to frame stable children.
         /// </summary>
@@ -99,7 +101,7 @@ namespace osu.Game.Rulesets.UI
 
         public override bool UpdateSubTree()
         {
-            int loops = MaxCatchUpFrames;
+            stopwatch.Restart();
 
             do
             {
@@ -112,7 +114,7 @@ namespace osu.Game.Rulesets.UI
 
                 base.UpdateSubTree();
                 UpdateSubTreeMasking(this, ScreenSpaceDrawQuad.AABBFloat);
-            } while (state == PlaybackState.RequiresCatchUp && loops-- > 0);
+            } while (state == PlaybackState.RequiresCatchUp && stopwatch.ElapsedMilliseconds < max_catchup_milliseconds);
 
             return true;
         }

From fb4efd992de542ae5ad57ce192d9626de692e8ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Jan 2024 11:52:28 +0900
Subject: [PATCH 2/2] Add a fake load to visual test to restore previous
 testing behaviour

---
 .../Visual/Gameplay/TestSceneSongProgress.cs      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index 19bb5cdde1..99f0ffb9d0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using System.Threading;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -45,7 +46,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                 },
                 gameplayClockContainer = new MasterGameplayClockContainer(Beatmap.Value, skip_target_time)
                 {
-                    Child = frameStabilityContainer = new FrameStabilityContainer()
+                    Child = frameStabilityContainer = new FrameStabilityContainer
+                    {
+                        Child = new FakeLoad()
+                    }
                 }
             });
 
@@ -53,6 +57,15 @@ namespace osu.Game.Tests.Visual.Gameplay
             Dependencies.CacheAs<IFrameStableClock>(frameStabilityContainer);
         }
 
+        private partial class FakeLoad : Drawable
+        {
+            protected override void Update()
+            {
+                base.Update();
+                Thread.Sleep(1);
+            }
+        }
+
         [SetUpSteps]
         public void SetupSteps()
         {