From: Jerome Jiang <jianj@google.com>
Date: Fri, 6 Jan 2017 18:06:37 +0000 (-0800)
Subject: vp9: Enable more aggresive short circuit for speed 8.
X-Git-Tag: v1.6.1~10^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=267e73446c09a28aee5b361a3d03f55380a9480b;p=libvpx

vp9: Enable more aggresive short circuit for speed 8.

Set short_circuit_low_temp_var to 3 for speed 8 for all res.
No strong visual difference on all clips.

Change-Id: Ia6d9a314291ab1c14d5421bbdd769974083aeb2a
---

diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index 1db22eeba..81cb431ba 100644
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -520,11 +520,7 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, int speed,
     if (!cpi->use_svc && cpi->oxcf.rc_mode == VPX_CBR &&
         content != VP9E_CONTENT_SCREEN) {
       // More aggressive short circuit for speed 8.
-      sf->short_circuit_low_temp_var = 2;
-      // More aggressive short circuit for low resolution
-      if (cm->width <= 640 && cm->height <= 480) {
-        sf->short_circuit_low_temp_var = 3;
-      }
+      sf->short_circuit_low_temp_var = 3;
     }
     sf->limit_newmv_early_exit = 0;
   }