commit 5e81643d31a44e55308bd71570d1f9732e462bbb
author Timothy B. Terriberry <tterriberry@mozilla.com> Fri May 05 13:58:32 2017 -0700
committer Timothy B. Terriberry <tterriberry@mozilla.com> Sun May 21 15:46:22 2017 -0700
tree f12bdcaad3860a21cf02108dc59dbc23b4f69d7c
parent 31bc29f6ffa8ec844fa62552572509304b876eaf

cb4x4: Don't assume TX units are half MI_SIZE in skip context indexing.

Currently the "transform units" used to measure transform sizes
in some parts of the code are based on the smallest defined
transform size.

cb4x4 currently defines a 2x2 transform size, even when chroma_2x2
is not enabled, which means that the scale of the transform units
was always double that of MODEINFO units.

Several areas of the code were hard-coding this assumption instead
of converting from one to the other using appropriate constants.

Change-Id: Ibc55671aa5bc3ad272cb8a036f9c4f9621df85ab

av1/common/alloccommon.c

diff --git a/av1/common/alloccommon.c b/av1/common/alloccommon.c
index 79d41a9..1a8246c 100644
--- a/av1/common/alloccommon.c
+++ b/av1/common/alloccommon.c
@@ -155,7 +155,8 @@
     for (i = 0; i < MAX_MB_PLANE; i++) {
       aom_free(cm->above_context[i]);
       cm->above_context[i] = (ENTROPY_CONTEXT *)aom_calloc(
-          2 * aligned_mi_cols, sizeof(*cm->above_context[0]));
+          aligned_mi_cols << (MI_SIZE_LOG2 - tx_size_wide_log2[0]),
+          sizeof(*cm->above_context[0]));
       if (!cm->above_context[i]) goto fail;
     }