commit 9e362cee507e1c94cf18b3944c7b23f296085006
author Debargha Mukherjee <debargha@google.com> Sun Mar 22 18:14:37 2020 -0700
committer Debargha Mukherjee <debargha@google.com> Mon Mar 23 15:04:17 2020 +0000
tree d2438d28aadcce8fda33573f263ee525ba2739c1
parent d1ef460ccc6454cbfbe62f784513197c9537fce4

Use faster encode for hidef videos at high quality

Speed increase by about 25% for high resolution high quality
encoding at cpu-used 0.

BDRATE on hdres2 (65 frames) shows +0.05% increase.

Note there should not be much impact for mid to low quality
encoding since the features are turned on only for 720p
and higher resolutions, frame base_qindex < 80 and
cpu_used = 0.

STATS_CHANGED

BUG=aomedia:2612

Change-Id: Ia70aaf842f9c9fa6ab9085ea024583841080caa8

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 8f6c26f..4371333 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -1270,15 +1270,14 @@
 void av1_set_speed_features_qindex_dependent(AV1_COMP *cpi, int speed) {
   AV1_COMMON *const cm = &cpi->common;
   SPEED_FEATURES *const sf = &cpi->sf;
-  (void)cm;
-  (void)sf;
-  (void)speed;
-  /* Turn trellis off
   const int is_720p_or_larger = AOMMIN(cm->width, cm->height) >= 720;
-  if (is_720p_or_larger && speed == 0) {
-    if (cm->base_qindex < 96) {
-      sf->rd_sf.optimize_coefficients = NO_TRELLIS_OPT;
+  if (is_720p_or_larger && cpi->oxcf.mode == GOOD && speed == 0) {
+    if (cm->base_qindex <= 80) {
+      sf->part_sf.simple_motion_search_split =
+          cm->allow_screen_content_tools ? 1 : 2;
+      sf->tx_sf.inter_tx_size_search_init_depth_rect = 1;
+      sf->tx_sf.inter_tx_size_search_init_depth_sqr = 1;
+      sf->tx_sf.intra_tx_size_search_init_depth_rect = 1;
     }
   }
-  */
 }