commit 7ae814b009979d09e1685a1eb8037776fbcc4d69
author Sarah Parker <sarahparker@google.com> Wed Jun 26 10:39:30 2019 -0700
committer Sarah Parker <sarahparker@google.com> Wed Jun 26 20:28:26 2019 +0000
tree aff224c3caf41f589ef16fce56ba86911ddff65a
parent 36c5acee67b6a851030823d5f7364fbcb7d7f297

Tune one pass kf boost

This gives about 1.45% gain on speed 0 and speed 1 lowres, 1 pass with
150 frames. This brings the difference between one and two pass to
6.4% in q mode.

STATS_CHANGED

Change-Id: Ib17974816c28581d5b859138539c445865022c22

av1/encoder/pass2_strategy.c

diff --git a/av1/encoder/pass2_strategy.c b/av1/encoder/pass2_strategy.c
index b49fb04..9d0f6e6 100644
--- a/av1/encoder/pass2_strategy.c
+++ b/av1/encoder/pass2_strategy.c
@@ -27,7 +27,7 @@
 #include "av1/encoder/ratectrl.h"
 #include "av1/encoder/use_flat_gop_model_params.h"
 
-#define DEFAULT_KF_BOOST 2000
+#define DEFAULT_KF_BOOST 2300
 #define DEFAULT_GF_BOOST 2000
 
 // Calculate an active area of the image that discounts formatting

av1/encoder/ratectrl.c

diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index ac66e15..55c5c62 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -1056,7 +1056,8 @@
     int delta_qindex;
     int qindex;
 
-    if (cpi->twopass.last_kfgroup_zeromotion_pct >= STATIC_MOTION_THRESH) {
+    if (oxcf->pass == 2 &&
+        cpi->twopass.last_kfgroup_zeromotion_pct >= STATIC_MOTION_THRESH) {
       qindex = AOMMIN(rc->last_kf_qindex, rc->last_boosted_qindex);
       active_best_quality = qindex;
       last_boosted_q = av1_convert_qindex_to_q(qindex, bit_depth);
@@ -1080,7 +1081,8 @@
     active_best_quality =
         get_kf_active_quality(rc, active_worst_quality, bit_depth);
 
-    if (cpi->twopass.kf_zeromotion_pct >= STATIC_KF_GROUP_THRESH) {
+    if (oxcf->pass == 2 &&
+        cpi->twopass.kf_zeromotion_pct >= STATIC_KF_GROUP_THRESH) {
       active_best_quality /= 3;
     }
 
@@ -1090,7 +1092,8 @@
     }
 
     // Make a further adjustment based on the kf zero motion measure.
-    q_adj_factor += 0.05 - (0.001 * (double)cpi->twopass.kf_zeromotion_pct);
+    if (oxcf->pass == 2)
+      q_adj_factor += 0.05 - (0.001 * (double)cpi->twopass.kf_zeromotion_pct);
 
     // Convert the adjustment factor to a qindex delta
     // on active_best_quality.
@@ -1422,11 +1425,10 @@
 int av1_rc_pick_q_and_bounds(AV1_COMP *cpi, int width, int height,
                              int *bottom_index, int *top_index) {
   int q;
-  // TODO(sarahparker) merge onepass vbr, keyframe and altref q computation
+  // TODO(sarahparker) merge onepass vbr and altref q computation
   // with two pass
   GF_GROUP *gf_group = &cpi->gf_group;
   if ((cpi->oxcf.rc_mode != AOM_Q ||
-       gf_group->update_type[gf_group->index] == KF_UPDATE ||
        gf_group->update_type[gf_group->index] == ARF_UPDATE) &&
       cpi->oxcf.pass == 0) {
     if (cpi->oxcf.rc_mode == AOM_CBR)