commit 9259f7efc6edd189ebbd4e7a93023de5dd224fde
author Jingning Han <jingning@google.com> Wed Sep 23 23:18:40 2020 -0700
committer Jingning Han <jingning@google.com> Thu Sep 24 20:37:17 2020 +0000
tree 5aa6697d7235e10aa9a9b2cde5650946af48f159
parent 4969e7218f8a2dddb5a223859ec9da4f2fef3558

Re-arrange ref frame priorities

This resolves encoding failures due to certain speed features
assuming the existence of an ARF.

BUG=aomedia:2834

STATS_CHANGED

Change-Id: I5a3d6a679fd33eec31519f17574eda851a52db4a

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 3aa9cab..0a4bce7 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -3628,8 +3628,8 @@
   }
 
   if (cpi->rc.is_src_frame_alt_ref) {
-    if (sf->inter_sf.alt_ref_search_fp) {
-      assert(cpi->ref_frame_flags & av1_ref_frame_flag_list[ALTREF_FRAME]);
+    if (sf->inter_sf.alt_ref_search_fp &&
+        (cpi->ref_frame_flags & av1_ref_frame_flag_list[ALTREF_FRAME])) {
       mask->pred_modes[ALTREF_FRAME] = 0;
       disable_inter_references_except_altref(mask->ref_combo);
       disable_reference(INTRA_FRAME, mask->ref_combo);