commit ae5cfde10d327d5ec2c172c19c5f63ef99ec85a9
author Jingning Han <jingning@google.com> Wed Nov 30 12:01:44 2016 -0800
committer Jingning Han <jingning@google.com> Wed Nov 30 12:02:56 2016 -0800
tree 08542348c602ffb4598efcb06f431bdfdd5c3813
parent 73db4ac14dd62670d576df4006c385661ffa21a7

Refactor to use block_size_wide/high[] consistently

Replace the computation of block size in pixels with lookup table
directly.

Change-Id: I39589b2bc1d20372969ff5ad0f60639e64a19b41

av1/encoder/mcomp.c

diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index 4b54a2c..2956447 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -2562,8 +2562,8 @@
   int idx, best_idx = -1;
   unsigned int cost_array[5];
   int kr, kc;
-  const int w = 4 * num_4x4_blocks_wide_lookup[mbmi->sb_type];
-  const int h = 4 * num_4x4_blocks_high_lookup[mbmi->sb_type];
+  const int w = block_size_wide[mbmi->sb_type];
+  const int h = block_size_high[mbmi->sb_type];
   int offset;
   int y_stride;
   const uint8_t *y;
@@ -3064,8 +3064,8 @@
   int idx, best_idx = -1;
   unsigned int cost_array[5];
   int kr, kc;
-  const int w = 4 * num_4x4_blocks_wide_lookup[mbmi->sb_type];
-  const int h = 4 * num_4x4_blocks_high_lookup[mbmi->sb_type];
+  const int w = block_size_wide[mbmi->sb_type];
+  const int h = block_size_high[mbmi->sb_type];
   int offset;
   int y_stride;
   const uint8_t *y;