HDR data transfer: Added MaxCLL/MaxFALL support

Author: n00mkrad

ff-utils-winforms/Data/VideoColorData.cs

@@ -24,25 +24,11 @@ public class VideoColorData
         public string WhiteY { get; set; } = "";
         public string LumaMin { get; set; } = "";
         public string LumaMax { get; set; } = "";
+        public string MaxCll { get; set; } = "";
+        public string MaxFall { get; set; } = "";
 
         public override string ToString()
         {
-            //return
-            //$"Color transfer: {ColorTransfer}" +
-            //$"\nColor matrix coefficients: {ColorMatrixCoeffs}" +
-            //$"\nColor primaries: {ColorPrimaries}" +
-            //$"\nColor range: {ColorRange}" +
-            //$"\nRed color coordinate x: {RedX}" +
-            //$"\nRed color coordinate y: {RedY}" +
-            //$"\nGreen color coordinate x: {GreenX}" +
-            //$"\nGreen color coordinate y: {GreenY}" +
-            //$"\nBlue color coordinate y: {BlueX}" +
-            //$"\nBlue color coordinate x: {BlueY}" +
-            //$"\nWhite color coordinate y: {WhiteX}" +
-            //$"\nWhite color coordinate x: {WhiteY}" +
-            //$"\nMaximum luminance: {LumaMax}" +
-            //$"\nMinimum luminance: {LumaMin}";
-
             List<string> lines = new List<string>();
 
             try
@@ -57,6 +43,8 @@ public override string ToString()
                 if (!string.IsNullOrWhiteSpace(WhiteX) && !string.IsNullOrWhiteSpace(WhiteY)) lines.Add($"White color coordinates X/Y: {WhiteX}/{WhiteY}");
                 if (!string.IsNullOrWhiteSpace(LumaMin)) lines.Add($"Minimum luminance: {LumaMin}");
                 if (!string.IsNullOrWhiteSpace(LumaMax)) lines.Add($"Maximum luminance: {LumaMax}");
+                if (!string.IsNullOrWhiteSpace(MaxCll)) lines.Add($"Maximum Content Light Level: {MaxCll}");
+                if (!string.IsNullOrWhiteSpace(MaxFall)) lines.Add($"Maximum Frame-Average Light Level: {MaxFall}");
             }
             catch { }
 

ff-utils-winforms/Utils/ColorDataUtils.cs

@@ -66,6 +66,12 @@ public static async Task<VideoColorData> GetColorData(string path)
 
                 else if (line.Contains("min_luminance="))
                     data.LumaMin = line.Contains("/") ? FractionToFloat(line.Split('=').Last()) : line.Split('=').Last();
+
+                else if (line.Contains("max_content="))
+                    data.MaxCll = line.Contains("/") ? FractionToFloat(line.Split('=').Last()) : line.Split('=').Last();
+
+                else if (line.Contains("max_average="))
+                    data.MaxFall = line.Contains("/") ? FractionToFloat(line.Split('=').Last()) : line.Split('=').Last();
             }
 
             string infoMkvinfo = await AvProcess.RunMkvInfo($"{path.Wrap()}");
@@ -117,6 +123,12 @@ public static async Task<VideoColorData> GetColorData(string path)
 
                     else if (line.Contains("+ Minimum luminance:"))
                         data.LumaMin = ValidateNumber(line.Split(':')[1]);
+
+                    else if (line.Contains("+ Maximum content light:"))
+                        data.MaxCll = ValidateNumber(line.Split(':')[1]);
+
+                    else if (line.Contains("+ Maximum frame light:"))
+                        data.MaxFall = ValidateNumber(line.Split(':')[1]);
                 }
             }
 
@@ -147,7 +159,8 @@ public static async Task SetColorData(string path, VideoColorData d)
                     $"--max-luminance 0:{d.LumaMax} " +
                     $"--min-luminance 0:{d.LumaMin} " +
                     $"--chromaticity-coordinates 0:{d.RedX},{d.RedY},{d.GreenX},{d.GreenY},{d.BlueX},{d.BlueY} " +
-                    $"--white-colour-coordinates 0:{d.WhiteX},{d.WhiteY} " +
+                    $"--max-content-light 0:{d.MaxCll} " +
+                    $"--max-frame-light 0:{d.MaxFall} " +
                     $"{path.Wrap()}";
 
                 await AvProcess.RunMkvMerge(args, true);