commit 8d69a6e816c4d74914a4134a8f5fd08252c04a95
author Debargha Mukherjee <debargha@google.com> Wed Jan 06 14:36:13 2016 -0800
committer Debargha Mukherjee <debargha@google.com> Thu Jan 21 17:45:30 2016 -0800
tree 0cd0e50a1cdd34dd94cf8ff33ff8fe00dcf5d297
parent b1d49f24b475b94ac48c30e1c016b1e124e10401

Some fixes on tx size/type selection

For ext_tx experiment.

Change-Id: Ie37b9b456b09bde8b606fb978fee4cca8d0326b7

vp10/encoder/rdopt.c

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index b55f53a..ee731fa 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -820,8 +820,7 @@
 #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 @@
     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