Some fixes on tx size/type selection

For ext_tx experiment.

Change-Id: Ie37b9b456b09bde8b606fb978fee4cca8d0326b7

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index b55f53ac83f2099942031ecd2b152f518eca25d5..ee731fae7c7e62292c4070972818554ca21f222e 100644 (file)
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -820,8 +820,7 @@ static void choose_largest_tx_size(VP10_COMP *cpi, MACROBLOCK *x,
 #if CONFIG_EXT_TX
   ext_tx_set = get_ext_tx_set(mbmi->tx_size, bs, is_inter);
 
-  if (is_inter &&
-      get_ext_tx_types(mbmi->tx_size, bs, is_inter) > 1 &&
+  if (get_ext_tx_types(mbmi->tx_size, bs, is_inter) > 1 &&
       !xd->lossless[mbmi->segment_id]) {
     for (tx_type = 0; tx_type < TX_TYPES; ++tx_type) {
       if (is_inter) {
@@ -931,12 +930,12 @@ static void choose_largest_tx_size(VP10_COMP *cpi, MACROBLOCK *x,
     if (is_inter) {
       if (ext_tx_set > 0)
         *rate += cpi->inter_tx_type_costs[ext_tx_set][mbmi->tx_size]
-                                                      [mbmi->tx_type];
+                                                     [mbmi->tx_type];
     } else {
       if (ext_tx_set > 0 && ALLOW_INTRA_EXT_TX)
         *rate +=
             cpi->intra_tx_type_costs[ext_tx_set][mbmi->tx_size]
-                                                 [mbmi->mode][mbmi->tx_type];
+                                                [mbmi->mode][mbmi->tx_type];
     }
   }
 #else