Merge pull request #146 from winnerspiros/fix-oboe-audio-final-9634658476078144659

android: Resolve Oboe audio implementation and improve diagnostics

Author: winnerspiros

osu.Android/Native/OboeAudioBridge.cs

@@ -80,7 +80,18 @@ public double GetOutputLatencyMs()
             catch { return -1; }
         }
 
-                public bool IsActive
+        public string GetLastErrorMessage()
+        {
+            if (disposed || nativePtr == IntPtr.Zero) return "Not initialized";
+            try
+            {
+                IntPtr ptr = nOboeGetLastErrorMessage(nativePtr);
+                return ptr == IntPtr.Zero ? "Unknown" : Marshal.PtrToStringAnsi(ptr) ?? "Unknown";
+            }
+            catch { return "P/Invoke error"; }
+        }
+
+        public bool IsActive
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
@@ -121,7 +132,7 @@ public int BufferSizeInFrames
             }
         }
 
-                public bool IsAAudio
+        public bool IsAAudio
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
@@ -132,7 +143,7 @@ public bool IsAAudio
             }
         }
 
-                public bool IsMMap
+        public bool IsMMap
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
@@ -177,6 +188,7 @@ public void Dispose()
         [DllImport(lib_name)] private static extern byte nOboeIsAAudio(IntPtr ptr);
         [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)] private static extern IntPtr nOboeGetLastErrorMessage(IntPtr ptr);
         [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);

osu.Android/OboeAudioRedirector.cs

@@ -4,19 +4,20 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
 using ManagedBass;
 using ManagedBass.Mix;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Mixing;
-using osu.Framework.Bindables;
 
 namespace osu.Android
 {
+    /// <summary>
+    /// Redirects audio from BASS mixers into an unmanaged callback (Oboe).
+    /// </summary>
     public class OboeAudioRedirector : IDisposable
     {
         public bool IsRedirecting => ActiveMasterMixer != 0;
@@ -44,7 +45,6 @@ public void RefreshMixers(int hardwareSampleRate)
 
             Console.WriteLine($"[osu!] Oboe redirector: Refreshing mixers with rate {lastHardwareSampleRate}Hz");
 
-            // Clean up previous state but keep the silencing if we are already silenced.
             ActiveMasterMixer = 0;
             if (masterMixer != 0)
             {
@@ -98,7 +98,6 @@ public void RefreshMixers(int hardwareSampleRate)
 
         private IEnumerable<AudioMixer> getActiveMixers()
         {
-            // Exhaustive search for the activeMixers list in AudioManager.
             Type type = typeof(AudioManager);
 
             while (type != null && type != typeof(object))
@@ -133,7 +132,6 @@ private bool setupMasterMixer()
 
             if (!devicesSilenced) return false;
 
-            // Ensure we are working with the correct device context.
             Bass.CurrentDevice = 0;
 
             masterMixer = BassMix.CreateMixerStream(sampleRate, 2, BassFlags.Float | BassFlags.Decode | BassFlags.MixerNonStop);
@@ -144,7 +142,6 @@ private bool setupMasterMixer()
                 return false;
             }
 
-            // Disable BASS-internal buffering for the lowest possible latency.
             Bass.ChannelSetAttribute(masterMixer, ChannelAttribute.Buffer, 0);
 
             int successfullyAdded = 0;
@@ -159,13 +156,11 @@ private bool setupMasterMixer()
                     BassMix.MixerRemoveChannel(handle);
                 }
 
-                // If the channel was on another device, move it to the silent device (0).
                 if (Bass.ChannelGetDevice(handle) != 0)
                 {
                     if (!Bass.ChannelSetDevice(handle, 0))
                     {
                         Console.WriteLine($"[osu!] Failed to move source mixer {handle} to silent device: {Bass.LastError}");
-                        // Try to proceed anyway, as some devices might behave strangely with device 0.
                     }
                 }
 
@@ -179,6 +174,9 @@ private bool setupMasterMixer()
                 }
             }
 
