commit 9353124fe85a4c83b8e0dd518ed96da92187119d
author Jingning Han <jingning@google.com> Tue Dec 20 11:54:36 2016 -0800
committer Jingning Han <jingning@google.com> Wed Dec 21 10:07:22 2016 -0800
tree 79f6bedc4e6ef43e731a71eeae4510f7d90fe52a
parent 443c38d322ebde1d88ef6b87a2adcd1d9775cbed

Refactor supertx implementation

Replace hard coded numbers with table access. Avoid comparing
values from different enums.

Change-Id: I43216db4a9b13ee317e8e517683946f526e5ca0e

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 7881f90..f7d4c65 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -1043,10 +1043,10 @@
   const struct macroblockd_plane *pd = &xd->plane[plane];
   const int ssx = pd->subsampling_x;
   const int ssy = pd->subsampling_y;
-  const int top_w = (4 << b_width_log2_lookup[top_bsize]) >> ssx;
-  const int top_h = (4 << b_height_log2_lookup[top_bsize]) >> ssy;
-  const int w = (4 << b_width_log2_lookup[bsize]) >> ssx;
-  const int h = (4 << b_height_log2_lookup[bsize]) >> ssy;
+  const int top_w = block_size_wide[top_bsize] >> ssx;
+  const int top_h = block_size_high[top_bsize] >> ssy;
+  const int w = block_size_wide[bsize] >> ssx;
+  const int h = block_size_high[bsize] >> ssy;
   const int w_offset = ((mi_col - mi_col_ori) * MI_SIZE) >> ssx;
   const int h_offset = ((mi_row - mi_row_ori) * MI_SIZE) >> ssy;