commit 814737209499bf13ac1c4c0cf7cbc1e6b9bad477
author Angie Chiang <angiebird@google.com> Tue Jun 27 12:46:44 2017 -0700
committer Angie Chiang <angiebird@google.com> Wed Jun 28 01:10:49 2017 +0000
tree 08c504973492ebbd7bf07121787505d23cbc3cd7
parent 6c4af6b7c809f4cf0127bc0db2fa587a6f986924

Fix lv_map when accounting is on

Change-Id: I2e5191d0274776521ec7e3a2f79468dc86adb9e0

av1/decoder/decodetxb.c

diff --git a/av1/decoder/decodetxb.c b/av1/decoder/decodetxb.c
index 3db4790..98262cd 100644
--- a/av1/decoder/decodetxb.c
+++ b/av1/decoder/decodetxb.c
@@ -90,7 +90,7 @@
     int eob_ctx = get_eob_ctx(tcoeffs, scan[c], txs_ctx);
 
     if (c < seg_eob - 1)
-      is_nz = aom_read(r, nz_map[coeff_ctx], tx_size);
+      is_nz = aom_read(r, nz_map[coeff_ctx], ACCT_STR);
     else
       is_nz = 1;
 
@@ -105,7 +105,7 @@
     if (counts) ++(*nz_map_count)[coeff_ctx][is_nz];
 
     if (is_nz) {
-      int is_eob = aom_read(r, eob_flag[eob_ctx], tx_size);
+      int is_eob = aom_read(r, eob_flag[eob_ctx], ACCT_STR);
       if (counts) ++counts->eob_flag[txs_ctx][plane_type][eob_ctx][is_eob];
       if (is_eob) break;
     }
@@ -129,7 +129,7 @@
 
       ctx = get_base_ctx(tcoeffs, scan[c], bwl, height, i + 1);
 
-      if (aom_read(r, coeff_base[ctx], tx_size)) {
+      if (aom_read(r, coeff_base[ctx], ACCT_STR)) {
         *v = i + 1;
         cul_level += i + 1;
 
@@ -137,7 +137,8 @@
 
         if (c == 0) {
           int dc_sign_ctx = txb_ctx->dc_sign_ctx;
-          sign = aom_read(r, cm->fc->dc_sign[plane_type][dc_sign_ctx], tx_size);
+          sign =
+              aom_read(r, cm->fc->dc_sign[plane_type][dc_sign_ctx], ACCT_STR);
           if (counts) ++counts->dc_sign[plane_type][dc_sign_ctx][sign];
         } else {
           sign = aom_read_bit(r, ACCT_STR);
@@ -163,7 +164,7 @@
 
     if (c == 0) {
       int dc_sign_ctx = txb_ctx->dc_sign_ctx;
-      sign = aom_read(r, cm->fc->dc_sign[plane_type][dc_sign_ctx], tx_size);
+      sign = aom_read(r, cm->fc->dc_sign[plane_type][dc_sign_ctx], ACCT_STR);
       if (counts) ++counts->dc_sign[plane_type][dc_sign_ctx][sign];
     } else {
       sign = aom_read_bit(r, ACCT_STR);
@@ -174,7 +175,7 @@
     if (cm->fc->coeff_lps[txs_ctx][plane_type][ctx] == 0) exit(0);
 
     for (idx = 0; idx < COEFF_BASE_RANGE; ++idx) {
-      if (aom_read(r, cm->fc->coeff_lps[txs_ctx][plane_type][ctx], tx_size)) {
+      if (aom_read(r, cm->fc->coeff_lps[txs_ctx][plane_type][ctx], ACCT_STR)) {
         *v = (idx + 1 + NUM_BASE_LEVELS);
         if (sign) *v = -(*v);
         cul_level += abs(*v);