commit 2e2b09cb2ccb3bac8a777f4783daa4db4671c927
author Debargha Mukherjee <debargha@google.com> Fri Jun 14 13:50:42 2019 -0700
committer Debargha Mukherjee <debargha@google.com> Tue Jun 25 16:56:23 2019 +0000
tree 1114d15f5e7c7fa6977571755e3d3173956c6151
parent 63d56c28405baa7a88f4a83047b06f48b2f8da3b

Adjust boosts for gf/kf frames based on tpl stats

AWCY Objective-1 fast results:
PSNR-Y:  -0.10%
PSNR-cb: -0.38%
PSNR-cr: -0.45%

STATS_CHANGED

Change-Id: If8aef138cfc75ee4732777397df312ff4063b5db

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index deff0c0..c465e18 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -3596,8 +3596,11 @@
   cm->switchable_motion_mode = 1;
 }
 
-static int get_gfu_boost_from_r0(double r0) {
-  int boost = (int)rint(260.0 / r0);
+static int get_gfu_boost_from_r0(double r0, int frames_to_key) {
+  double factor = sqrt((double)frames_to_key);
+  factor = AOMMIN(factor, 10.0);
+  factor = AOMMAX(factor, 4.0);
+  const int boost = (int)rint((200.0 + 10.0 * factor) / r0);
   return boost;
 }
 
@@ -3605,7 +3608,17 @@
   double factor = sqrt((double)frames_to_key);
   factor = AOMMIN(factor, 10.0);
   factor = AOMMAX(factor, 4.0);
-  int boost = (int)rint((75.0 + 14.0 * factor) / r0);
+  const int boost = (int)rint((75.0 + 14.0 * factor) / r0);
+  return boost;
+}
+
+int combine_prior_with_tpl_boost(int prior_boost, int tpl_boost,
+                                 int frames_to_key) {
+  double factor = sqrt((double)frames_to_key);
+  factor = AOMMIN(factor, 12.0);
+  factor = AOMMAX(factor, 4.0);
+  factor -= 4.0;
+  int boost = (int)((factor * prior_boost + (8.0 - factor) * tpl_boost) / 8.0);
   return boost;
 }
 
@@ -3643,10 +3656,12 @@
       cpi->rd.r0 = (double)intra_cost_base / mc_dep_cost_base;
       if (is_frame_arf_and_tpl_eligible(cpi)) {
         cpi->rd.arf_r0 = cpi->rd.r0;
-        const int gfu_boost = get_gfu_boost_from_r0(cpi->rd.arf_r0);
+        const int gfu_boost =
+            get_gfu_boost_from_r0(cpi->rd.arf_r0, cpi->rc.frames_to_key);
         // printf("old boost %d new boost %d\n", cpi->rc.gfu_boost,
         //        gfu_boost);
-        cpi->rc.gfu_boost = (cpi->rc.gfu_boost + gfu_boost) / 2;
+        cpi->rc.gfu_boost = combine_prior_with_tpl_boost(
+            cpi->rc.gfu_boost, gfu_boost, cpi->rc.frames_to_key);
       } else if (frame_is_intra_only(cm)) {
         // TODO(debargha): Turn off q adjustment for kf temporarily to
         // reduce impact on speed of encoding. Need to investigate how
@@ -3656,7 +3671,8 @@
               get_kf_boost_from_r0(cpi->rd.r0, cpi->rc.frames_to_key);
           // printf("old kf boost %d new kf boost %d [%d]\n", cpi->rc.kf_boost,
           //        kf_boost, cpi->rc.frames_to_key);
-          cpi->rc.kf_boost = (cpi->rc.kf_boost + kf_boost) / 2;
+          cpi->rc.kf_boost = combine_prior_with_tpl_boost(
+              cpi->rc.kf_boost, kf_boost, cpi->rc.frames_to_key);
         }
       }
       cpi->rd.mc_count_base =