shithub: libvpx

Download patch

ref: 7b13f16fff593c3350133eab53240e215cc98d98
parent: 31f674d3e4ba3041a7146e184c45096d87b20bfa
parent: 6512048ada6198a519002f1c3169a2eab71ee3c6
author: Marco Paniconi <marpan@google.com>
date: Fri May 11 00:45:13 EDT 2018 

Merge "vp9: Adjust some early exits in nonrd-pickmode."


--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1772,7 +1772,7 @@
       continue;
 
     if (sf->short_circuit_flat_blocks && x->source_variance == 0 &&
-        this_mode != NEARESTMV) {
+        frame_mv[this_mode][ref_frame].as_int != 0) {
       continue;
     }
 
@@ -1883,7 +1883,7 @@
         (!cpi->sf.adaptive_rd_thresh_row_mt &&
          rd_less_than_thresh(best_rdc.rdcost, mode_rd_thresh,
                              &rd_thresh_freq_fact[mode_index])))
-      continue;
+      if (frame_mv[this_mode][ref_frame].as_int != 0) continue;
 
     if (this_mode == NEWMV && !force_gf_mv) {
       if (ref_frame > LAST_FRAME && !cpi->use_svc &&