shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: SVC: Adjust some speed settings for SVC speed >= 7."

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

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

@@ -534,11 +534,6 @@

     if (cpi->svc.temporal_layer_id > 0) {

       sf->adaptive_rd_thresh = 4;

       sf->limit_newmv_early_exit = 0;

-      // Use 1/2-pel for non-reference frame.

-      if (cpi->svc.non_reference_frame)

-        sf->mv.subpel_force_stop = 2;

-      else

-        sf->mv.subpel_force_stop = 1;

       sf->base_mv_aggressive =

           (cpi->svc.temporal_layer_id == cpi->svc.number_temporal_layers - 1)

               ? 1

@@ -555,6 +550,8 @@

       sf->mv.search_method = NSTEP;

       sf->mv.fullpel_search_step_param = 6;

     }

+    if (cpi->svc.temporal_layer_id > 0)

+      sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED_EVENMORE;

     if (!cpi->external_resize) sf->use_source_sad = 1;

     if (sf->use_source_sad) {

       if (cpi->content_state_sb_fd == NULL &&