+            // Restore current device to 1 after setup to avoid affecting other audio operations
+            Bass.CurrentDevice = 1;
+
             return successfullyAdded > 0;
         }
 
@@ -230,7 +228,6 @@ private void restoreDefaultAudio()
 
                 restoreToParents();
 
-                // Restore any other discovered mixers to the default device.
                 foreach (int handle in mixerHandles)
                 {
                     if (originalParents.ContainsKey(handle)) continue;
@@ -281,14 +278,12 @@ private int findHandle(object obj)
 
             while (type != null && type != typeof(object))
             {
-                // Broad search for anything that looks like a BASS handle.
-                // We check int, long, and IntPtr as different wrappers use different types.
                 foreach (var field in type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
                 {
                     if (isHandleType(field.FieldType))
                     {
                         string name = field.Name.ToLowerInvariant();
-                        if (name.Contains("handle") || name.Contains("mixer") || name.Contains("id") || name.Contains("stream") || name.Contains("channel"))
+                        if (name.Contains("handle") || name.Contains("mixer") || name.Contains("id") || name.Contains("stream") || name.Contains("channel") || name.Contains("source"))
                         {
                             int h = convertToHandle(field.GetValue(obj));
                             if (h != 0) return h;
@@ -301,14 +296,26 @@ private int findHandle(object obj)
                     if (isHandleType(prop.PropertyType))
                     {
                         string name = prop.Name.ToLowerInvariant();
-                        if (name.Contains("handle") || name.Contains("mixer") || name.Contains("id") || name.Contains("stream") || name.Contains("channel"))
+                        if (name.Contains("handle") || name.Contains("mixer") || name.Contains("id") || name.Contains("stream") || name.Contains("channel") || name.Contains("source"))
                         {
                             int h = convertToHandle(prop.GetValue(obj));
                             if (h != 0) return h;
                         }
                     }
                 }
 
+                if (type.Name.Contains("Mixer") || type.Name.Contains("Channel") || type.Name.Contains("Stream"))
+                {
+                    foreach (var field in type.GetFields(BindingFlags.Instance | BindingFlags.NonPublic))
+                    {
+                        if (field.FieldType == typeof(int))
+                        {
+                            int h = (int)field.GetValue(obj)!;
+                            if (h > 0 && h < 1000000) return h;
+                        }
+                    }
+                }
+
                 type = type.BaseType;
             }
 
@@ -326,7 +333,7 @@ private int convertToHandle(object? val)
             return 0;
         }
 
-        [UnmanagedCallersOnly(CallConvs = new[] { typeof(CallConvCdecl) })]
+        [UnmanagedCallersOnly(EntryPoint = "provideAudio", CallConvs = new[] { typeof(CallConvCdecl) })]
         private static int provideAudio(IntPtr audioData, int numFrames)
         {
             int mixer = ActiveMasterMixer;

osu.Android/OsuGameAndroid.cs

@@ -1,43 +1,39 @@
 // 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.Diagnostics;
-using Microsoft.Maui.Devices;
-using osu.Android.Performance;
-using osu.Framework.Development;
 
-using Android.Content.PM;
-using osu.Game.Performance;
-using osu.Game.Updater;
-using System.Collections.Specialized;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using Debug = System.Diagnostics.Debug;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using Context = global::Android.Content.Context;
-using Android.Media;
+using Android.App;
+using Android.Content.PM;
 using Android.OS;
 using Android.Views;
 using osu.Android.Native;
+using osu.Framework;
 using osu.Android.Input;
 using osu.Framework.Allocation;
-using AudioManager = osu.Framework.Audio.AudioManager;
 using osu.Framework.Bindables;
-using osu.Framework.Configuration;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Input;
 using osu.Framework.Platform;
-using osu.Framework.Threading;
 using osu.Game;
 using osu.Game.Configuration;
 using osu.Game.Overlays;
-using osu.Game.Overlays.Notifications;
+using osu.Game.Overlays.Settings;
 using osu.Game.Screens;
+using osu.Game.Screens.Play;
+using osuTK;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Mixing;
+using osu.Framework.Threading;
+using osu.Android.Performance;
 using osu.Game.Utils;
-using Vector2 = osuTK.Vector2;
+using osu.Game.Updater;
+using osu.Game.Performance;
 
 namespace osu.Android
 {
@@ -89,15 +85,6 @@ public partial class OsuGameAndroid : OsuGame
         private Delegate? activeMixersHandler;
         private object? activeMixersList;
 
-        /// <summary>
-        /// Boxed reference to the native bridge manager.
-        /// Declared as <c>object?</c> so that the runtime never resolves the concrete
-        /// AndroidNativeBridgeManager type (and its P/Invoke field types) during
-        /// OsuGameAndroid class initialisation — which would trigger
-        /// NativeLibrary.TryLoad before the framework is ready and crash on some
-        /// Samsung devices.
-        /// All access goes through [NoInlining] helpers below.
-        /// </summary>
         private object? nativeBridges;
 
         public OsuGameAndroid(OsuGameActivity activity)
@@ -158,42 +145,36 @@ private void load()
 
             try
             {
-                // Use reflection to bind to collection changes of the internal activeMixers list in AudioManager.
-                FieldInfo? field = typeof(AudioManager).GetField("activeMixers", BindingFlags.Instance | BindingFlags.NonPublic);
-                if (field != null)
+                Type? audioType = typeof(AudioManager);
+                activeMixersList = audioType.GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public)
+                                            .FirstOrDefault(f => f.FieldType.IsGenericType && f.FieldType.GetGenericArguments().Contains(typeof(AudioMixer)))
+                                            ?.GetValue(Audio);
+
+                if (activeMixersList != null)
                 {
-                    activeMixersList = field.GetValue(Audio);
-                    object? val = field.GetValue(Audio);
-                    if (val != null)
+                    MethodInfo? bindMethod = activeMixersList.GetType().GetMethod("BindCollectionChanged", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+                    if (bindMethod != null)
                     {
-                        MethodInfo? bindMethod = val.GetType().GetMethod("BindCollectionChanged", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
-                        if (bindMethod != null)
-                        {
-                            var del = Delegate.CreateDelegate(bindMethod.GetParameters()[0].ParameterType, this, typeof(OsuGameAndroid).GetMethod(nameof(onActiveMixersChanged), BindingFlags.Instance | BindingFlags.NonPublic)!);
-                            bindMethod.Invoke(val, new object[] { del, true });
-                        }
+                        activeMixersHandler = new NotifyCollectionChangedEventHandler(onActiveMixersChanged);
+                        bindMethod.Invoke(activeMixersList, new object[] { activeMixersHandler });
+                        Debug.WriteLine("[osu!] Oboe redirector: Successfully bound to ActiveMixers collection");
                     }
                 }
             }
-            catch (Exception ex)
-            {
-                Debug.WriteLine($"[osu!] Failed to bind to activeMixers via reflection: {ex.Message}");
-            }
+            catch (Exception e) { Debug.WriteLine($"[osu!] Oboe redirector: Failed to bind to ActiveMixers: {e.Message}"); }
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveOptimization)]
+        private void onActiveMixersChanged(object? sender, NotifyCollectionChangedEventArgs args) => Schedule(() => { if (lowLatencyAudio.Value) audioRedirector?.RefreshMixers(0); });
+
         protected override void LoadComplete()
         {
-                        // Pin the current thread (Update thread) to high-performance cores.
-            // On S23 Ultra, cores 3-7 are high-performance. Mask = 0xF8 (11111000 in binary)
             try
             {
                 if (OboeAudioBridge.nSetThreadAffinity(0xF8) != 0)
                     Debug.WriteLine("[osu!] Update thread pinned to big cores");
 
                 Scheduler.Add(() =>
                 {
-                    // 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 { }
@@ -261,8 +242,6 @@ protected override void LoadComplete()
                             Debug.WriteLine($"[osu!] Audio offset auto-suggested: {suggested:F1}ms (hardware latency={latency:F1}ms)");
                         }, audioRedirector != null ? audioRedirector.Provider : IntPtr.Zero, sampleRate =>
                         {
-                            // Only redirect audio once the Oboe stream has successfully started.
-                            // This prevents silence if the bridge fails to initialize.
                             audioRedirector?.RefreshMixers(sampleRate > 0 ? sampleRate : hardwareSampleRate);
                             Debug.WriteLine("[osu!] Audio redirector refreshed with hardware sample rate: " + sampleRate);
                         });
@@ -277,7 +256,6 @@ protected override void LoadComplete()
                 {
                     stopOboeBridge();
                     audioRedirector?.Dispose();
-                    // Re-create the redirector instance so it's fresh if re-enabled.
                     audioRedirector = new OboeAudioRedirector(Audio);
                 }
             }, true);
@@ -295,9 +273,8 @@ protected override void LoadComplete()
                 {
                     Debug.WriteLine($"[osu!] Failed to toggle Vulkan probe: {ex.Message}");
                 }
-            }, false); // Already started in load() if true.
+            }, false);
 
