From: Marco <marpan@google.com>
Date: Wed, 28 Jun 2017 03:14:26 +0000 (-0700)
Subject: vp9: Speed >= 8: Remove logic on reducing subpel.
X-Git-Tag: v1.7.0~360
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88d11f473c7020a5da63ff8cbc1e32a21dd27898;p=libvpx

vp9: Speed >= 8: Remove logic on reducing subpel.

Existing logic was only affecting resolutions above 720p.
Needs more testing for reducing subpel for speed >= 8.

No change on RTC metrics.

Change-Id: I2f4bf9f25891614aafa9a86aa5a5063a3ccfce4d
---

diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index 4c864d46a..803b7ed66 100644
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -584,14 +584,7 @@ static void set_rt_speed_feature_framesize_independent(
     if (cpi->row_mt && cpi->oxcf.max_threads > 1)
       sf->adaptive_rd_thresh_row_mt = 1;
 
-    if (content == VP9E_CONTENT_SCREEN)
-      sf->mv.subpel_force_stop = 3;
-    else if (cm->width * cm->height > 1280 * 720) {
-      sf->mv.subpel_force_stop = 2;
-      if (cpi->rc.avg_frame_low_motion > 87 && cm->current_video_frame > 30)
-        sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED_EVENMORE;
-    }
-
+    if (content == VP9E_CONTENT_SCREEN) sf->mv.subpel_force_stop = 3;
     if (content == VP9E_CONTENT_SCREEN) sf->lpf_pick = LPF_PICK_MINIMAL_LPF;
     // Only keep INTRA_DC mode for speed 8.
     if (!is_keyframe) {