commit 8590156372aca4223708cc7e2f3849601c455400
author Angie Chiang <angiebird@google.com> Fri Mar 17 12:03:27 2017 -0700
committer Angie Chiang <angiebird@google.com> Mon Mar 20 18:16:51 2017 +0000
tree e206e36c0829a58e8a5fb110737e45bdc54de0c7
parent 57795a4c567a7b13b88cdb40e46c9566b35823b0

Change get_txb_skip_context to get_txb_ctx

Generate txb_ctx which contains both txb_skip_ctx and dc_ctx
directly

Change-Id: I5058b72e0b6431a9daf0536925c71da590cf7aeb

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 5a6455d..d83cb26 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -435,10 +435,9 @@
   const uint8_t *const band = get_band_translate(tx_size);
   const int seg_eob = get_tx_eob(&cpi->common.seg, segment_id, tx_size);
   int c, i;
-  int dc_sign;
-  int txb_skip_ctx = get_txb_skip_context(plane_bsize, tx_size, plane,
-                                          pd->above_context + blk_col,
-                                          pd->left_context + blk_row, &dc_sign);
+  TXB_CTX txb_ctx;
+  get_txb_ctx(plane_bsize, tx_size, plane, pd->above_context + blk_col,
+              pd->left_context + blk_row, &txb_ctx);
   const int bwl = b_width_log2_lookup[txsize_to_bsize[tx_size]] + 2;
   int cul_level = 0;
   unsigned int(*nz_map_count)[SIG_COEF_CONTEXTS][2];
@@ -455,8 +454,8 @@
   (void)counts;
   (void)band;
 
-  ++td->counts->txb_skip[tx_size][txb_skip_ctx][eob == 0];
-  x->mbmi_ext->txb_skip_ctx[plane][block] = txb_skip_ctx;
+  ++td->counts->txb_skip[tx_size][txb_ctx.txb_skip_ctx][eob == 0];
+  x->mbmi_ext->txb_skip_ctx[plane][block] = txb_ctx.txb_skip_ctx;
 
   x->mbmi_ext->eobs[plane][block] = eob;
 
@@ -498,7 +497,7 @@
       if (level == i + 1) {
         ++td->counts->coeff_base[tx_size][plane_type][i][ctx][1];
         if (c == 0) {
-          int dc_sign_ctx = get_dc_sign_ctx(dc_sign);
+          int dc_sign_ctx = txb_ctx.dc_sign_ctx;
 
           ++td->counts->dc_sign[plane_type][dc_sign_ctx][v < 0];
           x->mbmi_ext->dc_sign_ctx[plane][block] = dc_sign_ctx;
@@ -521,7 +520,7 @@
 
     cul_level += level;
     if (c == 0) {
-      int dc_sign_ctx = get_dc_sign_ctx(dc_sign);
+      int dc_sign_ctx = txb_ctx.dc_sign_ctx;
 
       ++td->counts->dc_sign[plane_type][dc_sign_ctx][v < 0];
       x->mbmi_ext->dc_sign_ctx[plane][block] = dc_sign_ctx;