commit 05917873d74fac89d3985c5a44aaebd13d52910e
author Angie Chiang <angiebird@google.com> Sat Apr 15 12:28:56 2017 -0700
committer Angie Chiang <angiebird@google.com> Sun Apr 16 23:44:54 2017 +0000
tree de0ad32e9b163e6f9a2fcc3d3d1a3f1ac36f6632
parent b6d770cd5d99c9304eddc23b44893a182562f05d

Correct the tx_type cost for lv_map exp

Change-Id: Ia5e565f910c6d0c0bc6b0dc62f72a5df1346d06e

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index be7eb88..68ac8bd 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -249,8 +249,9 @@
   return;
 }
 
-int av1_cost_coeffs_txb(const AV1_COMMON *const cm, MACROBLOCK *x, int plane,
+int av1_cost_coeffs_txb(const AV1_COMP *const cpi, MACROBLOCK *x, int plane,
                         int block, TXB_CTX *txb_ctx) {
+  const AV1_COMMON *const cm = &cpi->common;
   MACROBLOCKD *const xd = &x->e_mbd;
   const TX_SIZE tx_size = get_tx_size(plane, xd);
   const PLANE_TYPE plane_type = get_plane_type(plane);
@@ -284,6 +285,8 @@
 
   cost = av1_cost_bit(xd->fc->txb_skip[tx_size][txb_skip_ctx], 0);
 
+  cost += av1_tx_type_cost(cpi, xd, mbmi->sb_type, plane, tx_size, tx_type);
+
   for (c = 0; c < eob; ++c) {
     tran_low_t v = qcoeff[scan[c]];
     int is_nz = (v != 0);
@@ -747,7 +750,7 @@
     const SCAN_ORDER *scan_order =
         get_scan(cm, tx_size, tx_type, is_inter_block(mbmi));
     this_rd_stats.rate = av1_cost_coeffs(
-        cm, x, plane, block, tx_size, scan_order, a, l, use_fast_coef_costing);
+        cpi, x, plane, block, tx_size, scan_order, a, l, use_fast_coef_costing);
     int rd = RDCOST(x->rdmult, x->rddiv, 0, this_rd_stats.dist);
     if (rd < best_rd) {
       best_rd = rd;