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/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index cf646bf..b71c997 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -555,9 +555,9 @@
 
 #if CONFIG_SUPERTX
 static INLINE int supertx_enabled(const MB_MODE_INFO *mbmi) {
-  return (int)txsize_sqr_map[mbmi->tx_size] >
-         AOMMIN(b_width_log2_lookup[mbmi->sb_type],
-                b_height_log2_lookup[mbmi->sb_type]);
+  TX_SIZE max_tx_size = txsize_sqr_map[mbmi->tx_size];
+  return tx_size_wide[max_tx_size] >
+         AOMMIN(block_size_wide[mbmi->sb_type], block_size_high[mbmi->sb_type]);
 }
 #endif  // CONFIG_SUPERTX
 
@@ -869,16 +869,16 @@
 static INLINE TX_SIZE get_uv_tx_size(const MB_MODE_INFO *mbmi,
                                      const struct macroblockd_plane *pd) {
   TX_SIZE uv_txsize;
+#if CONFIG_CB4X4
+  assert(mbmi->tx_size > TX_2X2);
+#endif
+
 #if CONFIG_SUPERTX
   if (supertx_enabled(mbmi))
     return uvsupertx_size_lookup[txsize_sqr_map[mbmi->tx_size]]
                                 [pd->subsampling_x][pd->subsampling_y];
 #endif  // CONFIG_SUPERTX
 
-#if CONFIG_CB4X4
-  assert(mbmi->tx_size > TX_2X2);
-#endif
-
   uv_txsize = uv_txsize_lookup[mbmi->sb_type][mbmi->tx_size][pd->subsampling_x]
                               [pd->subsampling_y];
   assert(uv_txsize != TX_INVALID);