shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove ineffective newmv skip checking from vp9_pick_inter_mode"

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -803,9 +803,6 @@

       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];

@@ -840,8 +837,9 @@

       }

     }

-    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;

-- 

⑨