Added button to sort tracks by lang/title/codec, ommit encoder args for stream types if none of that type are mapped

n00mkrad · n00mkrad · commit fb98918863dd · 2022-02-02T19:55:15.000+01:00
diff --git a/ff-utils-winforms/Forms/MainForm.Designer.cs b/ff-utils-winforms/Forms/MainForm.Designer.cs
diff --git a/ff-utils-winforms/Forms/MainForm.StreamList.cs b/ff-utils-winforms/Forms/MainForm.StreamList.cs
@@ -122,6 +122,8 @@ private void streamList_Leave(object sender, EventArgs e)
             QuickConvertUi.LoadMetadataGrid();
         }
 
+        #region Move Buttons
+
         private void trackListMoveUpBtn_Click(object sender, EventArgs e)
         {
             UiUtils.MoveListViewItem(streamList, UiUtils.MoveDirection.Up);
@@ -132,6 +134,10 @@ private void trackListMoveDownBtn_Click(object sender, EventArgs e)
             UiUtils.MoveListViewItem(streamList, UiUtils.MoveDirection.Down);
         }
 
+        #endregion
+
+        #region Auto-Check
+
         private void trackListCheckTracksBtn_Click(object sender, EventArgs e)
         {
             checkItemsContextMenu.Show(Cursor.Position);
@@ -176,5 +182,46 @@ private void checkFirstTrackOfEachLanguagePerTypeToolStripMenuItem_Click(object
         {
             TrackList.CheckFirstOfEachLangOfEachType();
         }
+
+        #endregion
+
+        #region Sort
+
+        private void trackListSortTracksBtn_Click(object sender, EventArgs e)
+        {
+            sortTracksContextMenu.Show(Cursor.Position);
+        }
+
+        private void sortTracksByLanguageAZToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            TrackList.SortTracks(TrackList.TrackSort.Language, false);
+        }
+
+        private void sortTracksByLanguageZAToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            TrackList.SortTracks(TrackList.TrackSort.Language, true);
+        }
+
+        private void sortTracksByTitleAZToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            TrackList.SortTracks(TrackList.TrackSort.Title, false);
+        }
+
+        private void sortTracksByTitleZAToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            TrackList.SortTracks(TrackList.TrackSort.Title, true);
+        }
+
+        private void sortTracksByCodecAZToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            TrackList.SortTracks(TrackList.TrackSort.Codec, false);
+        }
+
+        private void sortTracksByCodecZAToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            TrackList.SortTracks(TrackList.TrackSort.Codec, true);
+        }
+
+        #endregion
     }
 }
diff --git a/ff-utils-winforms/Forms/MainForm.resx b/ff-utils-winforms/Forms/MainForm.resx
@@ -124,6 +124,9 @@
     <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="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="checkItemsContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>107, 17</value>
   </metadata>
@@ -134,13 +137,16 @@ Cells in the "Value" column can be edited by either pressing F2 or typing while
   <data name="runBtn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADAAAAAgCAYAAABU1PscAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAAOZJREFUWEftl7ENwjAQRSNR0cIAjMAO7EDBFoyQji3YgiWyAhNQ01EQ3pfPHUIY
+        vAAADrwBlbxySQAAAOZJREFUWEftl7ENwjAQRSNR0cIAjMAO7EDBFoyQji3YgiWyAhNQ01EQ3pfPHUIY
         nMQHftJXFOd8+l9KHLupVH6Evu9bJFob8oWMB/81wHNovEQzu82OjMu9rjaUFxpvUYfWNpQVGUdi0ADi
         hg5obo+yQL/RAkTOaGOPv4ZeowcQd3RECyv7GHpMEiByQTtk1ekwd9IAkRNa2ZQkmFdEAHFFe5S05FJf
         TIBI0pJLbXEBxNtLLjU1wEto/DevkOuP2O0y6vZH5nor4XYz53o77fpA4/tIOTQyHvzXANMg48G/0wAV
         nzTNA2Frs24HzQdqAAAAAElFTkSuQmCC
 </value>
   </data>
