commit 88029477fed01ca25703343fa328d6fb80d50391
author Jingning Han <jingning@google.com> Wed Aug 12 15:40:37 2020 -0700
committer Jingning Han <jingning@google.com> Thu Aug 13 19:55:51 2020 +0000
tree 8a45f507d514c734003d00b352f6ba6544722573
parent 2bb8389184e2285a38c222c09eea21c99d2617b2

Add overlay frame setting to the GOP tail

Edit the overlay frame setting to the end of each GOP if needed.

Change-Id: I406db5873cb141176f83f91272f0b41b52111c5b

av1/encoder/gop_structure.c

diff --git a/av1/encoder/gop_structure.c b/av1/encoder/gop_structure.c
index f42a19d..4cd5bce 100644
--- a/av1/encoder/gop_structure.c
+++ b/av1/encoder/gop_structure.c
@@ -144,10 +144,13 @@
   set_multi_layer_params(twopass, gf_group, rc, frame_info, 0, gf_interval,
                          &cur_frame_index, &frame_index, use_altref + 1);
 
-  // The end frame will be Overlay frame for an ARF GOP; otherwise set it to
-  // be GF, for consistency, which will be updated in the next GOP.
-  gf_group->update_type[frame_index] = use_altref ? OVERLAY_UPDATE : GF_UPDATE;
-  gf_group->arf_src_offset[frame_index] = 0;
+  if (use_altref) {
+    gf_group->update_type[frame_index] = OVERLAY_UPDATE;
+    gf_group->arf_src_offset[frame_index] = 0;
+    gf_group->cur_frame_idx[frame_index] = cur_frame_index;
+    gf_group->layer_depth[frame_index] = MAX_ARF_LAYERS;
+    gf_group->arf_boost[frame_index] = NORMAL_BOOST;
+  }
   return frame_index;
 }