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);

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 8ac38e8..802fd22 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -3122,9 +3122,8 @@
   const int diff_stride = max_blocks_wide;
   const int16_t *diff = &p->src_diff[4 * (blk_row * diff_stride + blk_col)];
   int txb_coeff_cost;
-#if CONFIG_EXT_TX
-  assert(tx_size < TX_SIZES);
-#endif  // CONFIG_EXT_TX
+
+  assert(tx_size < TX_SIZES_ALL);
 
   if (xd->mb_to_bottom_edge < 0)
     max_blocks_high += xd->mb_to_bottom_edge >> (3 + pd->subsampling_y);
@@ -3268,9 +3267,7 @@
   const int tx_size_ctx = txsize_sqr_map[tx_size];
 
   av1_init_rd_stats(&sum_rd_stats);
-#if CONFIG_EXT_TX
-  assert(tx_size < TX_SIZES);
-#endif  // CONFIG_EXT_TX
+  assert(tx_size < TX_SIZES_ALL);
 
   if (ref_best_rd < 0) {
     *is_cost_valid = 0;
@@ -3333,9 +3330,9 @@
 
     sum_rd_stats.rate =
         av1_cost_bit(cpi->common.fc->txfm_partition_prob[ctx], 1);
-#if CONFIG_EXT_TX
-    assert(tx_size < TX_SIZES);
-#endif  // CONFIG_EXT_TX
+
+    assert(tx_size < TX_SIZES_ALL);
+
     for (i = 0; i < 4 && this_cost_valid; ++i) {
       int offsetr = blk_row + (i >> 1) * bsl;
       int offsetc = blk_col + (i & 0x01) * bsl;
@@ -3652,9 +3649,7 @@
   const int max_blocks_high = max_block_high(xd, plane_bsize, plane);
   const int max_blocks_wide = max_block_wide(xd, plane_bsize, plane);
 
-#if CONFIG_EXT_TX
-  assert(tx_size < TX_SIZES);
-#endif  // CONFIG_EXT_TX
+  assert(tx_size < TX_SIZES_ALL);
 
   if (blk_row >= max_blocks_high || blk_col >= max_blocks_wide) return;