commit 4ba1c63f593094cded6e6ede985ec9808ae88107
author Bohan Li <bohanli@google.com> Thu Jan 12 15:51:39 2023 -0800
committer Bohan Li <bohanli@google.com> Wed Jan 18 17:21:52 2023 +0000
tree 54ce6ee2602a7e5d91507d789049a416f8e6d0b2
parent b2b71ae2ab197439861f8500bd744fe192520eb2

Fix problem with final snapshot of reference frame table.

Note that this should not influence performance for the current rc lib
as we do not consider references from the previous gops.

Change-Id: I3f369853ca4209ecdf1c00933f6e2314b9affbbc

av1/qmode_rc/ratectrl_qmode.cc

diff --git a/av1/qmode_rc/ratectrl_qmode.cc b/av1/qmode_rc/ratectrl_qmode.cc
index 5bdf3d8..ccd936b 100644
--- a/av1/qmode_rc/ratectrl_qmode.cc
+++ b/av1/qmode_rc/ratectrl_qmode.cc
@@ -1876,10 +1876,12 @@
     const GopStruct &gop_struct, const FirstpassInfo &firstpass_info,
     const std::vector<LookaheadStats> &lookahead_stats,
     const RefFrameTable &ref_frame_table_snapshot_init) {
+  const int frame_count = static_cast<int>(gop_struct.gop_frame_list.size());
+  GopEncodeInfo gop_encode_info;
+
   const std::vector<RefFrameTable> ref_frame_table_list = GetRefFrameTableList(
       gop_struct, lookahead_stats, ref_frame_table_snapshot_init);
-  GopEncodeInfo gop_encode_info;
-  gop_encode_info.final_snapshot = ref_frame_table_list.back();
+  gop_encode_info.final_snapshot = ref_frame_table_list[frame_count];
 
   const int stats_size = static_cast<int>(firstpass_info.stats_list.size());
   const FirstpassInfo analyzed_fp_info =
@@ -1898,7 +1900,6 @@
   }
 
   GopFrame arf_frame = GopFrameInvalid();
-  const int frame_count = static_cast<int>(gop_struct.gop_frame_list.size());
 
   const int base_offset = av1_get_deltaq_offset(
       AOM_BITS_8, rc_param_.base_q_index, gop_struct.base_q_ratio);
@@ -1954,18 +1955,22 @@
     const TplGopStats &tpl_gop_stats,
     const std::vector<LookaheadStats> &lookahead_stats,
     const RefFrameTable &ref_frame_table_snapshot_init) {
-  const std::vector<RefFrameTable> ref_frame_table_list = GetRefFrameTableList(
-      gop_struct, lookahead_stats, ref_frame_table_snapshot_init);
+  assert(tpl_gop_stats.frame_stats_list.size() ==
+         gop_struct.gop_frame_list.size());
+  const int frame_count =
+      static_cast<int>(tpl_gop_stats.frame_stats_list.size());
 
   GopEncodeInfo gop_encode_info;
-  gop_encode_info.final_snapshot = ref_frame_table_list.back();
+
+  const std::vector<RefFrameTable> ref_frame_table_list = GetRefFrameTableList(
+      gop_struct, lookahead_stats, ref_frame_table_snapshot_init);
+  gop_encode_info.final_snapshot = ref_frame_table_list[frame_count];
+
   StatusOr<TplGopDepStats> gop_dep_stats = ComputeTplGopDepStats(
       tpl_gop_stats, lookahead_stats, ref_frame_table_list);
   if (!gop_dep_stats.ok()) {
     return gop_dep_stats.status();
   }
-  const int frame_count =
-      static_cast<int>(tpl_gop_stats.frame_stats_list.size());
 
   const int stats_size = static_cast<int>(firstpass_info.stats_list.size());