commit 1628fccb3f8895f900b337c47ccf463e01370fcf
author Angie Chiang <angiebird@google.com> Thu Apr 13 16:30:30 2017 -0700
committer Angie Chiang <angiebird@google.com> Fri Apr 14 16:16:23 2017 +0000
tree c80689258158d6ae2894a66b97bd10c0158a172b
parent b14b73f92f726b08be221fbea205e2c91ed0d7b4

Write/update tx_type per txb in lv_map exp

Change-Id: I052721017cddd57ff9995e8dd442e4b3436a0b48

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 01c985a..55753a3 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -13,6 +13,8 @@
 #include "av1/common/blockd.h"
 #include "av1/common/idct.h"
 #include "av1/common/pred_common.h"
+#include "av1/encoder/bitstream.h"
+#include "av1/encoder/encodeframe.h"
 #include "av1/encoder/cost.h"
 #include "av1/encoder/encodetxb.h"
 #include "av1/encoder/rdopt.h"
@@ -88,6 +90,7 @@
   aom_write(w, eob == 0, cm->fc->txb_skip[tx_size][txb_ctx->txb_skip_ctx]);
 
   if (eob == 0) return;
+  av1_write_tx_type(cm, xd, block, w);
 
   nz_map = cm->fc->nz_map[tx_size][plane_type];
   eob_flag = cm->fc->eob_flag[tx_size][plane_type];
@@ -453,7 +456,7 @@
     return;
   }
 
-  // update_tx_type_count(cm, mbmi, td, plane, block);
+  av1_update_tx_type_count(cm, xd, block, mbmi->sb_type, tx_size, td->counts);
 
   for (c = 0; c < eob; ++c) {
     tran_low_t v = qcoeff[scan[c]];