shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: speed >= 8: Adjust speed settings on ARM."

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -1142,7 +1142,7 @@

     mi->mv[0].as_int = 0;

     mi->interp_filter = BILINEAR;

-    if (cpi->oxcf.speed >= 8)

+    if (cpi->oxcf.speed >= 8 && !low_res)

       y_sad = cpi->fn_ptr[bsize].sdf(

           x->plane[0].src.buf, x->plane[0].src.stride, xd->plane[0].pre[0].buf,

           xd->plane[0].pre[0].stride);

--- a/vp9/encoder/vp9_speed_features.c

+++ b/vp9/encoder/vp9_speed_features.c

@@ -555,7 +555,10 @@

       }

       // Since the short_circuit_low_temp_var is used, reduce the

       // adaptive_rd_thresh level.

-      sf->adaptive_rd_thresh = 1;

+      if (cm->width > 320 && cm->height > 240)

+        sf->adaptive_rd_thresh = 1;

+      else

+        sf->adaptive_rd_thresh = 2;

     }

     sf->limit_newmv_early_exit = 0;

     if (cm->width > 320 && cm->height > 240) sf->use_simple_block_yrd = 1;