commit 9ec10245a86700e3f4b66a8cc775d1ebe98987b6
author Remya Prakasan <remya.prakasan@ittiam.com> Tue Sep 21 14:05:13 2021 +0530
committer Yunqing Wang <yunqingwang@google.com> Wed Sep 22 15:15:12 2021 +0000
tree d93d98dbb49117e141b37021c71e00e279c51a57
parent c9f674a396f230d79337b2852ea3b00e5eec2967

FPMT: Use cpi->ref_idx_to_skip in get_ref_frames()

The override of is_parallel_encode is removed in
get_ref_frames() so that cpi->ref_idx_to_skip is used
during parallel encode of lower layer frames to
correctly handle the reference frame assignment.

Change-Id: I4dca69d94887e1bfdcd8a4d632cdb6f895438d78

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index d1d8283..fe2b9ae 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -1244,9 +1244,7 @@
         gf_group->frame_parallel_level[gf_index - 1] == 1 &&
         gf_group->update_type[gf_index - 1] == INTNL_ARF_UPDATE) {
       assert(gf_group->update_type[gf_index] == INTNL_ARF_UPDATE);
-      // TODO(Remya): Use original value of is_parallel_encode when FPMT is
-      // enabled.
-      is_parallel_encode = 0;
+
       // If parallel cpis are active, use ref_idx_to_skip, else, use display
       // index.
       assert(IMPLIES(is_parallel_encode, cpi->ref_idx_to_skip != INVALID_IDX));