From e686a6a1dddbe20c3c22dd1ec8cb572d7a9d8aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Jan 2024 09:17:01 +0100
Subject: [PATCH 1/2] Fix player submission test intermittent failures due to
 audio playback discrepancy logic kicking in

See https://github.com/ppy/osu/actions/runs/7384457927/job/20087439457#step:5:133.
---
 .../Visual/Gameplay/TestScenePlayerScoreSubmission.cs    | 6 ++++++
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs    | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs
index f75a2656ef..96cfcd61c3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerScoreSubmission.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Tests.Beatmaps;
 
@@ -359,6 +360,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                 AllowImportCompletion = new SemaphoreSlim(1);
             }
 
+            protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart) => new MasterGameplayClockContainer(beatmap, gameplayStart)
+            {
+                ShouldValidatePlaybackRate = false,
+            };
+
             protected override async Task ImportScore(Score score)
             {
                 ScoreImportStarted = true;
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index a475f4823f..0d60ec4713 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -40,6 +40,12 @@ namespace osu.Game.Screens.Play
             Precision = 0.1,
         };
 
+        /// <summary>
+        /// Whether the audio playback rate should be validated.
+        /// Mostly disabled for tests.
+        /// </summary>
+        internal bool ShouldValidatePlaybackRate { get; init; }
+
         /// <summary>
         /// Whether the audio playback is within acceptable ranges.
         /// Will become false if audio playback is not going as expected.
@@ -223,6 +229,9 @@ namespace osu.Game.Screens.Play
 
         private void checkPlaybackValidity()
         {
+            if (!ShouldValidatePlaybackRate)
+                return;
+
             if (GameplayClock.IsRunning)
             {
                 elapsedGameplayClockTime += GameplayClock.ElapsedFrameTime;

From 04147eb68988e4ce7f94f5d36def2c8669821508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Jan 2024 11:46:26 +0100
Subject: [PATCH 2/2] Fix lack of correct default value spec

---
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 0d60ec4713..8b8bf87436 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Play
         /// Whether the audio playback rate should be validated.
         /// Mostly disabled for tests.
         /// </summary>
-        internal bool ShouldValidatePlaybackRate { get; init; }
+        internal bool ShouldValidatePlaybackRate { get; init; } = true;
 
         /// <summary>
         /// Whether the audio playback is within acceptable ranges.