commit 13c42779ed4e04ad26c77769ac8767566a0d9ac1
author Jingning Han <jingning@google.com> Mon Dec 11 14:31:56 2017 -0800
committer Jingning Han <jingning@google.com> Tue Dec 12 15:59:21 2017 +0000
tree cb90d5469ca5f49f848dc65d0aaac77d53cd7ceb
parent 6f14969a2b0a5d0435364d4309dfc2a3d50f583e

Simplify logics in select_tx_type_yrd

Remove unnecessary inter / intra condition check.

Change-Id: I51b776a3df6ce45b31fe3d2f43fbf6ca7b1d14fb

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 243b32c..20c3547 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4256,29 +4256,10 @@
       !xd->lossless[xd->mi[0]->mbmi.segment_id]) {
     const int ext_tx_set = get_ext_tx_set(mbmi->min_tx_size, bsize, is_inter,
                                           cm->reduced_tx_set_used);
-    if (is_inter) {
-      if (ext_tx_set > 0)
-        rd_stats->rate +=
-            x->inter_tx_type_costs[ext_tx_set]
-                                  [txsize_sqr_map[mbmi->min_tx_size]]
-                                  [mbmi->tx_type];
-    } else {
-      if (ext_tx_set > 0 && ALLOW_INTRA_EXT_TX) {
-#if CONFIG_FILTER_INTRA
-        PREDICTION_MODE intra_dir;
-        if (mbmi->filter_intra_mode_info.use_filter_intra_mode[0])
-          intra_dir = fimode_to_intradir[mbmi->filter_intra_mode_info
-                                             .filter_intra_mode[0]];
-        else
-          intra_dir = mbmi->mode;
-        rd_stats->rate += x->intra_tx_type_costs[ext_tx_set][mbmi->min_tx_size]
-                                                [intra_dir][mbmi->tx_type];
-#else
-        rd_stats->rate += x->intra_tx_type_costs[ext_tx_set][mbmi->min_tx_size]
-                                                [mbmi->mode][mbmi->tx_type];
-#endif
-      }
-    }
+    if (ext_tx_set > 0)
+      rd_stats->rate +=
+          x->inter_tx_type_costs[ext_tx_set][txsize_sqr_map[mbmi->min_tx_size]]
+                                [mbmi->tx_type];
   }
 #endif  // CONFIG_TXK_SEL