Improvements for audio normalization

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs

@@ -120,6 +120,8 @@ private void load()
                 bodyPiece.CreateProxy(),
                 tailContainer.CreateProxy(),
             });
+
+            slidingSample.BindAdjustments(Samples);
         }
 
         protected override void LoadComplete()

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

@@ -136,6 +136,8 @@ private void load()
                 foreach (var drawableHitObject in NestedHitObjects)
                     drawableHitObject.AccentColour.Value = colour.NewValue;
             }, true);
+
+            slidingSample.BindAdjustments(Samples);
         }
 
         protected override JudgementResult CreateResult(Judgement judgement) => new OsuSliderJudgementResult(HitObject, judgement);

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

@@ -121,6 +121,9 @@ private void load()
             });
 
             PositionBindable.BindValueChanged(pos => Position = pos.NewValue);
+
+            spinningSample.BindAdjustments(Samples);
+            maxBonusSample.BindAdjustments(Samples);
         }
 
         protected override void LoadComplete()

osu.Game/Audio/AudioNormalization.cs

@@ -2,10 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
-using ManagedBass;
-using ManagedBass.Fx;
-using osu.Framework.Audio.Mixing;
+using osu.Framework.Audio.Track;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
@@ -16,7 +13,7 @@ namespace osu.Game.Audio
     /// <summary>
     /// Audio Normalization Manager
     /// </summary>
