commit 76abdd945bb2c301edb7a44a66d8024888a0f3d4
author Debargha Mukherjee <debargha@google.com> Tue Jun 30 18:54:33 2020 -0700
committer Debargha Mukherjee <debargha@google.com> Wed Jul 01 22:59:05 2020 +0000
tree e833e7921dfff1a2eb8f974cd397e47dcb7dc50d
parent 5fffb448347793d61795cb03c1e752dfd506cfe0

Correct q assignment for tpl model

Correct q assignment for tpl_model where gf_group->index
is not set correctly. So gf_index needs to be passed in
to rc_pick_q_and_bounds_no_stats() function explicitly.

STATS_CHANGED

Change-Id: Ia1d738438eaf17448316eb90a0a91cee99a0822a

av1/encoder/ratectrl.c

diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index 45616be..1958c72 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -1001,20 +1001,20 @@
  * \param[in]       cpi          Top level encoder structure
  * \param[in]       width        Coded frame width
  * \param[in]       height       Coded frame height
+ * \param[in]       gf_index     Index of this frame in the golden frame group
  * \param[out]      bottom_index Bottom bound for q index (best quality)
  * \param[out]      top_index    Top bound for q index (worst quality)
  * \return Returns selected q index to be used for encoding this frame.
  */
 static int rc_pick_q_and_bounds_no_stats(const AV1_COMP *cpi, int width,
-                                         int height, int *bottom_index,
-                                         int *top_index) {
+                                         int height, int gf_index,
+                                         int *bottom_index, int *top_index) {
   const AV1_COMMON *const cm = &cpi->common;
   const RATE_CONTROL *const rc = &cpi->rc;
   const CurrentFrame *const current_frame = &cm->current_frame;
   const AV1EncoderConfig *const oxcf = &cpi->oxcf;
   const RefreshFrameFlagsInfo *const refresh_frame_flags = &cpi->refresh_frame;
   const GF_GROUP *const gf_group = &cpi->gf_group;
-  const int gf_index = gf_group->index;
   const enum aom_rc_mode rc_mode = oxcf->rc_cfg.mode;
 
   assert(has_no_stats_stage(cpi));
@@ -1602,8 +1602,8 @@
                                            top_index);
 #endif  // USE_UNRESTRICTED_Q_IN_CQ_MODE
     } else {
-      q = rc_pick_q_and_bounds_no_stats(cpi, width, height, bottom_index,
-                                        top_index);
+      q = rc_pick_q_and_bounds_no_stats(cpi, width, height, gf_index,
+                                        bottom_index, top_index);
     }
   } else {
     q = rc_pick_q_and_bounds(cpi, width, height, gf_index, bottom_index,