audio output core: normalize tracks without replaygain peak data (fix #8165)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

diff --git a/src/audio_output/volume.c b/src/audio_output/volume.c
index 7eb977de557cb1a0676cc87e1331abf93686c4f8..b16cc832c71b299a9f40269bae5d779a96c6f0a9 100644 (file)
--- a/src/audio_output/volume.c
+++ b/src/audio_output/volume.c
@@ -179,10 +179,10 @@ static float aout_ReplayGainSelect(vlc_object_t *obj, const char *str,
 
         multiplier = pow (10., gain / 20.);
 
-        if (replay_gain->pb_peak[mode]
-         && var_InheritBool (obj, "audio-replay-gain-peak-protection")
-         && replay_gain->pf_peak[mode] * multiplier > 1.f)
-            multiplier = 1.f / replay_gain->pf_peak[mode];
+        if (var_InheritBool (obj, "audio-replay-gain-peak-protection"))
+            multiplier = fminf (multiplier, replay_gain->pb_peak[mode]
+                                            ? 1.f / replay_gain->pf_peak[mode]
+                                            : 1.f);
     }
 
     /* Command line / configuration gain */