+  <metadata name="sortTracksContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>463, 23</value>
+  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAA0AAAAAAAEAIAAFnQAA1gAAAICAAAABACAAKAgBANudAACAgAAAAQAIAChMAAADpgEAQEAAAAEA
diff --git a/ff-utils-winforms/Media/FfmpegUtils.cs b/ff-utils-winforms/Media/FfmpegUtils.cs
@@ -201,7 +201,7 @@ public static async Task<string> GetCurrentAutoCrop(string path, bool quiet)
             string mostCommon = detectedCrops.GroupBy(i => i).OrderByDescending(grp => grp.Count()).Select(grp => grp.Key).First();
             string largest = detectedCrops.First();
             int commonCertainty = (((float)detectedCrops.CountOccurences(mostCommon) / (float)detectedCrops.Count) * 100f).RoundToInt();
-            string chosen = commonCertainty > 85 ? mostCommon : largest; // Use most common if it's >85% common, otherwise use largest to be safe (thanks Nolan)
+            string chosen = commonCertainty > 80 ? mostCommon : largest; // Use most common if it's >80% common, otherwise use largest to be safe (thanks Nolan)
             Logger.Log($"GetCurrentAutoCrop - Largest: {largest} - Smallest: {detectedCrops.Last()} - Most Common: {mostCommon} ({commonCertainty}%) - Chosen: {chosen} [T = {sw}]", true);
             string[] cropVals = chosen.Split(':');
             bool repl = Logger.LastUiLine.Contains(msg);
diff --git a/ff-utils-winforms/UI/Tasks/Av1an.cs b/ff-utils-winforms/UI/Tasks/Av1an.cs
@@ -99,7 +99,7 @@ public static async Task Run(bool resume = false, string overrideTempDir = "", s
                     }
 
                     int totalThreads = w.GetInt() * thr.GetInt();
-                    Logger.Log($"Using {w} workers with {thr} threads each = {totalThreads} threads total. {(totalThreads <= Environment.ProcessorCount ? "Thread pinning enabled." : "")}");
+                    Logger.Log($"Using {w} workers with {thr.GetInt()} threads each = {totalThreads} threads total. {(totalThreads <= Environment.ProcessorCount ? "Thread pinning enabled." : "")}");
                 }
                 else
                 {
diff --git a/ff-utils-winforms/UI/Tasks/QuickConvert.cs b/ff-utils-winforms/UI/Tasks/QuickConvert.cs
@@ -2,9 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 using System.Windows.Input;
 using Nmkoder.Data;
 using Nmkoder.Data.Codecs;
+using Nmkoder.Data.Ui;
 using Nmkoder.Extensions;
 using Nmkoder.Forms;
 using Nmkoder.IO;
@@ -35,14 +37,16 @@ public static async Task Run()
                 IEncoder vCodec = CodecUtils.GetCodec(GetCurrentCodecV());
                 CodecUtils.AudioCodec aCodec = GetCurrentCodecA();
                 CodecUtils.SubtitleCodec sCodec = GetCurrentCodecS();
+                bool anyVideoStreams = Program.mainForm.streamList.CheckedItems.Cast<ListViewItem>().Where(x => ((MediaStreamListEntry)x.Tag).Stream.Type == Data.Streams.Stream.StreamType.Video).Count() > 0;
+                bool anyAudioStreams = Program.mainForm.streamList.CheckedItems.Cast<ListViewItem>().Where(x => ((MediaStreamListEntry)x.Tag).Stream.Type == Data.Streams.Stream.StreamType.Audio).Count() > 0;
                 bool crf = (QualityMode)Program.mainForm.encQualModeBox.SelectedIndex == QualityMode.Crf;
-                bool twoPass = vCodec.SupportsTwoPass && (vCodec.ForceTwoPass || !crf);
+                bool twoPass = anyVideoStreams && vCodec.SupportsTwoPass && (vCodec.ForceTwoPass || !crf);
                 Dictionary<string, string> videoArgs = vCodec.DoesNotEncode ? new Dictionary<string, string>() : GetVideoArgsFromUi(!crf);
 
                 string inFiles = TrackList.GetInputFilesString();
                 string outPath = GetOutPath(vCodec);
                 string map = TrackList.GetMapArgs();
-                string a = CodecUtils.GetCodec(aCodec).GetArgs(GetAudioArgsFromUi(), TrackList.current.File).Arguments;
+                string a = anyAudioStreams ? CodecUtils.GetCodec(aCodec).GetArgs(GetAudioArgsFromUi(), TrackList.current.File).Arguments : "";
                 string s = CodecUtils.GetCodec(sCodec).GetArgs().Arguments;
                 string meta = GetMetadataArgs();
                 string custIn = Program.mainForm.customArgsInBox.Text.Trim();
@@ -64,8 +68,8 @@ public static async Task Run()
                 else
                 {
                     CodecArgs codecArgs = vCodec.GetArgs(videoArgs, TrackList.current.File, Pass.OneOfOne);
-                    string v = codecArgs.Arguments;
-                    string vf = vCodec.DoesNotEncode ? "" : await GetVideoFilterArgs(vCodec, codecArgs);
+                    string v = anyVideoStreams ? codecArgs.Arguments : "";
+                    string vf = anyVideoStreams && !vCodec.DoesNotEncode ? await GetVideoFilterArgs(vCodec, codecArgs) : "";
 
                     args = $"{custIn} {inFiles} {map} {v} {vf} {a} {s} {meta} {custOut} {muxing} {outPath.Wrap()}";
                 }
diff --git a/ff-utils-winforms/UI/TrackList.cs b/ff-utils-winforms/UI/TrackList.cs
@@ -335,5 +335,38 @@ public static void CheckFirstOfEachLangOfEachType()
         }
 
         #endregion
