commit 2e0298733bc8f67a5ec5be6bd05f32cb32cbdc07
author Jingning Han <jingning@google.com> Fri Aug 02 10:54:19 2019 -0700
committer Jingning Han <jingning@google.com> Wed Aug 07 16:42:30 2019 +0000
tree d10d6ba196e214e942238890d67aaf5d65cbd4d5
parent 8d335b714326a38dd6d20403082f1c8eb2c3f7e5

Refactor av1_rc_pick_q_and_bounds()

Clean up unnecessary dependency on gf_group.index.

Change-Id: Ibd2fdfa8da6ebcf3f0d5e33400edc50588340cd4

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 469e6a8..aed8250 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -3688,8 +3688,8 @@
     process_tpl_stats_frame(cpi);
 
   // Decide q and q bounds.
-  *q = av1_rc_pick_q_and_bounds(cpi, cm->width, cm->height, bottom_index,
-                                top_index);
+  *q = av1_rc_pick_q_and_bounds(cpi, cm->width, cm->height, cpi->gf_group.index,
+                                bottom_index, top_index);
 
   if (!frame_is_intra_only(cm)) {
     set_high_precision_mv(cpi, (*q) < HIGH_PRECISION_MV_QTHRESH,
@@ -4034,7 +4034,8 @@
       // Now decide the use of superres based on 'q'.
       int bottom_index, top_index;
       const int q = av1_rc_pick_q_and_bounds(
-          cpi, cpi->oxcf.width, cpi->oxcf.height, &bottom_index, &top_index);
+          cpi, cpi->oxcf.width, cpi->oxcf.height, cpi->gf_group.index,
+          &bottom_index, &top_index);
 
       const int qthresh = (frame_is_intra_only(&cpi->common))
                               ? oxcf->superres_kf_qthresh
@@ -4055,7 +4056,8 @@
       // Now decide the use of superres based on 'q'.
       int bottom_index, top_index;
       const int q = av1_rc_pick_q_and_bounds(
-          cpi, cpi->oxcf.width, cpi->oxcf.height, &bottom_index, &top_index);
+          cpi, cpi->oxcf.width, cpi->oxcf.height, cpi->gf_group.index,
+          &bottom_index, &top_index);
 
       const int qthresh = 128;
       if (q <= qthresh) {