commit fa9f24a5ae8beb5699c69b6ab3ac15b7c0f67fc9
author Elliott Karpilovsky <elliottk@google.com> Wed Apr 10 18:11:00 2019 +0000
committer Elliott Karpilovsky <elliottk@google.com> Wed Apr 10 22:05:11 2019 +0000
tree 130850ec97dc0848d062a0d17769f47ac7d72716
parent 836b69b9a0a96cc7bb1e9eaec441150b0d64bba6

Revert "Add checks for the mode/ref frame lookups"

This reverts commit 172f1d33177597bcb210753b25d0ba2133754015.

Reason for revert: https://bugs.chromium.org/p/aomedia/issues/detail?id=2364

BUG=aomedia:2364

Change-Id: I09a52b4f9b4ba6933a3a21b89312ea208da27575

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 3741e1c..bf79787 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -647,33 +647,26 @@
 static int get_prediction_mode_idx(PREDICTION_MODE this_mode,
                                    MV_REFERENCE_FRAME ref_frame,
                                    MV_REFERENCE_FRAME second_ref_frame) {
-  int result;
   if (this_mode < INTRA_MODE_END) {
     assert(ref_frame == INTRA_FRAME);
     assert(second_ref_frame == NONE_FRAME);
-    result = intra_to_mode_idx[this_mode - INTRA_MODE_START];
-  } else if (this_mode >= SINGLE_INTER_MODE_START &&
-             this_mode < SINGLE_INTER_MODE_END) {
+    return intra_to_mode_idx[this_mode - INTRA_MODE_START];
+  }
+  if (this_mode >= SINGLE_INTER_MODE_START &&
+      this_mode < SINGLE_INTER_MODE_END) {
     assert((ref_frame > INTRA_FRAME) && (ref_frame <= ALTREF_FRAME));
-    result = single_inter_to_mode_idx[this_mode - SINGLE_INTER_MODE_START]
-                                     [ref_frame];
-  } else if (this_mode >= COMP_INTER_MODE_START &&
-             this_mode < COMP_INTER_MODE_END) {
+    return single_inter_to_mode_idx[this_mode - SINGLE_INTER_MODE_START]
+                                   [ref_frame];
+  }
+  if (this_mode >= COMP_INTER_MODE_START && this_mode < COMP_INTER_MODE_END) {
     assert((ref_frame > INTRA_FRAME) && (ref_frame <= ALTREF_FRAME));
     assert((second_ref_frame > INTRA_FRAME) &&
            (second_ref_frame <= ALTREF_FRAME));
-    result = comp_inter_to_mode_idx[this_mode - COMP_INTER_MODE_START]
-                                   [ref_frame][second_ref_frame];
-  } else {
-    result = -1;
+    return comp_inter_to_mode_idx[this_mode - COMP_INTER_MODE_START][ref_frame]
+                                 [second_ref_frame];
   }
-  // The two data structures that map back and forth between mode number
-  // and (mode, ref frame1, ref frame2) must be manually kept in sync. Add
-  // assertions to catch any drift.
-  assert(result >= 0 && result < MAX_MODES);
-  assert(av1_mode_order[result].mode == this_mode);
-  assert(av1_mode_order[result].ref_frame[0] == ref_frame);
-  return result;
+  assert(0);
+  return -1;
 }
 
 static const PREDICTION_MODE intra_rd_search_mode_order[INTRA_MODES] = {