+
+        #region Sort Tracks
+
+        public enum TrackSort { Language, Title, Codec }
+
+        public static void SortTracks(TrackSort sort, bool reverse)
+        {
+            ListView list = Program.mainForm.streamList;
+            List<ListViewItem> itemsCopy = new List<ListViewItem>(list.Items.Cast<ListViewItem>());
+            Program.mainForm.ignoreStreamListCheck = true;
+            list.Items.Clear();
+            List<Stream.StreamType> streamTypes = itemsCopy.Select(x => ((MediaStreamListEntry)x.Tag).Stream.Type).Distinct().ToList();
+
+            foreach (Stream.StreamType streamType in streamTypes)
+            {
+                var items = itemsCopy.Where(x => ((MediaStreamListEntry)x.Tag).Stream.Type == streamType);
+                var sorted = new List<ListViewItem>();
+
+                if(sort == TrackSort.Language)
+                    sorted = items.OrderBy(x => ((MediaStreamListEntry)x.Tag).Stream.Language).ToList();
+                else if (sort == TrackSort.Title)
+                    sorted = items.OrderBy(x => ((MediaStreamListEntry)x.Tag).Stream.Title).ToList();
+                else if (sort == TrackSort.Codec)
+                    sorted = items.OrderBy(x => ((MediaStreamListEntry)x.Tag).Stream.Codec).ToList();
+
+                list.Items.AddRange(reverse ? sorted.AsEnumerable().Reverse().ToArray() : sorted.ToArray());
+            }
+
+            Program.mainForm.ignoreStreamListCheck = false;
+            Program.mainForm.OnCheckedStreamsChange();
+        }
+
+        #endregion
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public static async Task Run(bool resume = false, string overrideTempDir = "", s`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`int totalThreads = w.GetInt() * thr.GetInt();`
`102`		`- Logger.Log($"Using {w} workers with {thr} threads each = {totalThreads} threads total. {(totalThreads <= Environment.ProcessorCount ? "Thread pinning enabled." : "")}");`
	`102`	`+ Logger.Log($"Using {w} workers with {thr.GetInt()} threads each = {totalThreads} threads total. {(totalThreads <= Environment.ProcessorCount ? "Thread pinning enabled." : "")}");`
`103`	`103`	`}`
`104`	`104`	`else`
`105`	`105`	`{`