commit ab9ecbabe8c219920c86a1dc6c58d4f842131a02
author Jingning Han <jingning@google.com> Fri Jan 13 09:11:58 2017 -0800
committer Jingning Han <jingning@google.com> Fri Jan 13 20:30:28 2017 +0000
tree ad3ec618b3ea3ca2043d30ebb3568c4ba64ecdc7
parent 8a630493b5184aaf5ff4df3e706ec130d8bb4358

Refactor end-node process in var-tx

Change-Id: If38fa7e7816a556602c937f0526f5842cc216bf3

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index ff8cb00..7c59417 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -347,14 +347,14 @@
 
     if (tx_size == TX_8X8) {
       int idx, idy;
-      inter_tx_size[0][0] = TX_4X4;
+      inter_tx_size[0][0] = sub_txs;
       for (idy = 0; idy < tx_size_high_unit[tx_size] / 2; ++idy)
         for (idx = 0; idx < tx_size_wide_unit[tx_size] / 2; ++idx)
           inter_tx_size[idy][idx] = inter_tx_size[0][0];
-      mbmi->tx_size = TX_4X4;
+      mbmi->tx_size = sub_txs;
       mbmi->min_tx_size = get_min_tx_size(mbmi->tx_size);
       txfm_partition_update(xd->above_txfm_context + tx_col,
-                            xd->left_txfm_context + tx_row, TX_4X4, tx_size);
+                            xd->left_txfm_context + tx_row, sub_txs, tx_size);
       return;
     }
 

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 8a0b863..ba8b1e8 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -400,7 +400,7 @@
 
     if (tx_size == TX_8X8) {
       txfm_partition_update(xd->above_txfm_context + tx_col,
-                            xd->left_txfm_context + tx_row, TX_4X4, tx_size);
+                            xd->left_txfm_context + tx_row, sub_txs, tx_size);
       return;
     }