commit 9eef06df5ff0ea218a9ca31041809b9f4699b348
author Jingning Han <jingning@google.com> Mon Dec 05 12:39:34 2016 -0800
committer Jingning Han <jingning@google.com> Tue Dec 06 01:45:09 2016 +0000
tree 494f3df802fe791ec1c569ac9da422f99a77ba3b
parent 276c2943ca0cb50de9793bf65d785028ff9e6aa8

Refactor get_entropy_contexts_plane() block step count

Make this scalable to minimum transform block size.

Change-Id: I13b0ac841df4e87e6c6bcd8be358d817b4be4328

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 573f4f5..6a33acb 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -550,8 +550,8 @@
     BLOCK_SIZE plane_bsize, TX_SIZE tx_size, const struct macroblockd_plane *pd,
     ENTROPY_CONTEXT t_above[2 * MAX_MIB_SIZE],
     ENTROPY_CONTEXT t_left[2 * MAX_MIB_SIZE]) {
-  const int num_4x4_w = num_4x4_blocks_wide_lookup[plane_bsize];
-  const int num_4x4_h = num_4x4_blocks_high_lookup[plane_bsize];
+  const int num_4x4_w = block_size_wide[plane_bsize] >> tx_size_wide_log2[0];
+  const int num_4x4_h = block_size_high[plane_bsize] >> tx_size_high_log2[0];
   const ENTROPY_CONTEXT *const above = pd->above_context;
   const ENTROPY_CONTEXT *const left = pd->left_context;