Added av1an advanced encoder args grid, loaded from json for each encoder

Author: n00mkrad

ff-utils-winforms/Data/Codecs/Video/AomAv1.cs

@@ -40,6 +40,7 @@ public CodecArgs GetArgs(Dictionary<string, string> encArgs = null, MediaFile me
             string denoise = encArgs.ContainsKey("grainSynthDenoise") ? (encArgs["grainSynthDenoise"].GetBool() ? "1" : "0") : "0";
             string tiles = CodecUtils.GetTilingArgs(mediaFile.VideoStreams.FirstOrDefault().Resolution, "--tile-rows=", "--tile-columns=");
             string cust = encArgs.ContainsKey("custom") ? encArgs["custom"] : "";
+            string adv = encArgs.ContainsKey("advanced") ? encArgs["advanced"] : "";
             string colors = "";
 
             if(mediaFile != null && mediaFile.ColorData != null)
@@ -57,7 +58,7 @@ public CodecArgs GetArgs(Dictionary<string, string> encArgs = null, MediaFile me
                 $"--end-usage=q --cpu-used={preset} --cq-level={q} " +
                 $"--disable-kf --kf-min-dist=12 --kf-max-dist={g} " +
                 $"--enable-dnl-denoising={denoise} --denoise-noise-level={grain} " +
-                $"--enable-keyframe-filtering=0 {colors} --threads={thr} {tiles} {cust} \" --pix-format {pixFmt}");
+                $"{colors} --threads={thr} {tiles} {adv} {cust} \" --pix-format {pixFmt}");
         }
     }
 }

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

@@ -30,6 +30,7 @@ partial class MainForm
         public NumericUpDown av1anGrainSynthStrengthUpDown { get { return av1anGrainSynthStrength; } }
         public CheckBox av1anGrainSynthDenoiseBox { get { return av1anGrainSynthDenoise; } }
         public NumericUpDown av1anThreadsUpDown { get { return av1anThreads; } }
+        public DataGridView Av1anAdvancedArgsGrid { get { return av1anAdvancedArgsGrid; } }
 
 
         public ComboBox av1anAudCodecBox { get { return av1anAudCodec; } }

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

@@ -120,9 +120,10 @@
   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
+  <data name="label52.Text" xml:space="preserve">
+    <value>Here you can modify more advanced encoder settings. If a field is too small, hover over it to show the full text.
+Cells in the "Value" column can be edited by either pressing F2 or typing while a cell is selected.</value>
+  </data>
   <metadata name="checkItemsContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>107, 17</value>
   </metadata>
@@ -133,7 +134,7 @@
   <data name="runBtn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADAAAAAgCAYAAABU1PscAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAOZJREFUWEftl7ENwjAQRSNR0cIAjMAO7EDBFoyQji3YgiWyAhNQ01EQ3pfPHUIY
+        wAAADsABataJCQAAAOZJREFUWEftl7ENwjAQRSNR0cIAjMAO7EDBFoyQji3YgiWyAhNQ01EQ3pfPHUIY
         nMQHftJXFOd8+l9KHLupVH6Evu9bJFob8oWMB/81wHNovEQzu82OjMu9rjaUFxpvUYfWNpQVGUdi0ADi
         hg5obo+yQL/RAkTOaGOPv4ZeowcQd3RECyv7GHpMEiByQTtk1ekwd9IAkRNa2ZQkmFdEAHFFe5S05FJf
         TIBI0pJLbXEBxNtLLjU1wEto/DevkOuP2O0y6vZH5nor4XYz53o77fpA4/tIOTQyHvzXANMg48G/0wAV

ff-utils-winforms/Forms/MainForm.resx

