commit ab58f52c2b7f29e521ee5920c5769437217e1d67
author Debargha Mukherjee <debargha@google.com> Sun Nov 25 11:41:32 2018 -0800
committer Debargha Mukherjee <debargha@google.com> Tue Nov 27 17:50:24 2018 +0000
tree e05a7b48edc728a10cc7a06ac1a0bfae366c225a
parent e82f8c74a62d97b95c665eb1cfb0facd606ab94c

Correct exit logic for finding valid partition

The ref frame skip and mode skip logic needs to be moved above
the exit logic for forcing a valid search, since otherwise
we may be searching modes in ref frames that are not initialized.

BUG=aomedia:2251

Change-Id: I1724ed62522e9bd12a4c31fa4bf1ac17f1a5642d

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 8ec16d2..a963863 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -11032,11 +11032,22 @@
   const MV_REFERENCE_FRAME *ref_frame = av1_mode_order[mode_index].ref_frame;
   const PREDICTION_MODE this_mode = av1_mode_order[mode_index].mode;
   int skip_motion_mode = 0;
+
+  if (mode_skip_mask[ref_frame[0]] & (1 << this_mode)) {
+    return 1;
+  }
+
+  if ((ref_frame_skip_mask[0] & (1 << ref_frame[0])) &&
+      (ref_frame_skip_mask[1] & (1 << AOMMAX(0, ref_frame[1])))) {
+    return 1;
+  }
+
   // If no valid mode has been found so far in PARTITION_NONE when finding a
   // valid partition is required, do not skip mode.
   if (search_state->best_rd == INT64_MAX && mbmi->partition == PARTITION_NONE &&
       x->must_find_valid_partition)
     return 0;
+
   if (mbmi->partition != PARTITION_NONE && mbmi->partition != PARTITION_SPLIT) {
     const int ref_type = av1_ref_frame_type(ref_frame);
     int skip_ref = ctx->skip_ref_frame_mask & (1 << ref_type);
@@ -11178,15 +11189,6 @@
       return 1;
   }
 
-  if (mode_skip_mask[ref_frame[0]] & (1 << this_mode)) {
-    return 1;
-  }
-
-  if ((ref_frame_skip_mask[0] & (1 << ref_frame[0])) &&
-      (ref_frame_skip_mask[1] & (1 << AOMMAX(0, ref_frame[1])))) {
-    return 1;
-  }
-
   if (skip_repeated_mv(cm, x, this_mode, ref_frame, search_state)) {
     return 1;
   }