shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: Adjust speed features for speed 8 at low resoln."

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

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

@@ -574,7 +574,11 @@

     if (cpi->row_mt && cpi->oxcf.max_threads > 1)

       sf->adaptive_rd_thresh_row_mt = 1;

-    sf->mv.subpel_force_stop = (content == VP9E_CONTENT_SCREEN) ? 3 : 2;

+    if (content == VP9E_CONTENT_SCREEN)

+      sf->mv.subpel_force_stop = 3;

+    else if (cm->width > 352 && cm->height > 288)

+      sf->mv.subpel_force_stop = 2;

+

     if (content == VP9E_CONTENT_SCREEN) sf->lpf_pick = LPF_PICK_MINIMAL_LPF;

     // Only keep INTRA_DC mode for speed 8.

     if (!is_keyframe) {

@@ -596,13 +600,13 @@

       }

       // Since the short_circuit_low_temp_var is used, reduce the

       // adaptive_rd_thresh level.

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

+      if (cm->width > 352 && cm->height > 288)

         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;

+    sf->use_simple_block_yrd = 1;

   }

 }