commit 66845d44b6955362d1220a0638e38a4727d7c6a3
author Remya Prakasan <remya.prakasan@ittiam.com> Mon Jul 05 15:04:31 2021 +0530
committer Yunqing Wang <yunqingwang@google.com> Tue Jul 06 20:13:58 2021 +0000
tree 11fc17bec6273982eb622b2f1e694d679162e3f5
parent 5d03ed399cf4c559ad62dbc303e4e747106a98ab

FPMT: Fix runtime error in av1_post_encode_updates

Modified the condition to check a frame_parallel_level 2
frame in a parallel encode set of lower layer frames
in order to fix a sanitizer runtime error.

Change-Id: Ia9d4ba9c2960d95849b1c419026aff72980d2300

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 9c51909..3c49a19 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -4183,7 +4183,8 @@
     // encode set of lower layer frames.
     // TODO(Remya): Move ref_frame_map from AV1_COMMON to AV1_PRIMARY to avoid
     // copy.
-    if (ppi->gf_group.frame_parallel_level[cpi->gf_frame_index - 1] == 1 &&
+    if (ppi->gf_group.frame_parallel_level[cpi->gf_frame_index] == 2 &&
+        ppi->gf_group.frame_parallel_level[cpi->gf_frame_index - 1] == 1 &&
         ppi->gf_group.update_type[cpi->gf_frame_index - 1] ==
             INTNL_ARF_UPDATE) {
       memcpy(cm->ref_frame_map, ppi->ref_frame_map_copy,