From: Marco <marpan@google.com>
Date: Tue, 6 Jun 2017 22:28:06 +0000 (-0700)
Subject: vp9: SVC: Adjust some speed settings for SVC speed >= 7.
X-Git-Tag: v1.7.0~413^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d2f5f8e9d78843ef1eeb701ead5fd1c3dbbcd43;p=libvpx

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

Keep the 1/4subpel for all frames, use SUBPEL_TREE_PRUNED_EVENMORE
for all temporal enhancement layer frames.

Change-Id: Ibc681acbb6fc75b7b3c57fc483fcb11d591dfc9a
---

diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index cf8f0c1be..14bdf4b02 100644
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -534,11 +534,6 @@ static void set_rt_speed_feature_framesize_independent(
     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 @@ static void set_rt_speed_feature_framesize_independent(
       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 &&