commit 54c71f02c4ebbc6dfba9bec926a632c8906446ca
author chiyotsai <chiyotsai@google.com> Fri Aug 03 12:37:27 2018 -0700
committer Urvang Joshi <urvang@google.com> Mon Aug 06 17:55:21 2018 +0000
tree f2337a8728f2ad627464de925de1c51f11dcf4bf
parent 7c24185d7b45a1795fcfa5f33b912bd725f0ab33

Replace is_single_inter_mode with is_inter_singleref_mode

BUG=aomedia:2044

Change-Id: I28adcc76c937ae760220779afa29c6cfaafce61a

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 6092389..3b1dadf 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8860,16 +8860,9 @@
   return 0;
 }
 
-#ifndef NDEBUG
-static INLINE int is_single_inter_mode(PREDICTION_MODE this_mode) {
-  return this_mode >= SINGLE_INTER_MODE_START &&
-         this_mode < SINGLE_INTER_MODE_END;
-}
-#endif
-
 static INLINE int get_ref_mv_offset(PREDICTION_MODE single_mode,
                                     uint8_t ref_mv_idx) {
-  assert(is_single_inter_mode(single_mode));
+  assert(is_inter_singleref_mode(single_mode));
   int ref_mv_offset;
   if (single_mode == NEARESTMV) {
     ref_mv_offset = 0;
@@ -8889,7 +8882,7 @@
   const int is_comp_pred = ref_frame[1] > INTRA_FRAME;
   const PREDICTION_MODE single_mode =
       get_single_mode(this_mode, ref_idx, is_comp_pred);
-  assert(is_single_inter_mode(single_mode));
+  assert(is_inter_singleref_mode(single_mode));
   if (single_mode == NEWMV) {
     this_mv->as_int = INVALID_MV;
   } else if (single_mode == GLOBALMV) {