Merge pull request #143 from winnerspiros/fix/android-gameplay-regressions-and-optimizations-10080506137969536493

Revert gameplay regressions and optimize Android threading

Author: winnerspiros

osu.Android/AndroidNativeBridgeManager.cs

@@ -17,6 +17,8 @@ internal sealed class AndroidNativeBridgeManager : IDisposable
         private object? oboeBridge;
         private object? vulkanProbe;
         private volatile bool disposed;
+        private string? cachedOboeStatus;
+        private string? cachedVulkanStatus;
 
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void StartOboeBridge(Scheduler scheduler, Action<double> onLatencyMeasured, IntPtr provider, int sampleRate = 0, Action<int>? onStarted = null)

osu.Android/Native/OboeAudioBridge.cs

@@ -1,3 +1,4 @@
+using System.Runtime.CompilerServices;
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
@@ -79,8 +80,9 @@ public double GetOutputLatencyMs()
             catch { return -1; }
         }
 
-        public bool IsActive
+                public bool IsActive
         {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
             {
                 if (disposed || nativePtr == IntPtr.Zero) return false;
@@ -119,8 +121,9 @@ public int BufferSizeInFrames
             }
         }
 
-        public bool IsAAudio
+                public bool IsAAudio
         {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
             {
                 if (disposed || nativePtr == IntPtr.Zero) return false;
@@ -129,8 +132,9 @@ public bool IsAAudio
             }
         }
 
-        public bool IsMMap
+                public bool IsMMap
         {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
             {
                 if (disposed || nativePtr == IntPtr.Zero) return false;
@@ -174,5 +178,9 @@ public void Dispose()
         [DllImport(lib_name)] private static extern byte nOboeIsMMap(IntPtr ptr);
         [DllImport(lib_name)] private static extern void nOboeSetProvider(IntPtr ptr, IntPtr provider);
         [DllImport(lib_name)] internal static extern byte nSetThreadAffinity(int coreMask);
+        [DllImport(lib_name)] internal static extern IntPtr nADPFCreateSession(long targetDurationNanos);
+        [DllImport(lib_name)] internal static extern void nADPFReportActualDuration(IntPtr sessionPtr, long actualDurationNanos);
+        [DllImport(lib_name)] internal static extern void nADPFUpdateTargetDuration(IntPtr sessionPtr, long targetDurationNanos);
+        [DllImport(lib_name)] internal static extern void nADPFCloseSession(IntPtr sessionPtr);
     }
 }

osu.Android/Native/oboe_bridge.cpp

