commit 6341f5c5c44ab5a92a44a33d18b4586a3bd12c04
author Yushin Cho <ycho@mozilla.com> Fri Mar 24 14:36:28 2017 -0700
committer Yushin Cho <ycho@mozilla.com> Mon Mar 27 18:52:10 2017 +0000
tree 13d6c83c73a6a60a59f2aa4b73e32f880c2bbc1d
parent 68abef8ca42597b3eb5e16335a35379d1577fcd9

Remove av1 coeff context setting when PVQ is used

Entropy context of above and left block is not used
when PVQ is turned on.

Change-Id: I50c908bba800382438a48f7cc83f8b0f177393a1

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index d2b93f9..2da803b 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1465,8 +1465,11 @@
   use_activity_masking = x->daala_enc.use_activity_masking;
 #endif  // CONFIG_PVQ
 #endif  // CONFIG_DAALA_DIST
+
+#if !CONFIG_PVQ
   ENTROPY_CONTEXT *a = args->t_above + blk_col;
   ENTROPY_CONTEXT *l = args->t_left + blk_row;
+#endif  // CONFIG_PVQ
 
   av1_init_rd_stats(&this_rd_stats);
 
@@ -1580,11 +1583,10 @@
   av1_update_txb_coeff_cost(&this_rd_stats, plane, tx_size, blk_row, blk_col,
                             this_rd_stats.rate);
 #endif  // CONFIG_RD_DEBUG
-
+  av1_set_txb_context(x, plane, block, tx_size, a, l);
 #else
   this_rd_stats.rate = x->rate;
 #endif  // !CONFIG_PVQ
-  av1_set_txb_context(x, plane, block, tx_size, a, l);
 
   rd1 = RDCOST(x->rdmult, x->rddiv, this_rd_stats.rate, this_rd_stats.dist);
   rd2 = RDCOST(x->rdmult, x->rddiv, 0, this_rd_stats.sse);
@@ -5388,8 +5390,6 @@
       *(tl + (k >> 1)) = !(p->eobs[block] == 0);
 #else
       thisrate += x->rate;
-      *(ta + (k & 1)) = !x->pvq_skip[0];
-      *(tl + (k >> 1)) = !x->pvq_skip[0];
 #endif  // !CONFIG_PVQ
 #if CONFIG_EXT_TX
       if (tx_size == TX_8X4) {