shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Use non-zero mode threshold for NEARESTMV modes"

--- a/vp9/encoder/vp9_rd.c

+++ b/vp9/encoder/vp9_rd.c

@@ -457,9 +457,15 @@

   for (i = 0; i < MAX_MODES; ++i)

     rd->thresh_mult[i] = cpi->oxcf.mode == BEST ? -500 : 0;

-  rd->thresh_mult[THR_NEARESTMV] = 0;

-  rd->thresh_mult[THR_NEARESTG] = 0;

-  rd->thresh_mult[THR_NEARESTA] = 0;

+  if (sf->adaptive_rd_thresh) {

+    rd->thresh_mult[THR_NEARESTMV] = 300;

+    rd->thresh_mult[THR_NEARESTG] = 300;

+    rd->thresh_mult[THR_NEARESTA] = 300;

+  } else {

+    rd->thresh_mult[THR_NEARESTMV] = 0;

+    rd->thresh_mult[THR_NEARESTG] = 0;

+    rd->thresh_mult[THR_NEARESTA] = 0;

+  }

   rd->thresh_mult[THR_DC] += 1000;