commit 6248d07411e78a3ec643edc8723289dced42b546
author Jingning Han <jingning@google.com> Mon Jan 09 16:57:03 2023 -0800
committer Jingning Han <jingning@google.com> Tue Jan 10 10:14:13 2023 -0800
tree 4769e91566de6791fb7ac04a9563cdfb93b31a7b
parent 5c993fa47afc3867f5834106c7b32fb5a16631d6

Align the multiplier for ARFs in two-pass TPL

Use the same rd multiplier for the ARFs in the two passes. This
slightly improves the coding performance in the range of 0.5%.

Change-Id: I96360b2d278836e7ac4155a17aa668b75aa7e754

av1/qmode_rc/ratectrl_qmode.cc

diff --git a/av1/qmode_rc/ratectrl_qmode.cc b/av1/qmode_rc/ratectrl_qmode.cc
index d87b32a..c989116 100644
--- a/av1/qmode_rc/ratectrl_qmode.cc
+++ b/av1/qmode_rc/ratectrl_qmode.cc
@@ -1718,17 +1718,12 @@
     param.q_index = base_q_index;
     param.rdmult = av1_compute_rd_mult_based_on_qindex(AOM_BITS_8, LF_UPDATE,
                                                        base_q_index);
-    // TODO(jingning): gop_frame is needed in two pass tpl later.
-    (void)gop_frame;
-
-    if (rc_param_.tpl_pass_index) {
-      if (gop_frame.update_type == GopFrameType::kRegularGolden ||
-          gop_frame.update_type == GopFrameType::kRegularKey ||
-          gop_frame.update_type == GopFrameType::kRegularArf) {
-        param.q_index = kSecondTplPassQp;
-        param.rdmult = av1_compute_rd_mult_based_on_qindex(
-            AOM_BITS_8, ARF_UPDATE, param.q_index);
-      }
+    if (gop_frame.update_type == GopFrameType::kRegularGolden ||
+        gop_frame.update_type == GopFrameType::kRegularKey ||
+        gop_frame.update_type == GopFrameType::kRegularArf) {
+      if (rc_param_.tpl_pass_index) param.q_index = kSecondTplPassQp;
+      param.rdmult = av1_compute_rd_mult_based_on_qindex(AOM_BITS_8, ARF_UPDATE,
+                                                         kSecondTplPassQp);
     }
     gop_encode_info.param_list.push_back(param);
   }