Disable trellis in estimate_yrd by default
This gives 6.5% speedup for 0.02% loss.
STATS_CHANGED
Change-Id: I45c80dc961b96aa86f07a2bf51cb4c65eab4e06a
diff --git a/aom/aomcx.h b/aom/aomcx.h
index e8af1df..2c4309a 100644
--- a/aom/aomcx.h
+++ b/aom/aomcx.h
@@ -584,7 +584,8 @@
*
* 0 = apply trellis quantization
* 1 = do not apply trellis quantization
- * 2 = disable trellis quantization partially
+ * 2 = disable trellis quantization in rd search
+ * 3 = disable trellis quantization in estimate yrd
*
* By default, the encoder applies optimization on quantized
* coefficients.
diff --git a/apps/aomenc.c b/apps/aomenc.c
index 08bf08d..3663dff 100644
--- a/apps/aomenc.c
+++ b/apps/aomenc.c
@@ -549,8 +549,9 @@
"Enable intra angle delta (0: false, 1: true (default))");
static const arg_def_t disable_trellis_quant =
ARG_DEF(NULL, "disable-trellis-quant", 1,
- "Disable trellis optimization of quantized coefficients (0: false ("
- "default) 1: true 2: partial true)");
+ "Disable trellis optimization of quantized coefficients (0: false "
+ "1: true 2: true for rd search 3: true for estimate yrd serch "
+ "(default))");
static const arg_def_t enable_qm =
ARG_DEF(NULL, "enable-qm", 1,
"Enable quantisation matrices (0: false (default), 1: true)");
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index e8cd508..e9a9b82 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -169,7 +169,7 @@
!CONFIG_SHARP_SETTINGS, // enable_cdef
1, // enable_restoration
1, // enable_obmc
- 0, // disable_trellis_quant
+ 3, // disable_trellis_quant
0, // enable_qm
DEFAULT_QM_Y, // qm_y
DEFAULT_QM_U, // qm_u