@@ -55,28 +55,17 @@ bool OboeBridge::open(int32_t sampleRate) {
            ->setFormatConversionAllowed(false)
            ->setCallback(stabilizedCallback_.get());
 
-    LOGI("Oboe stream: attempting open in Exclusive mode with AAudio (sampleRate=%d)", sampleRate);
     oboe::Result result = builder.openStream(stream_);
 
     if (result != oboe::Result::OK) {
-        LOGE("Failed to open Oboe stream in Exclusive mode (%s), falling back to Shared mode", oboe::convertToText(result));
-        builder.setSharingMode(oboe::SharingMode::Shared);
-        // If falling back to Shared, allow conversion to be more resilient
-        builder.setChannelConversionAllowed(true)
-               ->setFormatConversionAllowed(true)
-               ->setSampleRateConversionQuality(oboe::SampleRateConversionQuality::Medium);
-        result = builder.openStream(stream_);
-    }
-
-    if (result != oboe::Result::OK) {
-        LOGE("Failed to open Oboe stream with AAudio API (%s), falling back to Unspecified API",
+        LOGE("AAudio open failed (%s), falling back to unspecified API",
              oboe::convertToText(result));
         builder.setAudioApi(oboe::AudioApi::Unspecified);
         result = builder.openStream(stream_);
     }
 
     if (result != oboe::Result::OK) {
-        LOGE("Failed to open Oboe stream with any configuration: %s", oboe::convertToText(result));
+        LOGE("Failed to open Oboe stream: %s", oboe::convertToText(result));
         return false;
     }
 
@@ -183,6 +172,7 @@ void OboeBridge::setProvider(OboeAudioProvider provider) {
 oboe::DataCallbackResult OboeBridge::onAudioReady(
     oboe::AudioStream* stream, void* audioData, int32_t numFrames) {
 
+
     OboeAudioProvider provider = provider_.load(std::memory_order_acquire);
 
     if (provider) {
@@ -200,6 +190,7 @@ oboe::DataCallbackResult OboeBridge::onAudioReady(
         memset(audioData, 0, byteCount);
     }
 
+
     uint32_t count = callbackCount_.fetch_add(1, std::memory_order_relaxed);
 
     if ((count & 127) == 0) {
@@ -396,3 +387,33 @@ OSU_EXPORT byte nSetThreadAffinity(int coreMask) {
     return (sched_setaffinity(0, sizeof(cpu_set_t), &cpuset) == 0) ? 1 : 0;
 }
 }
+
+#include <android/performance_hint.h>
+
+extern "C" {
+OSU_EXPORT intptr_t nADPFCreateSession(int64_t targetDurationNanos) {
+    auto manager = APerformanceHint_getManager();
+    if (!manager) return 0;
+
+    int32_t thread_id = gettid();
+    return reinterpret_cast<intptr_t>(APerformanceHint_createSession(manager, &thread_id, 1, targetDurationNanos));
+}
+
+OSU_EXPORT void nADPFReportActualDuration(intptr_t sessionPtr, int64_t actualDurationNanos) {
+    if (sessionPtr) {
+        APerformanceHint_reportActualWorkDuration(reinterpret_cast<APerformanceHintSession*>(sessionPtr), actualDurationNanos);
+    }
+}
+
+OSU_EXPORT void nADPFUpdateTargetDuration(intptr_t sessionPtr, int64_t targetDurationNanos) {
+    if (sessionPtr) {
+        APerformanceHint_updateTargetWorkDuration(reinterpret_cast<APerformanceHintSession*>(sessionPtr), targetDurationNanos);
+    }
+}
+
+OSU_EXPORT void nADPFCloseSession(intptr_t sessionPtr) {
+    if (sessionPtr) {
+        APerformanceHint_closeSession(reinterpret_cast<APerformanceHintSession*>(sessionPtr));
+    }
+}
+}

osu.Android/OsuGameAndroid.cs

@@ -189,12 +189,12 @@ protected override void LoadComplete()
                     // Dispatch to the draw thread to pin it.
                     Host.DrawThread.Scheduler.Add(() =>
                     {
-                        try
-                        {
-                            if (OboeAudioBridge.nSetThreadAffinity(0xF8) != 0)
-                                Debug.WriteLine("[osu!] Render thread pinned to big cores");
-                        }
-                        catch { }
+                        try { if (OboeAudioBridge.nSetThreadAffinity(0xF8) != 0) Debug.WriteLine("[osu!] Render thread pinned to big cores"); } catch { }
+                    });
+
+                    Host.InputThread.Scheduler.Add(() =>
+                    {
+                        try { if (OboeAudioBridge.nSetThreadAffinity(0xF8) != 0) Debug.WriteLine("[osu!] Input thread pinned to big cores"); } catch { }
                     });
                 });
             }

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs

@@ -3,15 +3,12 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework;
-
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
-
-using osuTK.Graphics;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -81,18 +78,9 @@ protected override void ApplyHitAnimations()
 
             if (hitLightingEnabled)
             {
-                if (RuntimeInfo.OS == RuntimeInfo.Platform.Android)
-                {
-                    // Simplified animation for Android to reduce render load
-                    Lighting.ScaleTo(1.0f).ScaleTo(1.1f, 400, Easing.Out);
-                    Lighting.FadeIn(150).Then().Delay(100).FadeOut(600);
-                }
-                else
-                {
-                    // todo: this animation changes slightly based on new/old legacy skin versions.
-                    Lighting.ScaleTo(0.8f).ScaleTo(1.2f, 600, Easing.Out);
-                    Lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
-                }
+                // todo: this animation changes slightly based on new/old legacy skin versions.
+                Lighting.ScaleTo(0.8f).ScaleTo(1.2f, 600, Easing.Out);
+                Lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
 
                 // extend the lifetime to cover lighting fade
                 LifetimeEnd = Lighting.LatestTransformEndTime;
@@ -125,4 +113,4 @@ public override void PlayAnimation()
             }
         }
     }
