commit f20a1b3c42214ce4178432a0bfc14e402e8b27df
author Debargha Mukherjee <debargha@google.com> Tue Jul 09 09:41:49 2019 -0700
committer Debargha Mukherjee <debargha@google.com> Tue Jul 09 20:14:18 2019 +0000
tree 7bca14e75015a58809c695697e617c6fd622fc2e
parent edfa4fe20b7632df5350176b7b9f8f7346368709

Enable tpl-model/delta-q for superres

Change-Id: I1a27bcd941db49d9b92263bd6787468b7f2241ac

av1/av1_cx_iface.c

diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 8cffe15..2a1f61a 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -861,8 +861,7 @@
     oxcf->timing_info_present = 0;
   }
 
-  oxcf->enable_tpl_model =
-      (oxcf->superres_mode == SUPERRES_NONE) ? extra_cfg->enable_tpl_model : 0;
+  oxcf->enable_tpl_model = extra_cfg->enable_tpl_model;
 
   oxcf->aq_mode = extra_cfg->aq_mode;
   oxcf->deltaq_mode = extra_cfg->deltaq_mode;
@@ -870,10 +869,7 @@
   // superres. If superres is being used on the other hand, turn
   // delta_q off.
   if (oxcf->deltaq_mode == DELTA_Q_OBJECTIVE && !oxcf->enable_tpl_model) {
-    if (oxcf->superres_mode == SUPERRES_NONE)
-      oxcf->enable_tpl_model = 1;
-    else
-      oxcf->deltaq_mode = NO_DELTA_Q;
+    oxcf->enable_tpl_model = 1;
   }
 
   oxcf->deltalf_mode =