commit c7185bdf88936c1763c70f90ce91691ac1c12dfe
author Jingning Han <jingning@google.com> Wed Aug 31 13:20:23 2022 -0700
committer Jingning Han <jingning@google.com> Wed Aug 31 21:42:50 2022 +0000
tree 23c1aa8b2939244dde32a77a15d705248e490f45
parent ea1290213475252d4d259edf58d5ba1c6dc7b372

Fix the reference frame assignment loss issue

Avoid repeated initialization of the reference frame mapping in
the process where the reference frames get assigned through
ducky encode.

BUG=b/244468287

Change-Id: Ie32011532630693263942e851ed956eff9eaae1e

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 8f93942..b70b602 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -996,13 +996,14 @@
 #if !CONFIG_REALTIME_ONLY
   if (cpi->use_ducky_encode &&
       cpi->ducky_encode_info.frame_info.gop_mode == DUCKY_ENCODE_GOP_MODE_RCL) {
+    for (int i = 0; i < REF_FRAMES; ++i) remapped_ref_idx[i] = 0;
     for (int rf = LAST_FRAME; rf < REF_FRAMES; ++rf) {
-      for (int i = 0; i < REF_FRAMES; ++i) remapped_ref_idx[i] = 0;
       if (cpi->ppi->gf_group.ref_frame_list[gf_index][rf] != INVALID_IDX) {
         remapped_ref_idx[rf - LAST_FRAME] =
             cpi->ppi->gf_group.ref_frame_list[gf_index][rf];
       }
     }
+
     return;
   }
 #endif  // !CONFIG_REALTIME_ONLY