commit aa0c34b0f8f8cc54a5e654cc6e71cabdcf704333
author Angie Chiang <angiebird@google.com> Tue Apr 25 12:25:38 2017 -0700
committer Angie Chiang <angiebird@google.com> Tue Apr 25 22:11:12 2017 +0000
tree 5b442da4737c7895bf7a20f8f838ceec2ea83eb2
parent 1876a84c8c6b7431fb5008a1f9f5cb3f1af19ba0

Use av1_tx_type_cost() in choose_largest_tx_size()

BUG=aomedia:442

Change-Id: Ieef34848e73eb31428c6b8652312fc9421605033

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index a43aef0..f2e6d51 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1977,6 +1977,7 @@
   int s1 = av1_cost_bit(skip_prob, 1);
   const int is_inter = is_inter_block(mbmi);
   int prune = 0;
+  const int plane = 0;
 #if CONFIG_EXT_TX
   int ext_tx_set;
 #endif  // CONFIG_EXT_TX
@@ -2036,22 +2037,7 @@
       od_encode_rollback(&x->daala_enc, &pre_buf);
 #endif  // CONFIG_PVQ
       if (this_rd_stats.rate == INT_MAX) continue;
-      if (get_ext_tx_types(mbmi->tx_size, bs, is_inter,
-                           cm->reduced_tx_set_used) > 1) {
-        if (is_inter) {
-          if (ext_tx_set > 0)
-            this_rd_stats.rate +=
-                cpi->inter_tx_type_costs[ext_tx_set]
-                                        [txsize_sqr_map[mbmi->tx_size]]
-                                        [mbmi->tx_type];
-        } else {
-          if (ext_tx_set > 0 && ALLOW_INTRA_EXT_TX)
-            this_rd_stats.rate +=
-                cpi->intra_tx_type_costs[ext_tx_set]
-                                        [txsize_sqr_map[mbmi->tx_size]]
-                                        [mbmi->mode][mbmi->tx_type];
-        }
-      }
+      av1_tx_type_cost(cpi, xd, bs, plane, mbmi->tx_size, tx_type);
 
       if (this_rd_stats.skip)
         this_rd = RDCOST(x->rdmult, x->rddiv, s1, this_rd_stats.sse);
@@ -2094,17 +2080,12 @@
       txfm_rd_in_plane(x, cpi, &this_rd_stats, ref_best_rd, 0, bs,
                        mbmi->tx_size, cpi->sf.use_fast_coef_costing);
       if (this_rd_stats.rate == INT_MAX) continue;
+
+      av1_tx_type_cost(cpi, xd, bs, plane, mbmi->tx_size, tx_type);
       if (is_inter) {
-        this_rd_stats.rate +=
-            cpi->inter_tx_type_costs[mbmi->tx_size][mbmi->tx_type];
         if (cpi->sf.tx_type_search.prune_mode > NO_PRUNE &&
             !do_tx_type_search(tx_type, prune))
           continue;
-      } else {
-        this_rd_stats.rate +=
-            cpi->intra_tx_type_costs[mbmi->tx_size]
-                                    [intra_mode_to_tx_type_context[mbmi->mode]]
-                                    [mbmi->tx_type];
       }
       if (this_rd_stats.skip)
         this_rd = RDCOST(x->rdmult, x->rddiv, s1, this_rd_stats.sse);