From ffa284c42a82b2257efc8e1bb570d03039acd3da Mon Sep 17 00:00:00 2001 From: Roderick van Domburg Date: Fri, 16 Apr 2021 15:54:38 +0200 Subject: [PATCH 1/2] Fix basic volume normalisation --- playback/src/player.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playback/src/player.rs b/playback/src/player.rs index 3f0778f9..f42ece1b 100644 --- a/playback/src/player.rs +++ b/playback/src/player.rs @@ -1161,8 +1161,8 @@ impl PlayerInternal { } if self.config.normalisation - && (f32::abs(normalisation_factor - 1.0) < f32::EPSILON - || self.config.normalisation_method != NormalisationMethod::Basic) + && !(f32::abs(normalisation_factor - 1.0) <= f32::EPSILON + && self.config.normalisation_method == NormalisationMethod::Basic) { for sample in data.iter_mut() { let mut actual_normalisation_factor = normalisation_factor; From d44b74ea57cee2f0eee91694a72bd15cf3af9934 Mon Sep 17 00:00:00 2001 From: Roderick van Domburg Date: Fri, 16 Apr 2021 20:49:21 +0200 Subject: [PATCH 2/2] Add dB unit in warning message --- playback/src/player.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playback/src/player.rs b/playback/src/player.rs index f42ece1b..78083e87 100644 --- a/playback/src/player.rs +++ b/playback/src/player.rs @@ -246,7 +246,7 @@ impl NormalisationData { let limited_normalisation_power = Self::ratio_to_db(limited_normalisation_factor); if config.normalisation_method == NormalisationMethod::Basic { - warn!("Limiting gain to {:.2} for the duration of this track to stay under normalisation threshold.", limited_normalisation_power); + warn!("Limiting gain to {:.2} dB for the duration of this track to stay under normalisation threshold.", limited_normalisation_power); normalisation_factor = limited_normalisation_factor; } else { warn!(