-    public class AudioNormalization : EmbeddedObject, IAudioNormalization, IEquatable<AudioNormalization>
+    public class AudioNormalization : EmbeddedObject, IEquatable<AudioNormalization>
     {
         /// <summary>
         /// The target level for audio normalization
@@ -57,9 +54,9 @@ public AudioNormalization(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo
                 return;
             }
 
-            filepath = realmFileStore.Storage.GetFullPath(filepath);
+            using TrackLoudness loudness = new TrackLoudness(realmFileStore.Storage.GetStream(filepath));
 
-            float? integratedLoudness = new BassAudioNormalization(filepath).IntegratedLoudness;
+            float? integratedLoudness = loudness.GetIntegratedLoudness();
 
             if (integratedLoudness == null)
             {
@@ -93,57 +90,9 @@ public void PopulateSet(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo)
         }
 
         /// <summary>
-        /// Convert integrated loudness to a volume offset
+        /// A volume offset that can be applied upon audio to reach <see cref="TARGET_LEVEL"/> (converted from integrated loudness).
         /// </summary>
-        /// <param name="integratedLoudness">The integrated loudness value</param>
-        /// <returns>The volume offset needed to reach <see cref="TARGET_LEVEL"/></returns>
-        public static float IntegratedLoudnessToVolumeOffset(float integratedLoudness) => (float)Math.Pow(10, (TARGET_LEVEL - integratedLoudness) / 20);
-
-        /// <summary>
-        /// Get the loudness values of a <see cref="BeatmapInfo"/> and apply the audio normalization effect to an <see cref="IAudioMixer"/>
-        /// </summary>
-        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the loudness values of</param>
-        /// <param name="mixer">The <see cref="IAudioMixer"/> to apply the effect on</param>
-        public static void AddAudioNormalization(BeatmapInfo beatmapInfo, IAudioMixer mixer)
-        {
-            AudioNormalization? audioNormalizationModule = beatmapInfo.AudioNormalization;
-
-            VolumeParameters volumeParameters = new VolumeParameters
-            {
-                fTarget = audioNormalizationModule?.IntegratedLoudness != null ? IntegratedLoudnessToVolumeOffset((float)audioNormalizationModule.IntegratedLoudness) : 0.8f,
-                fCurrent = -1.0f,
-                fTime = 0.3f,
-                lCurve = 1,
-                lChannel = FXChannelFlags.All
-            };
-
-            addFx(volumeParameters, mixer);
-
-            Logger.Log("Normalization Status: " + (audioNormalizationModule?.IntegratedLoudness != null ? $"on ({Math.Round(IntegratedLoudnessToVolumeOffset((float)audioNormalizationModule.IntegratedLoudness) * 100)}%)" : "off"));
-        }
-
-        /// <summary>
-        /// Add an effect to a <see cref="IAudioMixer"/>, replacing it if it already exists
-        /// </summary>
-        /// <param name="effectParameter">The <see cref="IEffectParameter"/> to add to the <paramref name="mixer"/></param>
-        /// <param name="mixer">The <see cref="IAudioMixer"/> to add the effect to</param>
-        private static void addFx(IEffectParameter effectParameter, IAudioMixer mixer)
-        {
-            IEffectParameter? effect = mixer.Effects.SingleOrDefault(e => e.FXType == effectParameter.FXType);
-
-            if (effect != null)
-            {
-                int i = mixer.Effects.IndexOf(effect);
-                mixer.Effects[i] = effectParameter;
-            }
-            else
-            {
-                mixer.Effects.Add(effectParameter);
-            }
-        }
-
-        /// <inheritdoc />
-        public bool Equals(IAudioNormalization? other) => other is AudioNormalization audioNormalization && Equals(audioNormalization);
+        public float IntegratedLoudnessInVolumeOffset => IntegratedLoudness != null ? (float)Math.Pow(10, (TARGET_LEVEL - (double)IntegratedLoudness) / 20) : 0.8f;
 
         /// <inheritdoc />
         public bool Equals(AudioNormalization? other) => other?.IntegratedLoudness != null && IntegratedLoudness != null && Math.Abs((float)(IntegratedLoudness - other.IntegratedLoudness)) < 0.0000001;

osu.Game/Audio/AudioNormalizationManager.cs

@@ -0,0 +1,60 @@
+// 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 osu.Framework.Audio;
+using osu.Framework.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Logging;
+using osu.Game.Configuration;
+using osu.Game.Overlays;
+
+namespace osu.Game.Audio
+{
+    /// <summary>
+    /// Provides bindables for track/sample volume.
+    /// </summary>
+    public class AudioNormalizationManager
+    {
+        private readonly Bindable<bool> beatmapHitsoundBind;
+
+        /// <summary>
+        /// Default <see cref="ITrackStore"/> will bind to this bindable.
+        /// <see cref="MusicController"/> updates this on every track change.
+        /// It's set to 0.8 by default to leave some head-room for UI effects / samples.
+        /// </summary>
+        public readonly BindableDouble TrackNormalizeVolume = new BindableDouble(0.8);
+
+        /// <summary>
+        /// Samples assigned to hitobjects needs to bind to this bindable to normalize their volume in line with track.
+        /// </summary>
+        public readonly BindableDouble SampleNormalizeVolume = new BindableDouble(1.0);
+
+        /// <summary>
+        /// Creates a new <see cref="AudioNormalizationManager"/>.
+        /// </summary>
+        /// <param name="audioManager"></param>
+        /// <param name="config"></param>
+        public AudioNormalizationManager(AudioManager audioManager, OsuConfigManager config)
+        {
+            audioManager.Tracks.AddAdjustment(AdjustableProperty.Volume, TrackNormalizeVolume);
+
+            beatmapHitsoundBind = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
+
+            normalizeSampleIfTrue(beatmapHitsoundBind.Value);
+            beatmapHitsoundBind.BindValueChanged(change => normalizeSampleIfTrue(change.NewValue));
+        }
+
+        private void normalizeSampleIfTrue(bool value)
+        {
+            if (value)
+            {
+                SampleNormalizeVolume.BindTo(TrackNormalizeVolume);
+            }
+            else
+            {
+                SampleNormalizeVolume.UnbindFrom(TrackNormalizeVolume);
+                SampleNormalizeVolume.Value = 1.0;
+            }
+        }
+    }
+}

osu.Game/OsuGameBase.cs

@@ -212,6 +212,8 @@ public virtual string Version
 
         protected SafeAreaContainer SafeAreaContainer { get; private set; }
 
+        protected AudioNormalizationManager AudioNormalizationManager { get; private set; }
+
         /// <summary>
         /// For now, this is used as a source specifically for beat synced components.
         /// Going forward, it could potentially be used as the single source-of-truth for beatmap timing.
@@ -346,6 +348,8 @@ private void load(ReadableKeyCombinationProvider keyCombinationProvider, Framewo
             RegisterImportHandler(ScoreManager);
             RegisterImportHandler(SkinManager);
 
+            dependencies.Cache(AudioNormalizationManager = new AudioNormalizationManager(Audio, LocalConfig));
+
             Beatmap = new NonNullableBindable<WorkingBeatmap>(defaultBeatmap);
 
             dependencies.CacheAs<IBindable<WorkingBeatmap>>(Beatmap);

osu.Game/Overlays/MusicController.cs

@@ -65,17 +65,13 @@ public partial class MusicController : CompositeDrawable
         private RealmAccess realm { get; set; }
 
         [Resolved]
-        private AudioManager audioManager { get; set; }
+        private AudioNormalizationManager audioNormalizationManager { get; set; }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            beatmap.BindValueChanged(b =>
-            {
-                changeBeatmap(b.NewValue);
-                AudioNormalization.AddAudioNormalization(b.NewValue.BeatmapInfo, audioManager.TrackMixer);
-            }, true);
+            beatmap.BindValueChanged(b => changeBeatmap(b.NewValue), true);
             mods.BindValueChanged(_ => ResetTrackAdjustments(), true);
         }
 
@@ -354,6 +350,10 @@ private void changeTrack()
                 if (queuedTrack == CurrentTrack)
                 {
                     AddInternal(queuedTrack);
+
+                    double normalizedVol = current.BeatmapInfo.AudioNormalization?.IntegratedLoudnessInVolumeOffset ?? 0.8;
+                    this.TransformBindableTo(audioNormalizationManager.TrackNormalizeVolume, normalizedVol, 300, Easing.Out);
+
                     queuedTrack.VolumeTo(0).Then().VolumeTo(1, 300, Easing.Out);
                 }
                 else

osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs

@@ -10,6 +10,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ListExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
@@ -197,7 +198,7 @@ protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
         }
 
         [BackgroundDependencyLoader]
-        private void load(IGameplaySettings gameplaySettings, ISkinSource skinSource)
+        private void load(IGameplaySettings gameplaySettings, ISkinSource skinSource, AudioNormalizationManager audioNormalizationManager)
         {
             positionalHitsoundsLevel.BindTo(gameplaySettings.PositionalHitsoundsLevel);
             comboColourBrightness.BindTo(gameplaySettings.ComboColourNormalisationAmount);
@@ -208,6 +209,8 @@ private void load(IGameplaySettings gameplaySettings, ISkinSource skinSource)
                 MinimumSampleVolume = MINIMUM_SAMPLE_VOLUME
             });
 
+            Samples.AddAdjustment(AdjustableProperty.Volume, audioNormalizationManager.SampleNormalizeVolume);
+
             CurrentSkin = skinSource;
             CurrentSkin.SourceChanged += skinSourceChanged;
         }

osu.Game/osu.Game.csproj

@@ -34,10 +34,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ppy.ManagedBass" Version="2023.0.1" />
-    <PackageReference Include="ppy.ManagedBass.Fx" Version="2023.0.0" />
-    <PackageReference Include="ppy.ManagedBass.Loud" Version="3.0.5" />
-    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2025.0.0" />
     <PackageReference Include="Realm" Version="11.5.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2024.509.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2024.510.0" />