From 0dc9e0ba3c0bf456c2bb99ed33cb2cdcfceb22f9 Mon Sep 17 00:00:00 2001 From: N00MKRAD Date: Sun, 4 Apr 2021 12:21:58 +0200 Subject: [PATCH] Cleanup & UI changes --- Code/Form1.Designer.cs | 4 ++-- Code/Main/FrameOrder.cs | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Code/Form1.Designer.cs b/Code/Form1.Designer.cs index 8a016c1..b17ebbc 100644 --- a/Code/Form1.Designer.cs +++ b/Code/Form1.Designer.cs @@ -209,8 +209,8 @@ "WEBM Video (Google VP9)", "MOV Video (Apple ProRes)", "AVI Video (ffv1, huffyuv, rawvideo)", - "Animated GIF (Not recommended for more than 40 FPS)", - "Image Sequence"}); + "Animated GIF (Only supports up to 50 FPS)", + "Image Sequence (PNG)"}); this.outModeCombox.Location = new System.Drawing.Point(281, 157); this.outModeCombox.Name = "outModeCombox"; this.outModeCombox.Size = new System.Drawing.Size(400, 23); diff --git a/Code/Main/FrameOrder.cs b/Code/Main/FrameOrder.cs index 6473d5e..03d85af 100644 --- a/Code/Main/FrameOrder.cs +++ b/Code/Main/FrameOrder.cs @@ -123,16 +123,10 @@ namespace Flowframes.Main if (Interpolate.canceled) return; if (i >= frameFilesWithoutLast.Length) break; - // if (debug && i == startIndex) - // fileContent += $"# NEW THREAD - {startIndex} to {startIndex + count}\n"; - string inputFilenameNoExt = Path.GetFileNameWithoutExtension(frameFilesWithoutLast[i].Name); int dupesAmount = dupesDict.ContainsKey(inputFilenameNoExt) ? dupesDict[inputFilenameNoExt] : 0; bool discardThisFrame = (sceneDetection && i < frameFilesWithoutLast.Length && sceneFrames.Contains(Path.GetFileNameWithoutExtension(FrameRename.importFilenames[i + 1]))); // i+2 is in scene detection folder, means i+1 is ugly interp frame - // if (loopEnabled && i == (frameFiles.Length - 2)) // If loop is enabled, account for the extra frame for loop continuity - // interpFramesAmount *= 2; - for (int frm = 0; frm < interpFramesAmount; frm++) // Generate frames file lines { if (discardThisFrame) // If frame is scene cut frame