-            // Apply unbuffered touch dispatch.
             try
             {
                 if (OperatingSystem.IsAndroidVersionAtLeast(31))
@@ -332,8 +309,7 @@ private void applyPerformanceOptimizations(bool enabled)
 
                     if (enabled)
                     {
-                        highPerformanceSession?.Dispose();
-                        highPerformanceSession = highPerformanceSessionManager.BeginSession();
+                        highPerformanceSession ??= highPerformanceSessionManager.BeginSession();
                     }
                     else
                     {
@@ -405,15 +381,22 @@ private void selectHighestRefreshRate()
 
         public override string VulkanStatus => (nativeBridges as AndroidNativeBridgeManager)?.GetVulkanStatus() ?? string.Empty;
 
-
-
         public override bool IsOboeActive => (nativeBridges as AndroidNativeBridgeManager)?.IsOboeActive() ?? false;
 
-        public override string OboeStatus => (nativeBridges as AndroidNativeBridgeManager)?.GetOboeStatus() ?? string.Empty;
+        public override bool IsOboeEnabled => lowLatencyAudio.Value;
 
-        public override double OboeLatency => (nativeBridges as AndroidNativeBridgeManager)?.GetMeasuredAudioLatencyMs() ?? -1;
+        public override string OboeStatus
+        {
+            get
+            {
+                string status = (nativeBridges as AndroidNativeBridgeManager)?.GetOboeStatus() ?? (IsOboeEnabled ? "Initializing..." : string.Empty);
+                if (IsOboeEnabled && audioRedirector != null && !audioRedirector.IsRedirecting && IsOboeActive)
+                    status += " [No Redirect]";
+                return status;
+            }
+        }
 
-        private void onActiveMixersChanged(object? sender, NotifyCollectionChangedEventArgs args) => Schedule(() => { if (lowLatencyAudio.Value) audioRedirector?.RefreshMixers(0); });
+        public override double OboeLatency => (nativeBridges as AndroidNativeBridgeManager)?.GetMeasuredAudioLatencyMs() ?? -1;
 
         public double GetMeasuredAudioLatencyMs() => getMeasuredAudioLatencyFromBridge();
 

osu.Game/OsuGameBase.cs

@@ -123,7 +123,7 @@ public virtual EndpointConfiguration CreateEndpoints() =>
         public virtual bool IsVulkanSupported => false;
 
         public virtual bool IsOboeActive => false;
-
+        public virtual bool IsOboeEnabled => false;
         public virtual string OboeStatus => string.Empty;
 
         public virtual double OboeLatency => -1;