commit 4ca8b1c2c6fd6b02f28964a97cb03d36703ee3cd
author Jingning Han <jingning@google.com> Tue Nov 08 10:05:08 2016 -0800
committer Jingning Han <jingning@google.com> Wed Nov 09 01:51:04 2016 +0000
tree e79fa764cade9b405059f0662d80c70f6aed6705
parent 1e4e29f7760d14ae7f52ec869ba92587e742707c

Use tx_size_from_tx_mode() to set tx_size for skip blocks

Unify the use case of largest transform block size fetch for skip
blocks.

Change-Id: I5dd60eb74b266fa7cd7944d8f823dbdae75e90af

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 73283f6..b08c370 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5487,8 +5487,7 @@
       if (xd->lossless[mbmi->segment_id]) tx_size = TX_4X4;
     }
 #else
-      tx_size = AOMMIN(tx_mode_to_biggest_tx_size[cm->tx_mode],
-                       max_txsize_lookup[bsize]);
+      tx_size = tx_size_from_tx_mode(bsize, cm->tx_mode, is_inter);
 #endif
     else
       tx_size = (bsize >= BLOCK_8X8) ? tx_size : TX_4X4;