Always use 2-Pass for libvpx-vp9, even with CRF

n00mkrad · n00mkrad · commit 6c3ffb0af93d · 2021-11-24T11:39:02.000+01:00
diff --git a/ff-utils-winforms/Data/Codecs/Audio/Aac.cs b/ff-utils-winforms/Data/Codecs/Audio/Aac.cs
@@ -21,7 +21,8 @@ class Aac : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Audio/CopyAudio.cs b/ff-utils-winforms/Data/Codecs/Audio/CopyAudio.cs
@@ -22,7 +22,8 @@ class CopyAudio : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = true;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = true;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Audio/Flac.cs b/ff-utils-winforms/Data/Codecs/Audio/Flac.cs
@@ -21,7 +21,8 @@ class Flac : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Audio/Mp3.cs b/ff-utils-winforms/Data/Codecs/Audio/Mp3.cs
@@ -21,7 +21,8 @@ class Mp3 : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Audio/Opus.cs b/ff-utils-winforms/Data/Codecs/Audio/Opus.cs
@@ -21,7 +21,8 @@ class Opus : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Audio/StripAudio.cs b/ff-utils-winforms/Data/Codecs/Audio/StripAudio.cs
@@ -22,7 +22,8 @@ class StripAudio : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = true;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = true;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Audio/Vorbis.cs b/ff-utils-winforms/Data/Codecs/Audio/Vorbis.cs
@@ -21,6 +21,7 @@ class Vorbis : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
+        public bool ForceTwoPass { get; } = false;
         public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
diff --git a/ff-utils-winforms/Data/Codecs/IEncoder.cs b/ff-utils-winforms/Data/Codecs/IEncoder.cs
@@ -24,6 +24,7 @@ interface IEncoder
         string PresetInfo { get; }
 
         bool SupportsTwoPass { get; }
+        bool ForceTwoPass { get; }
         bool DoesNotEncode { get; }
         bool IsFixedFormat { get; }
         bool IsSequence { get; }
diff --git a/ff-utils-winforms/Data/Codecs/Subs/CopySubs.cs b/ff-utils-winforms/Data/Codecs/Subs/CopySubs.cs
@@ -22,7 +22,8 @@ class CopySubs : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = true;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = true;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Subs/MovText.cs b/ff-utils-winforms/Data/Codecs/Subs/MovText.cs
@@ -20,7 +20,8 @@ class MovText : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Subs/Srt.cs b/ff-utils-winforms/Data/Codecs/Subs/Srt.cs
@@ -20,7 +20,8 @@ class Srt : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Subs/StripSubs.cs b/ff-utils-winforms/Data/Codecs/Subs/StripSubs.cs
@@ -22,7 +22,8 @@ class StripSubs : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = true;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = true;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Subs/WebVtt.cs b/ff-utils-winforms/Data/Codecs/Subs/WebVtt.cs
@@ -20,7 +20,8 @@ class WebVtt : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/AomAv1.cs b/ff-utils-winforms/Data/Codecs/Video/AomAv1.cs
@@ -22,7 +22,8 @@ class AomAv1 : IEncoder
         public string PresetInfo { get; } = "Lower = Better compression";
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/CopyVideo.cs b/ff-utils-winforms/Data/Codecs/Video/CopyVideo.cs
@@ -22,7 +22,8 @@ class CopyVideo : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = true;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = true;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/Gif.cs b/ff-utils-winforms/Data/Codecs/Video/Gif.cs
@@ -20,7 +20,8 @@ class Gif : IEncoder
         public string PresetInfo { get; } = "Higher = Better compression";
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = true;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/H264Nvenc.cs b/ff-utils-winforms/Data/Codecs/Video/H264Nvenc.cs
@@ -23,7 +23,8 @@ class H264Nvenc : IEncoder
         public string PresetInfo { get; } = "Higher = Better compression";
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/H265Nvenc.cs b/ff-utils-winforms/Data/Codecs/Video/H265Nvenc.cs
@@ -12,7 +12,7 @@ class H265Nvenc : IEncoder
         public string FriendlyName { get; } = "H.265 / HEVC (NVIDIA NVENC)";
         public string[] Presets { get; } = new string[] { "p7", "p6", "p5", "p4", "p3", "p2", "p1" };
         public int PresetDefault { get; } = 0;
-        public string[] ColorFormats  { get; } = new string[] { "yuv420p", "yuv444p", "yuv444p16le" };
+        public string[] ColorFormats { get; } = new string[] { "yuv420p", "yuv444p", "yuv444p16le" };
         public int ColorFormatDefault { get; } = 0;
         public int QMin { get; } = 0;
         public int QMax { get; } = 51;
@@ -21,7 +21,8 @@ class H265Nvenc : IEncoder
         public string PresetInfo { get; } = "Higher = Better compression";
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/Jpg.cs b/ff-utils-winforms/Data/Codecs/Video/Jpg.cs
@@ -20,7 +20,8 @@ class Jpg : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = true;
         public bool IsSequence { get; } = true;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/LibAomAv1.cs b/ff-utils-winforms/Data/Codecs/Video/LibAomAv1.cs
