commit 91a50021ffa8a3c2804a04c07355ec4baf89946b
author Marco Paniconi <marpan@google.com> Thu Aug 01 18:56:39 2019 -0700
committer Marco Paniconi <marpan@google.com> Fri Aug 02 16:14:07 2019 +0000
tree 28c5510ecc433c25175325f5ef30275dd560f0fe
parent dae645ad0cd5896505f838e5479b2c6556ed9ec8

Fix to is_frame_droppable for external flags

Account for external refresh flags in
is_frame_droppable() function.

Change-Id: I63906f82527a8bf64dc05a24094f483cfb00baa0

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index e4ac327..00e8469 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -158,9 +158,15 @@
 }
 
 static INLINE int is_frame_droppable(const AV1_COMP *const cpi) {
-  return !(cpi->refresh_alt_ref_frame || cpi->refresh_alt2_ref_frame ||
-           cpi->refresh_bwd_ref_frame || cpi->refresh_golden_frame ||
-           cpi->refresh_last_frame);
+  if (cpi->ext_refresh_frame_flags_pending)
+    return !(cpi->ext_refresh_alt_ref_frame ||
+             cpi->ext_refresh_alt2_ref_frame ||
+             cpi->ext_refresh_bwd_ref_frame || cpi->ext_refresh_golden_frame ||
+             cpi->ext_refresh_last_frame);
+  else
+    return !(cpi->refresh_alt_ref_frame || cpi->refresh_alt2_ref_frame ||
+             cpi->refresh_bwd_ref_frame || cpi->refresh_golden_frame ||
+             cpi->refresh_last_frame);
 }
 
 static INLINE void update_frames_till_gf_update(AV1_COMP *cpi) {