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/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index e4d8db0..4915f78 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1871,10 +1871,10 @@
 #if CONFIG_PALETTE
   for (plane = 0; plane <= 1; ++plane) {
     if (m->mbmi.palette_mode_info.palette_size[plane] > 0) {
-      const int rows = (4 * num_4x4_blocks_high_lookup[m->mbmi.sb_type]) >>
-                       (xd->plane[plane].subsampling_y);
-      const int cols = (4 * num_4x4_blocks_wide_lookup[m->mbmi.sb_type]) >>
-                       (xd->plane[plane].subsampling_x);
+      const int rows =
+          block_size_high[m->mbmi.sb_type] >> (xd->plane[plane].subsampling_y);
+      const int cols =
+          block_size_wide[m->mbmi.sb_type] >> (xd->plane[plane].subsampling_x);
       assert(*tok < tok_end);
       pack_palette_tokens(w, tok, m->mbmi.palette_mode_info.palette_size[plane],
                           rows * cols - 1);