commit d3fada809ccecd6f13b524c1fbf966449d1083ed
author Jingning Han <jingning@google.com> Tue Nov 22 10:46:55 2016 -0800
committer Jingning Han <jingning@google.com> Tue Nov 22 20:58:19 2016 +0000
tree ff7de16400cdc729579417ae1847e44a04c13f13
parent 48c410a0f1da0c5bb34a52d49b4948259e503f11

Update tx_size assertions in rd search

The processing units support the rectangular transform block size.
Update the assertion conditions accordingly.

Change-Id: Iebd46dbbb04feaf161fb02f203fa2cde50b2b700

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index cd9587b..6b22d9e 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -1080,9 +1080,7 @@
     int bsl = tx_size_wide_unit[sub_txs];
     int i;
     assert(bsl > 0);
-#if CONFIG_EXT_TX
-    assert(tx_size < TX_SIZES);
-#endif  // CONFIG_EXT_TX
+    assert(tx_size < TX_SIZES_ALL);
 
     for (i = 0; i < 4; ++i) {
       const int offsetr = blk_row + ((i >> 1) * bsl);