commit 8334673ceb5366d9283443a39ad9f7350b194dc5
author Jingning Han <jingning@google.com> Sun Jun 20 07:34:05 2021 -0700
committer Jingning Han <jingning@google.com> Mon Jun 21 21:29:55 2021 +0000
tree b569140a5d100f4957979c689c11915225b8c91b
parent 5031801d59fd7d1649823608aed2c0ab650d501c

Use gf group to define forward key frame

BUG=aomedia:3079

Change-Id: Id204ece54b2ffefb9405587042c003df1cd0b100

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 23f1e9d91..7d1358c 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -957,11 +957,10 @@
     cm->current_frame.frame_type = frame_params->frame_type;
     int arf_src_index = gf_group->arf_src_offset[cpi->gf_frame_index];
     int is_forward_keyframe = 0;
-    if (!frame_params->show_frame && cpi->no_show_fwd_kf) {
-      // TODO(angiebird): Figure out why this condition yields forward keyframe.
-      // fwd kf
+    if (gf_group->frame_type[cpi->gf_frame_index] == KEY_FRAME &&
+        gf_group->refbuf_state[cpi->gf_frame_index] == REFBUF_UPDATE)
       is_forward_keyframe = 1;
-    }
+
     const int code_arf =
         av1_temporal_filter(cpi, arf_src_index, update_type,
                             is_forward_keyframe, &show_existing_alt_ref);