commit f72e1382e8d180198a013e445513b3fbe57d335a
author Linfeng Zhang <linfengz@google.com> Wed Nov 01 13:59:41 2017 -0700
committer James Zern <jzern@google.com> Thu Nov 09 20:16:26 2017 +0000
tree 8ad58db97660ed9ed516fec4de0fbff00d5c7038
parent 8c841f7d36ffe497825b6a37a82b62b7e9a34a2f

Add av1_get_base_level_counts()

which calculates base level counts in block.

Change-Id: Ia975faad4afbfc0c587bdcd403de3d4dc3f5f411

av1/decoder/decodetxb.c

diff --git a/av1/decoder/decodetxb.c b/av1/decoder/decodetxb.c
index f9c8710..1c9f3b1 100644
--- a/av1/decoder/decodetxb.c
+++ b/av1/decoder/decodetxb.c
@@ -205,15 +205,17 @@
 #if USE_CAUSAL_BASE_CTX
   update_eob = *eob - 1;
 #else
+  uint8_t level_counts[MAX_TX_SQUARE];
   int i;
   for (i = 0; i < NUM_BASE_LEVELS; ++i) {
+    av1_get_base_level_counts(levels, i, width, height, level_counts);
     for (c = *eob - 1; c >= 0; --c) {
       uint8_t *const level = &levels[get_paded_idx(scan[c], bwl)];
       int ctx;
 
       if (*level <= i) continue;
 
-      ctx = get_base_ctx(levels, scan[c], bwl, i);
+      ctx = get_base_ctx(levels, scan[c], bwl, i, level_counts[scan[c]]);
 
       if (av1_read_record_bin(
               counts, r, ec_ctx->coeff_base_cdf[txs_ctx][plane_type][i][ctx], 2,