commit e8d0d4cf671bd22cf16981f74da4bf6b2f300fd2
author Sarah Parker <sarahparker@google.com> Wed Dec 06 15:11:37 2017 -0800
committer Sarah Parker <sarahparker@google.com> Thu Dec 07 21:12:23 2017 +0000
tree 596c6da73686821aa9557509b8c064fd13ecb62d
parent 0c72b2fb676c359bf8dc018689e97aaa0e5f1ef9

Remove ctx from new-quant profile lookup

This simplifies the profile lookup table and removes the requirement
of computing the ctx for new-quant. This change produces a
0.01% drop in performance on 40 frames of lowres.

Change-Id: Ifcbd7d6e427090e02bb43f6de15e551796aa74c4

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 6352c83..8e6835f 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2077,14 +2077,13 @@
   }
 
 #if !CONFIG_TXK_SEL
-  // full forward transform and quantization
-  const int coeff_ctx = combine_entropy_contexts(*a, *l);
+// full forward transform and quantization
 #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);
+                  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_XFORM_QUANT_FP);
 
 // TX-domain results need to shift down to Q2/D10 to match pixel
 // domain distortion values which are in Q2^2
@@ -3763,11 +3762,11 @@
 
 #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);
+                  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_XFORM_QUANT_FP);
 
 // TX-domain results need to shift down to Q2/D10 to match pixel
 // domain distortion values which are in Q2^2