commit beb459ffec8309cd1641340ddb319f1d7590ff9a
author Jingning Han <jingning@google.com> Thu Jun 25 23:05:18 2020 -0700
committer Jingning Han <jingning@google.com> Fri Jun 26 23:47:57 2020 +0000
tree 88db60862334108e9b2c396b274f7cc97dfa890d
parent 9b9ec5ca9418cc96544ad348f7dbe4074044bd92

Remove deprecated kf boost bias based on tpl

This special handle for kf has been deprecated due to the new tpl
model design.

Change-Id: I1f950fb77362dc37ced076590cb9325184b65db9

av1/encoder/encoder_utils.c

diff --git a/av1/encoder/encoder_utils.c b/av1/encoder/encoder_utils.c
index a6cae0f..b00bb21 100644
--- a/av1/encoder/encoder_utils.c
+++ b/av1/encoder/encoder_utils.c
@@ -537,24 +537,6 @@
               MIN_BOOST_COMBINE_FACTOR, MAX_BOOST_COMBINE_FACTOR,
               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
-        // to mitigate the issue.
-        if (cpi->oxcf.rc_cfg.mode == AOM_Q) {
-          const int kf_boost =
-              get_kf_boost_from_r0(cpi->rd.r0, cpi->rc.frames_to_key);
-          if (cpi->lap_enabled) {
-            cpi->rc.kf_boost = combine_prior_with_tpl_boost(
-                MIN_BOOST_COMBINE_FACTOR, MAX_BOOST_COMBINE_FACTOR,
-                cpi->rc.kf_boost, kf_boost,
-                cpi->rc.num_stats_used_for_kf_boost);
-          } else {
-            cpi->rc.kf_boost = combine_prior_with_tpl_boost(
-                MIN_BOOST_COMBINE_FACTOR, MAX_BOOST_COMBINE_FACTOR,
-                cpi->rc.kf_boost, kf_boost, cpi->rc.frames_to_key);
-          }
-        }
       }
       cpi->rd.mc_count_base = (double)mc_count_base /
                               (cm->mi_params.mi_rows * cm->mi_params.mi_cols);

av1/encoder/rc_utils.h

diff --git a/av1/encoder/rc_utils.h b/av1/encoder/rc_utils.h
index 42c7161..9d98b07 100644
--- a/av1/encoder/rc_utils.h
+++ b/av1/encoder/rc_utils.h
@@ -139,12 +139,6 @@
   return factor;
 }
 
-static AOM_INLINE int get_kf_boost_from_r0(double r0, int frames_to_key) {
-  double factor = av1_get_kf_boost_projection_factor(frames_to_key);
-  const int boost = (int)rint(factor / r0);
-  return boost;
-}
-
 static AOM_INLINE int get_regulated_q_overshoot(AV1_COMP *const cpi, int q_low,
                                                 int q_high, int top_index,
                                                 int bottom_index) {