@@ -50,7 +50,7 @@ public static async Task RunResumeWithNewArgs(string sourceFile, string override
 
         public static async Task Run(bool resume = false, string overrideTempDir = "", string overrideArgs = "")
         {
-            if (TrackList.current.File.IsDirectory)
+            if (overrideTempDir == "" && TrackList.current.File.IsDirectory)
             {
                 RunTask.Cancel("Av1an cannot use image sequence inputs!");
                 return;

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

@@ -1,4 +1,5 @@
-using Nmkoder.Data;
+using Newtonsoft.Json;
+using Nmkoder.Data;
 using Nmkoder.Data.Codecs;
 using Nmkoder.Data.Streams;
 using Nmkoder.Data.Ui;
@@ -98,6 +99,7 @@ public static void VidEncoderSelected(int index)
             LoadQualityLevel(enc);
             LoadPresets(enc);
             LoadColorFormats(enc);
+            LoadAdvancedArgsGrid(enc);
         }
 
         public static void AudEncoderSelected(int index)
@@ -171,6 +173,48 @@ static void LoadColorFormats(IEncoder enc)
                 form.av1anColorsBox.SelectedIndex = enc.ColorFormatDefault; // Select default pix_fmt
         }
 
+        public static void LoadAdvancedArgsGrid(IEncoder enc)
+        {
+            string jsonPath = Path.Combine(Paths.GetDataPath(), "encoderArgs", enc.Name + ".json");
+
+            DataGridView grid = Program.mainForm.Av1anAdvancedArgsGrid;
+            grid.Rows.Clear();
+
+            if (!File.Exists(jsonPath))
+                return;
+
+            if (grid.Columns.Count != 3)
+            {
+                grid.Columns.Clear();
+                grid.Columns.Add("0", "Argument");
+                grid.Columns.Add("1", "Value");
+                grid.Columns.Add("2", "Description, Possible Values");
+            }
+
+            List<string[]> args = new List<string[]>();
+            try
+            {
+                args = JsonConvert.DeserializeObject<List<string[]>>(File.ReadAllText(jsonPath));
+            }
+            catch(Exception e)
+            {
+                Logger.Log($"Error loading advanced arg JSON: {e.Message}");
+                args = new List<string[]>();
+            }
+
+            foreach(string[] arg in args)
+                grid.Rows.Add(arg[0], arg[1], arg[2]);
+
+            grid.RowHeadersVisible = false;
+            grid.Columns[0].ReadOnly = true;
+            grid.Columns[2].ReadOnly = true;
+            grid.Columns.Cast<DataGridViewColumn>().ToList().ForEach(x => x.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill);
+            grid.Columns.Cast<DataGridViewColumn>().ToList().ForEach(x => x.SortMode = DataGridViewColumnSortMode.NotSortable);
+            grid.Columns[0].FillWeight = 25;
+            grid.Columns[1].FillWeight = 20;
+            grid.Columns[2].FillWeight = 55;
+        }
+
         #endregion
 
         #region Get Current Codec
@@ -187,6 +231,8 @@ public static CodecUtils.AudioCodec GetCurrentCodecA()
 
         #endregion
 
+        #region Get Args From UI
+
         public static Dictionary<string, string> GetVideoArgsFromUi()
         {
             Dictionary<string, string> dict = new Dictionary<string, string>();
@@ -198,6 +244,7 @@ public static Dictionary<string, string> GetVideoArgsFromUi()
             dict.Add("grainSynthDenoise", form.av1anGrainSynthDenoiseBox.Checked.ToString());
             dict.Add("threads", form.av1anThreadsUpDown.Value.ToString());
             dict.Add("custom", form.av1anCustomEncArgsBox.Text);
+            dict.Add("advanced", string.Join(" ", form.Av1anAdvancedArgsGrid.Rows.Cast<DataGridViewRow>().Select(x => $"--{x.Cells[0].Value}={x.Cells[1].Value}")));
             return dict;
         }
 
@@ -209,6 +256,8 @@ public static Dictionary<string, string> GetAudioArgsFromUi()
             return dict;
         }
 
+        #endregion
+
         #region Get Args
 
         public static async Task<string> GetVideoFilterArgs(CodecArgs codecArgs = null)
@@ -252,14 +301,7 @@ public static async Task<string> GetVideoFilterArgs(CodecArgs codecArgs = null)
 
         public static string GetSplittingMethodArgs()
         {
-            string s = "";
-
-            if (form.av1anOptsSplitModeBox.SelectedIndex == 0)
-                s = $"none";
-            else
-                s = $"av-scenechange";
-
-            return $"--split-method {s}";
+            return $"--split-method {(form.av1anOptsSplitModeBox.SelectedIndex == 0 ? "none" : "av-scenechange")}";
         }
 
         public static string GetChunkGenMethod()
@@ -300,6 +342,7 @@ public static string GetOutPath()
 
         #endregion
 
+
         public static void ValidateContainer()
         {
             if (form.av1anContainerBox.SelectedIndex < 0)