bump: framework 2026.504.1; wire GameThread.FrameCompleted for ADPF per-frame reporting

Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/e803b44b-0f6a-4b3c-8e9d-0174b32842a1

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>

Author: Copilot

osu.Android.props

@@ -99,7 +99,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2026.503.8" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2026.504.1" />
     <!-- `ppy.osu.Framework.NativeLibs` is a transitive dependency of `ppy.osu.Framework`
          that ships desktop-only natives (Linux/macOS/Windows) under `runtimes/<rid>/native/`
          — including a bare Linux `libbass.so`/`libbass_fx.so`/`libbassmix.so` for linux-arm64.

osu.Android/OsuGameAndroid.cs

@@ -170,6 +170,9 @@ public partial class OsuGameAndroid : OsuGame
         // their work within the display frame deadline (e.g. 8.33 ms at 120 Hz).
         // The sessions are created once after LoadComplete (when thread IDs are stable) and closed on
         // Dispose. Target duration is updated whenever the active display refresh rate changes.
+        // Per-frame actual-duration reporting is done via GameThread.FrameCompleted, which fires on
+        // the respective game thread at the end of every frame (after clock throttle), giving the
+        // CPU governor a signal to pre-boost the clock for the next frame.
         private IntPtr adpfDrawSession;
         private IntPtr adpfUpdateSession;
 
@@ -547,7 +550,13 @@ protected override void LoadComplete()
                                 long targetNs = currentRefreshRate > 0 ? 1_000_000_000L / currentRefreshRate : 8_333_333L;
                                 adpfDrawSession = OboeAudioBridge.nADPFCreateSession(targetNs);
                                 if (adpfDrawSession != IntPtr.Zero)
+                                {
                                     Logger.Log($"[osu!] ADPF session created for Draw thread (target={targetNs / 1_000_000.0:F2}ms)", LoggingTarget.Performance);
+                                    // Subscribe per-frame reporting now that the session handle is valid.
+                                    // FrameCompleted fires on the Draw thread itself, so reading
+                                    // Host.DrawThread.Clock.ElapsedFrameTime is thread-safe.
+                                    Host!.DrawThread!.FrameCompleted += onDrawFrameCompleted;
+                                }
                             }
                             catch { }
                         });
@@ -559,7 +568,10 @@ protected override void LoadComplete()
                                 long targetNs = currentRefreshRate > 0 ? 1_000_000_000L / currentRefreshRate : 8_333_333L;
                                 adpfUpdateSession = OboeAudioBridge.nADPFCreateSession(targetNs);
                                 if (adpfUpdateSession != IntPtr.Zero)
+                                {
                                     Logger.Log($"[osu!] ADPF session created for Update thread (target={targetNs / 1_000_000.0:F2}ms)", LoggingTarget.Performance);
+                                    Host!.UpdateThread!.FrameCompleted += onUpdateFrameCompleted;
+                                }
                             }
                             catch { }
                         });
@@ -1464,6 +1476,44 @@ private void updateAdpfTargetDuration(long targetNs)
             catch { }
         }
 
+        /// <summary>
+        /// Called by <see cref="osu.Framework.Threading.GameThread.FrameCompleted"/> on the Draw thread.
+        /// Reports the actual frame duration to the ADPF session so the CPU governor can adjust clock
+        /// frequency for the next frame. <see cref="osu.Framework.Threading.GameThread.Clock"/>
+        /// <c>ElapsedFrameTime</c> is in milliseconds; we convert to nanoseconds for the ADPF API.
+        /// In <see cref="FrameSync.ActualUnlimited"/> mode there is no throttle sleep, so
+        /// ElapsedFrameTime accurately reflects actual GPU+CPU work time.
+        /// </summary>
+        private void onDrawFrameCompleted()
+        {
+            if (adpfDrawSession == IntPtr.Zero) return;
+
+            try
+            {
+                double elapsedMs = Host?.DrawThread?.Clock.ElapsedFrameTime ?? 0;
+                if (elapsedMs > 0)
+                    OboeAudioBridge.nADPFReportActualDuration(adpfDrawSession, (long)(elapsedMs * 1_000_000.0));
+            }
+            catch { }
+        }
+
+        /// <summary>
+        /// Called by <see cref="osu.Framework.Threading.GameThread.FrameCompleted"/> on the Update thread.
+        /// See <see cref="onDrawFrameCompleted"/> for rationale.
+        /// </summary>
+        private void onUpdateFrameCompleted()
+        {
+            if (adpfUpdateSession == IntPtr.Zero) return;
+
+            try
+            {
+                double elapsedMs = Host?.UpdateThread?.Clock.ElapsedFrameTime ?? 0;
+                if (elapsedMs > 0)
+                    OboeAudioBridge.nADPFReportActualDuration(adpfUpdateSession, (long)(elapsedMs * 1_000_000.0));
+            }
+            catch { }
+        }
+
         private global::Android.Views.Display? getActiveDisplay()
         {
             if (gameActivity.IsFinishing || gameActivity.IsDestroyed)
@@ -2441,8 +2491,15 @@ protected override void Dispose(bool isDisposing)
                 dexPerformanceSession = null;
 
                 // Close ADPF hint sessions for game threads.
+                // Unsubscribe FrameCompleted FIRST so the callbacks don't fire with a stale
+                // (already-closed) session handle during the final frames of teardown.
                 try
                 {
+                    if (Host?.DrawThread != null)
+                        Host.DrawThread.FrameCompleted -= onDrawFrameCompleted;
+                    if (Host?.UpdateThread != null)
+                        Host.UpdateThread.FrameCompleted -= onUpdateFrameCompleted;
+
                     if (adpfDrawSession != IntPtr.Zero)
                     {
                         OboeAudioBridge.nADPFCloseSession(adpfDrawSession);

osu.Game/osu.Game.csproj

@@ -38,10 +38,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="20.1.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2026.503.8" />
+    <PackageReference Include="ppy.osu.Framework" Version="2026.504.1" />
     <!--
       Explicitly pin `ppy.Veldrid.SPIRV` to the winnerspiros fork build that
-      `ppy.osu.Framework 2026.503.8` was compiled against. This version is the only
+      `ppy.osu.Framework 2026.504.1` was compiled against. This version is the only
       one whose `runtimes/android-arm64/native/libveldrid-spirv.so` is aligned to 16 KB
       pages (required by Android 16+). It lives only as a release asset on
       <https://github.com/winnerspiros/veldrid-spirv/releases/tag/1.0> and is vendored

osu.iOS.props

@@ -33,6 +33,6 @@
     <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2026.503.8" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2026.504.1" />
   </ItemGroup>
 </Project>