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/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 7b2f4c4..cd5c50f 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1423,7 +1423,7 @@
 #if CONFIG_SUPERTX
                        const int supertx_enabled,
 #endif
-#if CONFIG_LV_MAP
+#if CONFIG_TXK_SEL
                        int block, int plane,
 #endif
                        aom_writer *w) {
@@ -1440,7 +1440,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
@@ -1939,13 +1939,13 @@
 #endif  // CONFIG_DUAL_FILTE || CONFIG_WARPED_MOTION
   }
 
-#if !CONFIG_LV_MAP
+#if !CONFIG_TXK_SEL
   av1_write_tx_type(cm, xd,
 #if CONFIG_SUPERTX
                     supertx_enabled,
 #endif
                     w);
-#endif  // !CONFIG_LV_MAP
+#endif  // !CONFIG_TXK_SEL
 }
 
 #if CONFIG_DELTA_Q
@@ -2046,13 +2046,13 @@
     write_filter_intra_mode_info(cm, mbmi, w);
 #endif  // CONFIG_FILTER_INTRA
 
-#if !CONFIG_LV_MAP
+#if !CONFIG_TXK_SEL
   av1_write_tx_type(cm, xd,
 #if CONFIG_SUPERTX
                     0,
 #endif
                     w);
-#endif  // !CONFIG_LV_MAP
+#endif  // !CONFIG_TXK_SEL
 }
 
 #if CONFIG_SUPERTX