commit fe0fb1d9deccdfb715878e09999fc11ae91a396c
author Timothy B. Terriberry <tterriberry@mozilla.com> Thu May 18 12:15:16 2017 -0700
committer Tim Terriberry <tterriberry@mozilla.com> Sun May 21 22:42:30 2017 +0000
tree f5ff32087b1c6402395b871695208b627c7726c3
parent 2af277a442e40cf5c968df298b83525a37dde65f

cb4x4: Fix indexing of tx_size counts.

Create named constants for the minimum TX_SIZE used in the luma
plane, as well as the minimum allowed TX_SIZE for which we have to
explicitly code a selection (i.e., one larger than the minimum luma
TX_SIZE).

Then, use these constants consistently with tx_size_to_depth() to
index the tx_size counts in FRAME_COUNTS, and also consistently use
TX_SIZE named constants to index the tx_size_implied counts.

Failing to index these counts correctly can, e.g., cause tx_mode to
be chosen incorrectly.

Change-Id: I706a62a33e2282e67c97a68bade87fb8023ec13b

av1/common/pred_common.h

diff --git a/av1/common/pred_common.h b/av1/common/pred_common.h
index 893813e..e171703 100644
--- a/av1/common/pred_common.h
+++ b/av1/common/pred_common.h
@@ -231,7 +231,9 @@
   if (blk_row >= max_blocks_high || blk_col >= max_blocks_wide) return;
 
   if (tx_size == plane_tx_size) {
-    ++xd->counts->tx_size[max_tx_size - TX_8X8][ctx][tx_size];
+    int depth;
+    depth = tx_size_to_depth(tx_size);
+    ++xd->counts->tx_size[max_tx_size - TX_SIZE_CTX_MIN][ctx][depth];
     mbmi->tx_size = tx_size;
   } else {
     int bsl = b_width_log2_lookup[bsize];