From 012a200ec4b4ae6fdf589101c1f7cd668d6fef1a Mon Sep 17 00:00:00 2001
From: zak <zakdjeb@gmail.com>
Date: Fri, 14 May 2021 12:56:56 -0400
Subject: [PATCH] Making aom+SVT-AV1 target_quality faster and SVT-AV1 fixes

---
 av1an/encoder/svtav1.py                |  6 +++---
 av1an/target_quality/target_quality.py | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/av1an/encoder/svtav1.py b/av1an/encoder/svtav1.py
index f1a06eb..f6b0566 100644
--- a/av1an/encoder/svtav1.py
+++ b/av1an/encoder/svtav1.py
@@ -13,7 +13,7 @@ class SvtAv1(Encoder):
         super(SvtAv1, self).__init__(
             encoder_bin="SvtAv1EncApp",
             encoder_help="SvtAv1EncApp --help",
-            default_args=["--preset", "4", "--rc", "0", "-q", "25"],
+            default_args=["--preset", "4","--keyint", "240", "--rc", "0", "--crf", "25"],
             default_passes=1,
             default_q_range=(15, 50),
             output_extension="ivf",
@@ -86,7 +86,7 @@ class SvtAv1(Encoder):
         :return: command with new cq value"""
         adjusted_command = command.copy()
 
-        i = list_index_of_regex(adjusted_command, r"(--qp|-q)")
+        i = list_index_of_regex(adjusted_command, r"(--qp|-q|--crf)")
 
         qp_file = chunk.make_q_file(chunk.per_frame_target_quality_q_list)
 
@@ -104,7 +104,7 @@ class SvtAv1(Encoder):
 
         adjusted_command = command.copy()
 
-        i = list_index_of_regex(adjusted_command, r"(--qp|-q)")
+        i = list_index_of_regex(adjusted_command, r"(--qp|-q|--crf)")
         adjusted_command[i + 1] = f"{q}"
 
         return adjusted_command
diff --git a/av1an/target_quality/target_quality.py b/av1an/target_quality/target_quality.py
index 7e79045..fa64056 100644
--- a/av1an/target_quality/target_quality.py
+++ b/av1an/target_quality/target_quality.py
@@ -82,7 +82,7 @@ class TargetQuality:
         vmaf_cq = []
         frames = chunk.frames
 
-        if self.probing_rate not in (1, 2):
+        if self.probing_rate not in (1, 2, 3):
             self.probing_rate = self.adapt_probing_rate(self.probing_rate, frames)
 
         if self.probes < 3:
@@ -399,11 +399,15 @@ class TargetQuality:
                 "--enable-order-hint=0",
                 "--enable-flip-idtx=0",
                 "--enable-dist-wtd-comp=0",
-                "--enable-rect-tx=0",
                 "--enable-interintra-wedge=0",
                 "--enable-onesided-comp=0",
                 "--enable-interintra-comp=0",
                 "--enable-global-motion=0",
+                "--enable-cdef=0",
+                "--max-reference-frames=3",
+                "--cdf-update-mode=2",
+                "--deltaq-mode=0",
+                "--sb-size=64",
                 "--min-partition-size=32",
                 "--max-partition-size=32",
             ]
@@ -470,14 +474,14 @@ class TargetQuality:
                 f"{n_threads}",
                 "--preset",
                 "8",
-                "-q",
+                "--keyint",
+                "240",
+                "--crf",
                 f"{q}",
                 "--tile-rows",
                 "1",
                 "--tile-columns",
                 "2",
-                "--hme",
-                "0",
                 "--pred-struct",
                 "0",
                 "--sg-filter-mode",
@@ -490,8 +494,6 @@ class TargetQuality:
                 "0",
                 "--mrp-level",
                 "0",
-                "--enable-tpl-la",
-                "0",
                 "--enable-mfmv",
                 "0",
                 "--enable-local-warp",
@@ -516,8 +518,6 @@ class TargetQuality:
                 "0",
                 "--compound",
                 "0",
-                "--use-default-me-hme",
-                "0",
                 "--ext-block",
                 "0",
                 "--hbd-md",