@@ -21,6 +21,7 @@ class LibAomAv1 : IEncoder
         public string PresetInfo { get; } = "Lower = Better compression";
 
         public bool SupportsTwoPass { get; } = true;
+        public bool ForceTwoPass { get; } = false;
         public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
diff --git a/ff-utils-winforms/Data/Codecs/Video/LibSvtAv1.cs b/ff-utils-winforms/Data/Codecs/Video/LibSvtAv1.cs
@@ -22,7 +22,8 @@ class LibSvtAv1 : IEncoder
         public string PresetInfo { get; } = "Lower = Better compression";
 
         public bool SupportsTwoPass { get; } = true;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/LibVpx.cs b/ff-utils-winforms/Data/Codecs/Video/LibVpx.cs
@@ -22,7 +22,8 @@ class LibVpx : IEncoder
         public string PresetInfo { get; } = "Higher = Better compression";
 
         public bool SupportsTwoPass { get; } = true;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = true;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/Libx264.cs b/ff-utils-winforms/Data/Codecs/Video/Libx264.cs
@@ -21,7 +21,8 @@ class Libx264 : IEncoder
         public string PresetInfo { get; } = "Slower = Better compression";
 
         public bool SupportsTwoPass { get; } = true;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/Libx265.cs b/ff-utils-winforms/Data/Codecs/Video/Libx265.cs
@@ -20,7 +20,8 @@ class Libx265 : IEncoder
         public string PresetInfo { get; } = "Slower = Better compression";
 
         public bool SupportsTwoPass { get; } = true;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/Png.cs b/ff-utils-winforms/Data/Codecs/Video/Png.cs
@@ -20,7 +20,8 @@ class Png : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = true;
         public bool IsSequence { get; } = true;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/StripVideo.cs b/ff-utils-winforms/Data/Codecs/Video/StripVideo.cs
@@ -22,7 +22,8 @@ class StripVideo : IEncoder
         public string PresetInfo { get; }
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = true;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = true;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/SvtAv1.cs b/ff-utils-winforms/Data/Codecs/Video/SvtAv1.cs
@@ -22,7 +22,8 @@ class SvtAv1 : IEncoder
         public string PresetInfo { get; } = "Lower = Better compression";
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/Vpx.cs b/ff-utils-winforms/Data/Codecs/Video/Vpx.cs
@@ -22,7 +22,8 @@ class Vpx : IEncoder
         public string PresetInfo { get; } = "Lower = Better compression";
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/Data/Codecs/Video/X265.cs b/ff-utils-winforms/Data/Codecs/Video/X265.cs
@@ -20,7 +20,8 @@ class X265 : IEncoder
         public string PresetInfo { get; } = "Slower = Better compression";
 
         public bool SupportsTwoPass { get; } = false;
-		public bool DoesNotEncode { get; } = false;
+        public bool ForceTwoPass { get; } = false;
+        public bool DoesNotEncode { get; } = false;
         public bool IsFixedFormat { get; } = false;
         public bool IsSequence { get; } = false;
 
diff --git a/ff-utils-winforms/UI/Tasks/QuickConvert.cs b/ff-utils-winforms/UI/Tasks/QuickConvert.cs
@@ -22,18 +22,18 @@ public static void Init()
             QuickConvertUi.Init();
         }
 
-        public static async Task Run ()
+        public static async Task Run()
         {
             Program.mainForm.SetWorking(true);
             string args = "";
-            
+
             try
             {
                 IEncoder vCodec = CodecUtils.GetCodec(GetCurrentCodecV());
                 CodecUtils.AudioCodec aCodec = GetCurrentCodecA();
                 CodecUtils.SubtitleCodec sCodec = GetCurrentCodecS();
                 bool crf = (QualityMode)Program.mainForm.encQualModeBox.SelectedIndex == QualityMode.Crf;
-                bool twoPass = vCodec.SupportsTwoPass && !crf;
+                bool twoPass = vCodec.SupportsTwoPass && (vCodec.ForceTwoPass || !crf);
                 Dictionary<string, string> videoArgs = vCodec.DoesNotEncode ? new Dictionary<string, string>() : GetVideoArgsFromUi(!crf);
 
                 string inFiles = TrackList.GetInputFilesString();
@@ -46,7 +46,7 @@ public static async Task Run ()
                 string custOut = Program.mainForm.customArgsOutBox.Text.Trim();
                 string muxing = GetMuxingArgsFromUi();
 
-                if(twoPass)
+                if (twoPass)
                 {
                     CodecArgs codecArgsPass1 = vCodec.GetArgs(videoArgs, TrackList.current.File, Pass.OneOfTwo);
                     string v1 = codecArgsPass1.Arguments;
@@ -67,7 +67,7 @@ public static async Task Run ()
                     args = $"{custIn} {inFiles} {map} {v} {vf} {a} {s} {meta} {custOut} {muxing} {outPath.Wrap()}";
                 }
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 Logger.Log($"Error creating FFmpeg command: {e.Message}\n{e.StackTrace}");
                 return;
