Turn on txk-sel by default

Change-Id: Ib95dba539a3677421d4c7ee5e2f3faaf2ebc8773

av1/encoder/rdopt.c

@@ -3631,15 +3631,18 @@ void av1_tx_block_rd_b(const AV1_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
                        int plane_bsize, const ENTROPY_CONTEXT *a,
                        const ENTROPY_CONTEXT *l, RD_STATS *rd_stats, int fast,
                        TX_SIZE_RD_INFO *rd_info_array) {
-  const AV1_COMMON *const cm = &cpi->common;
-  MACROBLOCKD *xd = &x->e_mbd;
-  const struct macroblock_plane *const p = &x->plane[plane];
-  struct macroblockd_plane *const pd = &xd->plane[plane];
 #if CONFIG_TXK_SEL
+  (void)fast;
+  (void)rd_info_array;
   search_txk_type(cpi, x, plane, block, blk_row, blk_col, plane_bsize, tx_size,
                   a, l, 0, rd_stats);
   return;
-#endif
+#else
+  const AV1_COMMON *const cm = &cpi->common;
+  MACROBLOCKD *xd = &x->e_mbd;
+  const struct macroblock_plane *const p = &x->plane[plane];
+  struct macroblockd_plane *const pd = &xd->plane[plane];
+
   // This function is used only for inter
   assert(is_inter_block(&xd->mi[0]->mbmi));
   int64_t tmp;
@@ -3837,11 +3840,11 @@ void av1_tx_block_rd_b(const AV1_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
   rd_stats->dist += cur_dist;
   rd_stats->rate += cur_rate;
   rd_stats->skip &= cur_skip;
-
 #if CONFIG_RD_DEBUG
   av1_update_txb_coeff_cost(rd_stats, plane, tx_size, blk_row, blk_col,
                             txb_coeff_cost);
 #endif  // CONFIG_RD_DEBUG
+#endif
 }
 
 static void select_tx_block(const AV1_COMP *cpi, MACROBLOCK *x, int blk_row,

build/cmake/aom_config_defaults.cmake

@@ -156,4 +156,4 @@ set(CONFIG_TILE_INFO_FIRST 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_TIMING_INFO_IN_SEQ_HEADERS 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_TMV 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_TX64X64 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_TXK_SEL 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_TXK_SEL 1 CACHE NUMBER "AV1 experiment flag.")