commit 94b2854331da41ce266a77a1bd5a20e9ebbee2a0
author Jingning Han <jingning@google.com> Mon Aug 03 23:11:27 2020 -0700
committer Jingning Han <jingning@google.com> Tue Aug 04 21:42:03 2020 +0000
tree db8bd3bad62601efe696e6570bd9a4c905c7ebe0
parent 44edef53604d15613adadeddfdff36a11e6bb584

Remove redundant arf_r0 from cpi->rd

Change-Id: I76dedda52b252141011adda45cddfc5e0fe881c8

av1/encoder/encoder_utils.c

diff --git a/av1/encoder/encoder_utils.c b/av1/encoder/encoder_utils.c
index 22ddc58..9baea60 100644
--- a/av1/encoder/encoder_utils.c
+++ b/av1/encoder/encoder_utils.c
@@ -520,11 +520,10 @@
       aom_clear_system_state();
       cpi->rd.r0 = (double)intra_cost_base / mc_dep_cost_base;
       if (is_frame_tpl_eligible(gf_group, gf_group->index)) {
-        cpi->rd.arf_r0 = cpi->rd.r0;
         if (cpi->lap_enabled) {
           double min_boost_factor = sqrt(cpi->rc.baseline_gf_interval);
           const int gfu_boost = get_gfu_boost_from_r0_lap(
-              min_boost_factor, MAX_GFUBOOST_FACTOR, cpi->rd.arf_r0,
+              min_boost_factor, MAX_GFUBOOST_FACTOR, cpi->rd.r0,
               cpi->rc.num_stats_required_for_gfu_boost);
           // printf("old boost %d new boost %d\n", cpi->rc.gfu_boost,
           //        gfu_boost);

av1/encoder/rd.h

diff --git a/av1/encoder/rd.h b/av1/encoder/rd.h
index 1310561..6227981 100644
--- a/av1/encoder/rd.h
+++ b/av1/encoder/rd.h
@@ -78,7 +78,7 @@
 
   int RDMULT;
 
-  double r0, arf_r0;
+  double r0;
   double mc_saved_base, mc_count_base;
 } RD_OPT;