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/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index f22f744..90eb6d8 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -743,7 +743,7 @@
 #if CONFIG_SUPERTX
                       int supertx_enabled,
 #endif
-#if CONFIG_LV_MAP
+#if CONFIG_TXK_SEL
                       int block, int plane,
 #endif
                       aom_reader *r) {
@@ -760,7 +760,7 @@
   FRAME_CONTEXT *ec_ctx = cm->fc;
 #endif
 
-#if !CONFIG_LV_MAP
+#if !CONFIG_TXK_SEL
   TX_TYPE *tx_type = &mbmi->tx_type;
 #else
   // only y plane's tx_type is transmitted
@@ -980,13 +980,13 @@
     read_filter_intra_mode_info(cm, xd, r);
 #endif  // CONFIG_FILTER_INTRA
 
-#if !CONFIG_LV_MAP
+#if !CONFIG_TXK_SEL
   av1_read_tx_type(cm, xd,
 #if CONFIG_SUPERTX
                    0,
 #endif
                    r);
-#endif  // !CONFIG_LV_MAP
+#endif  // !CONFIG_TXK_SEL
 }
 
 static int read_mv_component(aom_reader *r, nmv_component *mvcomp, int usehp) {
@@ -2183,13 +2183,13 @@
   else
     read_intra_block_mode_info(cm, mi_row, mi_col, xd, mi, r);
 
-#if !CONFIG_LV_MAP
+#if !CONFIG_TXK_SEL
   av1_read_tx_type(cm, xd,
 #if CONFIG_SUPERTX
                    supertx_enabled,
 #endif
                    r);
-#endif  // !CONFIG_LV_MAP
+#endif  // !CONFIG_TXK_SEL
 }
 
 void av1_read_mode_info(AV1Decoder *const pbi, MACROBLOCKD *xd,

av1/decoder/decodemv.h

diff --git a/av1/decoder/decodemv.h b/av1/decoder/decodemv.h
index 35d471b..ceaee1d 100644
--- a/av1/decoder/decodemv.h
+++ b/av1/decoder/decodemv.h
@@ -36,7 +36,7 @@
 #if CONFIG_SUPERTX
                       int supertx_enabled,
 #endif
-#if CONFIG_LV_MAP
+#if CONFIG_TXK_SEL
                       int block, int plane,
 #endif
                       aom_reader *r);

av1/decoder/decodetxb.c

diff --git a/av1/decoder/decodetxb.c b/av1/decoder/decodetxb.c
index c283736..9d8af23 100644
--- a/av1/decoder/decodetxb.c
+++ b/av1/decoder/decodetxb.c
@@ -76,7 +76,9 @@
     return 0;
   }
 
+#if CONFIG_TXK_SEL
   av1_read_tx_type(cm, xd, block, plane, r);
+#endif
   TX_TYPE tx_type = get_tx_type(plane_type, xd, block, tx_size);
   const SCAN_ORDER *const scan_order =
       get_scan(cm, tx_size, tx_type, is_inter_block(mbmi));