commit c2ebfbfc89a5add1dd2ee86a6fe28fc10fb4a777
author Angie Chiang <angiebird@google.com> Sat Apr 15 13:56:58 2017 -0700
committer Angie Chiang <angiebird@google.com> Mon Apr 17 17:46:42 2017 +0000
tree 709b3c10b672c065da97e79d744f43de950fde41
parent 3ca0e672988a30a6abf7537754ccaf9f9e8e1b64

Turn on tx_type search when sb_type < BLOCK_8X8

Change-Id: I8d9686c36ebf7057c4432bb5a29ade78dc21d0a7

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 90f6562..3d9e4e1 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -902,9 +902,8 @@
                                   int block, TX_SIZE tx_size) {
   const MODE_INFO *const mi = xd->mi[0];
   const MB_MODE_INFO *const mbmi = &mi->mbmi;
-  const int block_raster_idx = av1_block_index_to_raster_order(tx_size, block);
 #if !CONFIG_LV_MAP
-
+  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);
 
@@ -958,14 +957,6 @@
   if (plane_type != PLANE_TYPE_Y || xd->lossless[mbmi->segment_id] ||
       mbmi->tx_size >= TX_32X32) {
     tx_type = DCT_DCT;
-  } else if (mbmi->sb_type < BLOCK_8X8) {
-    if (is_inter_block(mbmi))  // Sub8x8-Inter
-      tx_type = DCT_DCT;
-    else  // Sub8x8 Intra OR UV-Intra
-      tx_type =
-          intra_mode_to_tx_type_context[plane_type == PLANE_TYPE_Y
-                                            ? get_y_mode(mi, block_raster_idx)
-                                            : mbmi->uv_mode];
   } else {
     tx_type = mbmi->txk_type[block];
   }