commit 2254c36dd1b59f0d7d3597123a731398daf2337f
author Hui Su <huisu@google.com> Tue Apr 10 11:22:38 2018 -0700
committer Hui Su <huisu@google.com> Wed Apr 11 23:02:37 2018 +0000
tree b893690888cc2b89057265acb8f50a80cb9fde59
parent acd41f92fdaa82a09a9bed06389ea6866c464386

Refactor get_ext_tx_set_type()

-avoid unnecessary table lookup
-remove unused tx type sets

Change-Id: I693ea585982aae73b9c0a7f075dad2d84f8bee62

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 51cd796..cfe9e7d 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -646,7 +646,7 @@
 
 // Number of transform types in each set type
 static const int av1_num_ext_tx_set[EXT_TX_SET_TYPES] = {
-  1, 2, 5, 7, 7, 10, 12, 16, 16,
+  1, 2, 5, 7, 12, 16,
 };
 
 static const int av1_ext_tx_used[EXT_TX_SET_TYPES][TX_TYPES] = {
@@ -654,23 +654,19 @@
   { 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
   { 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0 },
   { 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0 },
-  { 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0 },
-  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0 },
   { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0 },
   { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
-  { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
 };
 
-static INLINE TxSetType get_ext_tx_set_type(TX_SIZE tx_size, int is_inter,
-                                            int use_reduced_set) {
+static INLINE TxSetType av1_get_ext_tx_set_type(TX_SIZE tx_size, int is_inter,
+                                                int use_reduced_set) {
   const TX_SIZE tx_size_sqr_up = txsize_sqr_up_map[tx_size];
-  const TX_SIZE tx_size_sqr = txsize_sqr_map[tx_size];
-
   if (tx_size_sqr_up > TX_32X32) return EXT_TX_SET_DCTONLY;
   if (tx_size_sqr_up == TX_32X32)
     return is_inter ? EXT_TX_SET_DCT_IDTX : EXT_TX_SET_DCTONLY;
   if (use_reduced_set)
     return is_inter ? EXT_TX_SET_DCT_IDTX : EXT_TX_SET_DTT4_IDTX;
+  const TX_SIZE tx_size_sqr = txsize_sqr_map[tx_size];
   if (is_inter) {
     return (tx_size_sqr == TX_16X16 ? EXT_TX_SET_DTT9_IDTX_1DDCT
                                     : EXT_TX_SET_ALL16);
@@ -683,21 +679,22 @@
 // Maps tx set types to the indices.
 static const int ext_tx_set_index[2][EXT_TX_SET_TYPES] = {
   { // Intra
-    0, -1, 2, -1, 1, -1, -1, -1, -16 },
+    0, -1, 2, 1, -1, -1 },
   { // Inter
-    0, 3, -1, -1, -1, -1, 2, -1, 1 },
+    0, 3, -1, -1, 2, 1 },
 };
 
 static INLINE int get_ext_tx_set(TX_SIZE tx_size, int is_inter,
                                  int use_reduced_set) {
   const TxSetType set_type =
-      get_ext_tx_set_type(tx_size, is_inter, use_reduced_set);
+      av1_get_ext_tx_set_type(tx_size, is_inter, use_reduced_set);
   return ext_tx_set_index[is_inter][set_type];
 }
 
 static INLINE int get_ext_tx_types(TX_SIZE tx_size, int is_inter,
                                    int use_reduced_set) {
-  const int set_type = get_ext_tx_set_type(tx_size, is_inter, use_reduced_set);
+  const int set_type =
+      av1_get_ext_tx_set_type(tx_size, is_inter, use_reduced_set);
   return av1_num_ext_tx_set[set_type];
 }
 
@@ -824,7 +821,7 @@
   const MB_MODE_INFO *const mbmi = xd->mi[0];
   const struct macroblockd_plane *const pd = &xd->plane[plane_type];
   const TxSetType tx_set_type =
-      get_ext_tx_set_type(tx_size, is_inter_block(mbmi), reduced_tx_set);
+      av1_get_ext_tx_set_type(tx_size, is_inter_block(mbmi), reduced_tx_set);
 
   TX_TYPE tx_type;
   if (xd->lossless[mbmi->segment_id] || txsize_sqr_up_map[tx_size] > TX_32X32) {