[server] lets try a simpler and hopefully less buggy Normalize() impl

uwu · Nov 4, 2023 · 6366e54 · 6366e54
1 parent 1b76c31
commit 6366e54
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/UwuRadio.Server/Constants.cs b/UwuRadio.Server/Constants.cs
@@ -65,5 +65,5 @@ public static Constants
 	/// <summary>
 	/// The target Integrated LUFS
 	/// </summary>
-	public string AudioNormIntegrated { get; set; } = null!;
+	public double AudioNormIntegrated { get; set; }
 }
diff --git a/UwuRadio.Server/DSP.cs b/UwuRadio.Server/DSP.cs
@@ -51,8 +51,11 @@ public static async Task<LoudnessMeasurement> MeasureLoudness(string path)
 
 	public static async Task Normalize(string inPath, string outPath, LoudnessMeasurement measurement)
 	{
+		var lufsLoudnessChange = Constants.C.AudioNormIntegrated - measurement.IntegratedLoudness;
+		var clampedLoudnessChange = Math.Min(lufsLoudnessChange, -measurement.TruePeak);
+
 		var args = new List<string> { "-nostdin", "-i", inPath, "-filter:a",
-			$"loudnorm=measured_i={measurement.IntegratedLoudness}:measured_thresh={measurement.IntegratedThreshold}:measured_lra={measurement.LoudnessRange}:measured_tp={measurement.TruePeak}:i={Constants.C.AudioNormIntegrated}",
+			$"volume={clampedLoudnessChange}dB",
 			"-f", Constants.C.AudioFormat
 		};
 

diff --git a/UwuRadio.Server/constants.debug.json b/UwuRadio.Server/constants.debug.json
@@ -7,5 +7,5 @@
   "IngestFolder": "../ingest",
   "AudioFormat": "mp3",
   "AudioQScale": "6",
-  "AudioNormIntegrated": "-16"
+  "AudioNormIntegrated": -16
 }
diff --git a/UwuRadio.Server/constants.json b/UwuRadio.Server/constants.json
@@ -7,5 +7,5 @@
   "IngestFolder": "ingest",
   "AudioFormat": "mp3",
   "AudioQScale": "6",
-  "AudioNormIntegrated": "-16"
+  "AudioNormIntegrated": -16
 }