commit bcb301fd6a38019766ef800109b85dbc2e73c70b
author Jingning Han <jingning@google.com> Thu Jul 09 15:32:09 2020 -0700
committer Jingning Han <jingning@google.com> Fri Jul 10 16:31:11 2020 +0000
tree 19ca4a6185c4a72367bc44586720cc87929e8cf8
parent f58f5536f48aaba55c6f93c95d6ec863e2837a2e

Deprecate frame_disp_idx from GF_GROUP

Remove the deprecated variable from GF_GROUP.

BUG=aomedia:2728

Change-Id: I03ae0d1bbdf6603863c822292747d0421df726a7

av1/encoder/firstpass.h

diff --git a/av1/encoder/firstpass.h b/av1/encoder/firstpass.h
index e0e2876..e37926c 100644
--- a/av1/encoder/firstpass.h
+++ b/av1/encoder/firstpass.h
@@ -180,10 +180,6 @@
   // The number of frames displayed so far within the GOP at a given coding
   // frame.
   unsigned char cur_frame_idx[MAX_STATIC_GF_GROUP_LENGTH];
-  unsigned char frame_disp_idx[MAX_STATIC_GF_GROUP_LENGTH];
-
-  // TODO(jingning): Unify the data structure used here after the new control
-  // mechanism is in place.
   int layer_depth[MAX_STATIC_GF_GROUP_LENGTH];
   int arf_boost[MAX_STATIC_GF_GROUP_LENGTH];
   int max_layer_depth;

av1/encoder/gop_structure.c

diff --git a/av1/encoder/gop_structure.c b/av1/encoder/gop_structure.c
index 5bae430..1c3e969 100644
--- a/av1/encoder/gop_structure.c
+++ b/av1/encoder/gop_structure.c
@@ -44,7 +44,6 @@
       gf_group->update_type[*frame_ind] = LF_UPDATE;
       gf_group->arf_src_offset[*frame_ind] = 0;
       gf_group->cur_frame_idx[*frame_ind] = *cur_frame_idx;
-      gf_group->frame_disp_idx[*frame_ind] = start;
       gf_group->layer_depth[*frame_ind] = MAX_ARF_LAYERS;
       gf_group->arf_boost[*frame_ind] = av1_calc_arf_boost(
           twopass, rc, frame_info, start, end - start, 0, NULL, NULL);
@@ -60,7 +59,6 @@
     gf_group->update_type[*frame_ind] = INTNL_ARF_UPDATE;
     gf_group->arf_src_offset[*frame_ind] = m - start - 1;
     gf_group->cur_frame_idx[*frame_ind] = *cur_frame_idx;
-    gf_group->frame_disp_idx[*frame_ind] = m;
     gf_group->layer_depth[*frame_ind] = layer_depth;
 
     // Get the boost factor for intermediate ARF frames.
@@ -76,7 +74,6 @@
     gf_group->update_type[*frame_ind] = INTNL_OVERLAY_UPDATE;
     gf_group->arf_src_offset[*frame_ind] = 0;
     gf_group->cur_frame_idx[*frame_ind] = *cur_frame_idx;
-    gf_group->frame_disp_idx[*frame_ind] = m;
     gf_group->arf_boost[*frame_ind] = 0;
     gf_group->layer_depth[*frame_ind] = layer_depth;
     ++(*frame_ind);
@@ -119,7 +116,6 @@
     gf_group->update_type[frame_index] = ARF_UPDATE;
     gf_group->arf_src_offset[frame_index] = gf_interval - 1;
     gf_group->cur_frame_idx[frame_index] = cur_frame_index;
-    gf_group->frame_disp_idx[frame_index] = gf_interval;
     gf_group->layer_depth[frame_index] = 1;
     gf_group->arf_boost[frame_index] = cpi->rc.gfu_boost;
     gf_group->max_layer_depth = 1;