Fixed PSNR+SSIM being broken, fixed issues with image sequences not working with some utils

Author: n00mkrad

ff-utils-winforms/Data/MediaFile.cs

@@ -56,8 +56,6 @@ public MediaFile(string path, bool requestFpsInputIfUnset = true)
                 if (FileCount < 1)
                     return;
 
-                Logger.Log($"MediaFile ctor");
-
                 if(requestFpsInputIfUnset && InputRate == null)
                 {
                     PromptForm form = new PromptForm("Enter Frame Rate", $"Please enter a frame rate to use for the image sequence '{Name.Trunc(80)}'.", "30");

ff-utils-winforms/Extensions/ExtensionMethods.cs

@@ -254,12 +254,12 @@ public static bool IsConcatFile(this string filePath)
         public static string GetConcStr (this string filePath, int rate = -1)
         {
             string rateStr = rate >= 0 ? $"-r {rate} " : "";
-            return filePath.IsConcatFile() ? $"{rateStr}-safe 0 -f concat" : "";
+            return filePath.IsConcatFile() ? $"{rateStr}-safe 0 -f concat " : "";
         }
 
         public static string GetFfmpegInputArg(this string filePath)
         {
-            return "-i " + (filePath.IsConcatFile() ? filePath.GetConcStr() : "") + filePath.Wrap();
+            return $"{(filePath.IsConcatFile() ? filePath.GetConcStr() : "")} -i {filePath.Wrap()}";
         }
 
         public static int CountOccurences (this List<string> list, string stringToLookFor)

ff-utils-winforms/Media/FfmpegOutputHandler.cs

@@ -103,7 +103,7 @@ static void UpdateFfmpegProgress(string ffmpegTime)
                 if (TrackList.current == null && overrideTargetDurationMs < 0)
                     return;
 
-                long currInDuration = overrideTargetDurationMs > 0 ? overrideTargetDurationMs : TrackList.current.File.DurationMs;
+                long currInDuration = overrideTargetDurationMs > 0 ? overrideTargetDurationMs : (TrackList.current != null ? TrackList.current.File.DurationMs : 0);
 
                 if (currInDuration < 1)
                 {
@@ -124,7 +124,7 @@ static void UpdateFfmpegProgress(string ffmpegTime)
 
         static bool HideMessage(string msg)
         {
-            string[] hiddenMsgs = new string[] { "can produce invalid output", "pixel format", "provided invalid", "Non-monotonous" };
+            string[] hiddenMsgs = new string[] { "can produce invalid output", "pixel format", "provided invalid", "Non-monotonous", "not enough frames to estimate rate", "invalid dropping", "message repeated" };
 
             foreach (string str in hiddenMsgs)
                 if (msg.MatchesWildcard($"*{str}*"))

ff-utils-winforms/UI/Tasks/UtilGetMetrics.cs

@@ -72,7 +72,7 @@ public static async Task Run(bool fixRate = true)
                     Logger.Log("Calculating SSIM...");
                     string select = subsample > 1 ? $"select=not(mod(n-1\\,{subsample}))," : "";
                     string args = $"{r} {vidLq.GetFfmpegInputArg()} {r} {vidHq.GetFfmpegInputArg()} -filter_complex {f}{select}ssim -f null -";
-                    string output = await AvProcess.GetFfmpegOutputAsync(args, false, true);
+                    string output = await AvProcess.RunFfmpeg(args, AvProcess.LogMode.OnlyLastLine, "info", true, true);
                     List<string> ssimLines = output.SplitIntoLines().Where(x => x.Contains("] SSIM ")).ToList();
 
                     if (ssimLines.Count < 1)
@@ -82,7 +82,7 @@ public static async Task Run(bool fixRate = true)
                     else
                     {
                         string scoreStr = ssimLines[0].Split(" All:").LastOrDefault();
-                        Logger.Log($"SSIM Score: {scoreStr}", false, ReplaceLastLine());
+                        Logger.Log($"SSIM Score: {scoreStr.Replace("inf", "Infinite")}", false, ReplaceLastLine());
                     }
                 }
 
@@ -91,7 +91,7 @@ public static async Task Run(bool fixRate = true)
                     Logger.Log("Calculating PSNR...");
                     string select = subsample > 1 ? $"select=not(mod(n-1\\,{subsample}))," : "";
                     string args = $"{r} {vidLq.GetFfmpegInputArg()} {r} {vidHq.GetFfmpegInputArg()} -filter_complex {f}{select}psnr -f null -";
-                    string output = await AvProcess.GetFfmpegOutputAsync(args, false, true);
+                    string output = await AvProcess.RunFfmpeg(args, AvProcess.LogMode.OnlyLastLine, "info", true, true);
                     List<string> psnrLines = output.SplitIntoLines().Where(x => x.Contains("] PSNR ")).ToList();
 
                     if (psnrLines.Count < 1)
@@ -101,7 +101,7 @@ public static async Task Run(bool fixRate = true)
                     else
                     {
                         string scoreStr = psnrLines[0].Split("average:").LastOrDefault().Split(' ')[0];
-                        Logger.Log($"PSNR Score: {scoreStr}", false, ReplaceLastLine());
+                        Logger.Log($"PSNR Score: {scoreStr.Replace("inf", "Infinite")}", false, ReplaceLastLine());
                     }
                 }
             }