From b97889ca483b893153e10b36f0279079854cc5de Mon Sep 17 00:00:00 2001
From: N00MKRAD <login@nmkd.de>
Date: Tue, 11 May 2021 12:08:01 +0200
Subject: [PATCH] Better vk/ncnn logging

---
 Code/OS/AiProcess.cs | 17 ++++++++---------
 changelog.txt        | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Code/OS/AiProcess.cs b/Code/OS/AiProcess.cs
index 1095efa..4524f45 100644
--- a/Code/OS/AiProcess.cs
+++ b/Code/OS/AiProcess.cs
@@ -463,11 +463,10 @@ namespace Flowframes
                 InterpolateUtils.ShowMessage($"A python error occured during interpolation!\nCheck {logFilename} for details.\n\n{line}", "Error");
             }
 
-            if (!hasShownError && err && line.Contains("vk") && line.Contains(" failed"))
+            if (!hasShownError && err && line.MatchesWildcard("vk*Instance* failed"))
             {
                 hasShownError = true;
-                string dain = (Interpolate.current.ai.aiName == Networks.dainNcnn.aiName) ? "\n\nTry reducing the tile size in the AI settings." : "";
-                InterpolateUtils.ShowMessage($"A Vulkan error occured during interpolation!\n\n{line}{dain}", "Error");
+                InterpolateUtils.ShowMessage($"Vulkan failed to start up!\n\n{line}\n\nThis most likely means your GPU is not compatible.", "Error");
             }
 
             if (!hasShownError && err && line.Contains("vkAllocateMemory failed"))
@@ -478,18 +477,18 @@ namespace Flowframes
                 InterpolateUtils.ShowMessage($"Vulkan ran out of memory!\n\n{line}{msg}", "Error");
             }
 
-            if (!hasShownError && err && line.Contains("vkCreateInstance failed"))
-            {
-                hasShownError = true;
-                InterpolateUtils.ShowMessage($"Vulkan failed to start up!\n\n{line}\n\nThis most likely means your GPU is not compatible.", "Error");
-            }
-
             if (!hasShownError && err && line.Contains("invalid gpu device"))
             {
                 hasShownError = true;
                 InterpolateUtils.ShowMessage($"A Vulkan error occured during interpolation!\n\n{line}\n\nAre your GPU IDs set correctly?", "Error");
             }
 
+            if (!hasShownError && err && line.MatchesWildcard("vk* failed"))
+            {
+                hasShownError = true;
+                InterpolateUtils.ShowMessage($"A Vulkan error occured during interpolation!\n\n{line}", "Error");
+            }
+
             if (hasShownError)
                 Interpolate.Cancel();
 
diff --git a/changelog.txt b/changelog.txt
index e98f3a9..5e67278 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,17 @@
+Flowframes 1.25.2 Changelog:
+- Image Sequence will now be copied instead of re-encoded if they are compatible
+- Color space (and transfer function) will now be retained from the input video
+- Aspect ratio of input video will now be preserved (for non-square pixel videos)
+- Added "Debug Tools" window with a log viewer and a config editor tab
+- Interpolation will now pause, not cancel, when disk space is low
+- Existing output files now get renamed instead of overwritten if they already exist
+- Several processing functions now run in the background, so the UI no longer freezes
+- Fixed h265 CRF 0 not being lossless
+- Fixed critical bug where Auto-Encode ran too early, causing FFmpeg errors
+- Fixed bug where deduplicated videos would play too fast if JPEG frames are used
+- Fixed some cases where the program wouldn't launch because of undhandled errors
+
+
 Flowframes 1.25.1 Changelog:
 - Added a button to pause/resume the interpolation
 - Added AV1 codec support for MP4/MKV output