commit cd9b03fb7679301ec1e65fc8bb3da96f7d8698d1
author Angie Chiang <angiebird@google.com> Sun Apr 16 13:37:13 2017 -0700
committer Angie Chiang <angiebird@google.com> Tue Apr 18 20:02:40 2017 +0000
tree 352785e6adc22bf45b9e21c66063211b39c1a1dc
parent f6c807c5a17dc6f50d2c432dec1a089734fba27d

Add txk_sel exp

This will separate the transform kernel selection from lv_map
experiment such that we can evaluate each feature's performance
separately

Note that txk_sel is build on top of lv_map

Change-Id: I5bd1ea99be30000efcdc2bcd42de002b78b1c3c8

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 5b0bae8..882a519 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -324,7 +324,7 @@
 #endif
   MV_REFERENCE_FRAME ref_frame[2];
   TX_TYPE tx_type;
-#if CONFIG_LV_MAP
+#if CONFIG_TXK_SEL
   TX_TYPE txk_type[MAX_SB_SQUARE / (TX_SIZE_W_MIN * TX_SIZE_H_MIN)];
 #endif
 
@@ -906,7 +906,7 @@
                                   int block, TX_SIZE tx_size) {
   const MODE_INFO *const mi = xd->mi[0];
   const MB_MODE_INFO *const mbmi = &mi->mbmi;
-#if !CONFIG_LV_MAP
+#if !CONFIG_TXK_SEL
   const int block_raster_idx = av1_block_index_to_raster_order(tx_size, block);
   if (FIXED_TX_TYPE)
     return get_default_tx_type(plane_type, xd, block_raster_idx, tx_size);
@@ -955,7 +955,7 @@
     return DCT_DCT;
   return mbmi->tx_type;
 #endif  // CONFIG_EXT_TX
-#else   // !CONFIG_LV_MAP
+#else   // !CONFIG_TXK_SEL
   (void)tx_size;
   TX_TYPE tx_type;
   if (plane_type != PLANE_TYPE_Y || xd->lossless[mbmi->segment_id] ||
@@ -966,7 +966,7 @@
   }
   assert(tx_type >= DCT_DCT && tx_type < TX_TYPES);
   return tx_type;
-#endif  // !CONFIG_LV_MAP
+#endif  // !CONFIG_TXK_SEL
 }
 
 void av1_setup_block_planes(MACROBLOCKD *xd, int ss_x, int ss_y);