commit 5031801d59fd7d1649823608aed2c0ab650d501c
author Jingning Han <jingning@google.com> Sat Jun 19 22:35:03 2021 -0700
committer Jingning Han <jingning@google.com> Mon Jun 21 21:29:55 2021 +0000
tree 1c63666e01e38287987f4af84d43714aff49147e
parent a345a0b02b377d66454e1e0d3a5e727f3bdc9e50

Set forward key frame detection in rate control

BUG=aomedia:3079

Change-Id: I2c7537ac1978660cf65ade34be95de35fde6559e

av1/encoder/ratectrl.c

diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index 2561ae0..cfb027f 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -1832,10 +1832,11 @@
   int active_best_quality = 0;
   int active_worst_quality = rc->active_worst_quality;
   int q;
+  GF_GROUP *gf_group = &cpi->ppi->gf_group;
 
   if (frame_is_intra_only(cm)) {
-    const int is_fwd_kf = cm->current_frame.frame_type == KEY_FRAME &&
-                          cm->show_frame == 0 && cpi->no_show_fwd_kf;
+    const int is_fwd_kf = gf_group->update_type[gf_index] == ARF_UPDATE &&
+                          gf_group->refbuf_state[gf_index] == REFBUF_UPDATE;
     get_intra_q_and_bounds(cpi, width, height, &active_best_quality,
                            &active_worst_quality, cq_level, is_fwd_kf);
   } else {
@@ -1915,8 +1916,8 @@
       gf_group->update_type[gf_index] == INTNL_ARF_UPDATE;
 
   if (frame_is_intra_only(cm)) {
-    const int is_fwd_kf = cm->current_frame.frame_type == KEY_FRAME &&
-                          cm->show_frame == 0 && cpi->no_show_fwd_kf;
+    const int is_fwd_kf = gf_group->update_type[gf_index] == ARF_UPDATE &&
+                          gf_group->refbuf_state[gf_index] == REFBUF_UPDATE;
     get_intra_q_and_bounds(cpi, width, height, &active_best_quality,
                            &active_worst_quality, cq_level, is_fwd_kf);
 #ifdef STRICT_RC