commit 8d335b714326a38dd6d20403082f1c8eb2c3f7e5
author Marco Paniconi <marpan@google.com> Tue Aug 06 09:07:07 2019 -0700
committer Marco Paniconi <marpan@google.com> Wed Aug 07 04:46:13 2019 +0000
tree 4b4663f460bdfe91a9b2d246fb9ab30df5d26517
parent 6f4c621e8cfe063b3583c6c5ce50749c472cb474

Condition av1_update_ref_frame_map on external frame flags

As with av1_get_ref_frames() before encoding, no need to enter
av1_update_ref_frame_map() after encoding when
ext_refresh_frame_flags_pending is set.

Change-Id: I569161d1fd5c169d6bae6eae670d0cac3d07474b

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 699cf38..4c4c712 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -1431,10 +1431,12 @@
     // First pass doesn't modify reference buffer assignment or produce frame
     // flags
     update_frame_flags(cpi, frame_flags);
-    int ref_map_index =
-        av1_get_refresh_ref_frame_map(cm->current_frame.refresh_frame_flags);
-    av1_update_ref_frame_map(cpi, frame_update_type, ref_map_index,
-                             &cpi->ref_buffer_stack);
+    if (!cpi->ext_refresh_frame_flags_pending) {
+      int ref_map_index =
+          av1_get_refresh_ref_frame_map(cm->current_frame.refresh_frame_flags);
+      av1_update_ref_frame_map(cpi, frame_update_type, ref_map_index,
+                               &cpi->ref_buffer_stack);
+    }
   }
 
 #if !CONFIG_REALTIME_ONLY