-}
+}

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs

@@ -3,26 +3,24 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System;
-
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Layout;
-
+using osu.Game.Audio;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
-
-using JetBrains.Annotations;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
@@ -166,8 +164,8 @@ protected override void LoadSamples()
         {
             // Note: base.LoadSamples() isn't called since the slider plays the tail's hitsounds for the time being.
 
-            Samples.Samples = HitObject.TailSamples.ToArray();
-            slidingSample.Samples = HitObject.CreateSlidingSamples().ToArray();
+            Samples.Samples = HitObject.TailSamples.Cast<ISampleInfo>().ToArray();
+            slidingSample.Samples = HitObject.CreateSlidingSamples().Cast<ISampleInfo>().ToArray();
         }
 
         public override void StopAllSamples()
@@ -303,13 +301,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                 ApplyResult(static (r, hitObject) =>
                 {
                     int totalTicks = hitObject.NestedHitObjects.Count;
-                    int hitTicks = 0;
-
-                    foreach (var nested in hitObject.NestedHitObjects)
-                    {
-                        if (nested.IsHit)
-                            hitTicks++;
-                    }
+                    int hitTicks = hitObject.NestedHitObjects.Count(h => h.IsHit);
 
                     if (hitTicks == totalTicks)
                         r.Type = HitResult.Great;
@@ -328,18 +320,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                 // But the slider needs to still be judged with a reasonable hit/miss result for visual purposes (hit/miss transforms, etc).
                 ApplyResult(static (r, hitObject) =>
                 {
-                    bool anyHit = false;
-
-                    foreach (var nested in hitObject.NestedHitObjects)
-                    {
-                        if (nested.Result.IsHit)
-                        {
-                            anyHit = true;
-                            break;
-                        }
-                    }
-
-                    r.Type = anyHit ? r.Judgement.MaxResult : r.Judgement.MinResult;
+                    r.Type = hitObject.NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult;
                 });
             }
         }
@@ -429,4 +410,4 @@ internal void RestoreHitAnimations()
 
         #endregion
     }
-}
+}

osu.Game.Rulesets.Osu/Skinning/SnakingSliderBody.cs

@@ -1,19 +1,15 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using System;
-
+using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework;
-
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
-
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Skinning
@@ -23,7 +19,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
     /// </summary>
     public abstract partial class SnakingSliderBody : SliderBody, ISliderProgress
     {
-        private double lastUpdateTime;
         public readonly List<Vector2> CurrentCurve = new List<Vector2>();
 
         public readonly Bindable<bool> SnakingIn = new Bindable<bool>();
@@ -151,23 +146,6 @@ private void setRange(double p0, double p1)
                 (p0, p1) = (p1, p0);
 
             if (SnakedStart == p0 && SnakedEnd == p1) return;
-#if DEBUG
-            const bool is_debug = true;
-#else
-            const bool is_debug = false;
-#endif
-
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.Android && !is_debug)
-            {
-                // Throttle updates on Android to save CPU/GPU cycles during snaking.
-                // We only update every 2nd frame if the progress delta is small.
-                if (lastUpdateTime > 0 && Clock.CurrentTime - lastUpdateTime < 16)
-                {
-                    double delta = Math.Max(Math.Abs(p0 - (SnakedStart ?? 0)), Math.Abs(p1 - (SnakedEnd ?? 0)));
-                    if (delta < 0.0001) return;
-                }
-                lastUpdateTime = Clock.CurrentTime;
-            }
 
             SnakedStart = p0;
             SnakedEnd = p1;
@@ -184,4 +162,4 @@ private void setRange(double p0, double p1)
             Path.Position = snakedPosition - Path.PositionInBoundingBox(Vector2.Zero);
         }
     }
-}
+}