Save av1an config on application close, implement --chunk-order GUI

Author: n00mkrad

ff-utils-winforms/Forms/MainForm.Av1an.cs

@@ -42,6 +42,7 @@ partial class MainForm
         public ComboBox av1anOptsSplitModeBox { get { return av1anOptsSplitMode; } }
         public ComboBox av1anOptsChunkModeBox { get { return av1anOptsChunkMode; } }
         public ComboBox av1anOptsConcatModeBox { get { return av1anOptsConcatMode; } }
+        public ComboBox av1anOptsChunkOrderBox { get { return av1anOptsChunkOrder; } }
         public NumericUpDown av1anOptsWorkerCountUpDown { get { return av1anOptsWorkerCount; } }
 
         public void InitAv1an()
@@ -85,6 +86,7 @@ public void LoadConfigAv1an()
             ConfigParser.LoadComboxIndex(av1anAudCodec);
             ConfigParser.LoadComboxIndex(av1anOptsChunkMode);
             ConfigParser.LoadComboxIndex(av1anOptsConcatMode);
+            ConfigParser.LoadComboxIndex(av1anOptsChunkOrder);
             ConfigParser.LoadGuiElement(av1anOptsWorkerCount, false);
             ConfigParser.LoadGuiElement(av1anThreads, false);
         }
@@ -99,6 +101,7 @@ public void SaveConfigAv1an(object sender = null, EventArgs e = null)
             ConfigParser.SaveComboxIndex(av1anAudCodec);
             ConfigParser.SaveComboxIndex(av1anOptsChunkMode);
             ConfigParser.SaveComboxIndex(av1anOptsConcatMode);
+            ConfigParser.SaveComboxIndex(av1anOptsChunkOrder);
             ConfigParser.SaveGuiElement(av1anOptsWorkerCount);
             ConfigParser.SaveGuiElement(av1anThreads);
         }

ff-utils-winforms/Forms/MainForm.Designer.cs

@@ -91,6 +91,7 @@ private async void MainForm_Shown(object sender, EventArgs e)
         private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
         {
             SaveConfig();
+            SaveConfigAv1an();
 
             if (Keyboard.Modifiers == System.Windows.Input.ModifierKeys.Shift)
             {

ff-utils-winforms/Forms/MainForm.cs

@@ -71,12 +71,13 @@ public static async Task Run(bool resume = false, string overrideTempDir = "", s
                     string vf = await GetVideoFilterArgs(codecArgs);
                     string a = CodecUtils.GetCodec(aCodec).GetArgs(GetAudioArgsFromUi()).Arguments;
                     string w = Program.mainForm.av1anOptsWorkerCountUpDown.Value.ToString();
-                    string s = GetSplittingMethod();
+                    string s = GetSplittingMethodArgs();
                     string m = GetChunkGenMethod();
-                    string c = GetConcatMethod();
-                    string thr = Program.mainForm.av1anThreadsUpDown.Value.ToString();
+                    string c = GetConcatMethodArgs();
+                    string o = GetChunkOrderArgs();
+                    string thr = GetThreadAffArgs(); 
 
-                    args = $"-i {inPath.Wrap()} -y --verbose --keep --split-method {s} -m {m} -c {c} --set-thread-affinity {thr} {GetScDownscaleArg()} {cust} {v} -f \" {vf} \" -a \" {a} \" -w {w} -o {outPath.Wrap()}";
+                    args = $"-i {inPath.Wrap()} -y --verbose --keep {s} {m} {c} {thr} {GetScDownscaleArg()} {cust} {v} -f \" {vf} \" -a \" {a} \" -w {w} -o {outPath.Wrap()}";
 
                     if (vmaf)
                     {

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

@@ -250,17 +250,21 @@ public static async Task<string> GetVideoFilterArgs(CodecArgs codecArgs = null)
                 return "";
         }
 
-        public static string GetSplittingMethod()
+        public static string GetSplittingMethodArgs()
         {
+            string s = "";
+
             if (form.av1anOptsSplitModeBox.SelectedIndex == 0)
-                return $"none";
+                s = $"none";
             else
-                return $"av-scenechange";
+                s = $"av-scenechange";
+
+            return $"--split-method {s}";
         }
 
         public static string GetChunkGenMethod()
         {
-            return form.av1anOptsChunkModeBox.Text.ToLower().Trim();
+            return $"-m {form.av1anOptsChunkModeBox.Text.ToLower().Trim()}";
 
             // switch (form.av1anOptsChunkModeBox.SelectedIndex)
             // {
@@ -274,9 +278,19 @@ public static string GetChunkGenMethod()
             // return "";
         }
 
-        public static string GetConcatMethod()
+        public static string GetConcatMethodArgs()
+        {
+            return $"-c {form.av1anOptsConcatModeBox.Text.ToLower().Trim()}";
+        }
+
+        public static string GetChunkOrderArgs()
+        {
+            return $"--chunk-order {form.av1anOptsChunkOrderBox.Text.Split('(')[0].ToLower().Trim()}";
+        }
+
+        public static string GetThreadAffArgs()
         {
-            return form.av1anOptsConcatModeBox.Text.ToLower().Trim();
+            return $"--set-thread-affinity {form.av1anThreadsUpDown.Value}";
         }
 
         public static string GetOutPath()