Remove ineffective newmv skip checking from vp9_pick_inter_mode

Change-Id: I41ee684cf113a7b5edf280183e51cb08b2e93cc4

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index f3635931987baafefa43a9583aba94464e6cd5cd..ac6e01371ea72f4fdc7dbc8c2b53a196373ca6ae 100644 (file)
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -808,9 +808,6 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
       continue;
 
     if (this_mode == NEWMV) {
-      if (cpi->sf.partition_search_type != VAR_BASED_PARTITION
-          && best_rdc.rdcost < (int64_t) (1 << num_pels_log2_lookup[bsize]))
-        continue;
       if (ref_frame > LAST_FRAME) {
         int tmp_sad;
         int dis, cost_list[5];
@@ -845,8 +842,9 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
       }
     }
 
-    if (this_mode != NEARESTMV && frame_mv[this_mode][ref_frame].as_int ==
-        frame_mv[NEARESTMV][ref_frame].as_int)
+    if (this_mode != NEARESTMV &&
+        frame_mv[this_mode][ref_frame].as_int ==
+            frame_mv[NEARESTMV][ref_frame].as_int)
       continue;
 
     mbmi->mode = this_mode;