commit 5680a01d5ba0e2ff6e26366e135deb36eb9aa535
author Sarah Parker <sarahparker@google.com> Wed Jun 21 09:41:25 2017 -0700
committer Sarah Parker <sarahparker@google.com> Wed Jun 28 15:25:04 2017 +0000
tree 55d3dbaebbcce241d1ceea61bb57ff272ed86841
parent 50f1911192048d0fce41516a9b440d7cb231a733

Extend DISABLE_TRELLISQ_SEARCH to include calls from var-tx

Currently, trellis optimization is performed in
av1_tx_block_rd_b when var-tx is enabled even when DISABLE_TRELLISQ_SEARCH
is set to 1.

The drop in performance when DISABLE_TRELLISQ_SEARCH is set to 1 is
1.8% on lowres

Change-Id: I89e26d4d4f57944db11b528d0e10048ae650d8a1

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index f896745..1731b23 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4199,10 +4199,16 @@
   return;
 #endif
 
+#if DISABLE_TRELLISQ_SEARCH
+  av1_xform_quant(cm, x, plane, block, blk_row, blk_col, plane_bsize, tx_size,
+                  coeff_ctx, AV1_XFORM_QUANT_B);
+
+#else
   av1_xform_quant(cm, x, plane, block, blk_row, blk_col, plane_bsize, tx_size,
                   coeff_ctx, AV1_XFORM_QUANT_FP);
 
   av1_optimize_b(cm, x, plane, block, plane_bsize, tx_size, a, l);
+#endif  // DISABLE_TRELLISQ_SEARCH
 
 // TODO(any): Use av1_dist_block to compute distortion
 #if CONFIG_HIGHBITDEPTH