commit 5695d730c11495f2540f181347f148a7d33809e8
author Fyodor Kyslov <kyslov@google.com> Fri Jun 28 16:28:48 2019 -0700
committer Fyodor Kyslov <kyslov@google.com> Sat Jun 29 16:01:54 2019 +0000
tree e5c67818b4321457ecf50aafbfea73455e6d8635
parent c00d16904eb77be0b85d40d9fdff4894ac812dbf

AV1 RT: Fix crash in estimate_mode_intra

BUG=aomedia:2417

Change-Id: I366b245a7f7e02ad2cd265c52ed1c14ba1da0035

av1/encoder/nonrd_pickmode.c

diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index 1f92b8e..ac95229 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -991,21 +991,13 @@
   const int64_t dst_stride = pd->dst.stride;
   RD_STATS this_rdc;
 
+  (void)block;
+  assert(plane == 0);
+
   p->src.buf = &src_buf_base[4 * (row * src_stride + col)];
   pd->dst.buf = &dst_buf_base[4 * (row * dst_stride + col)];
 
-  const int stepr = tx_size_high_unit[tx_size];
-  const int stepc = tx_size_wide_unit[tx_size];
-  const int max_blocks_wide = max_block_wide(xd, block, 0);
-  const int max_blocks_high = max_block_high(xd, block, 0);
-  // Prediction.
-  for (int trow = 0; trow < max_blocks_high; trow += stepr) {
-    for (int tcol = 0; tcol < max_blocks_wide; tcol += stepc) {
-      av1_predict_intra_block_facade(cm, xd, 0, tcol, trow, tx_size);
-    }
-  }
-
-  assert(plane == 0);
+  av1_predict_intra_block_facade(cm, xd, 0, col, row, tx_size);
 
   if (plane == 0) {
     int64_t this_sse = INT64_MAX;