commit 2338fa18ff392c265f68ce89e357b2cee95db4b8
author Yue Chen <yuec@google.com> Tue Mar 07 01:40:42 2017 +0800
committer Yue Chen <yuec@google.com> Mon Mar 06 22:59:40 2017 +0000
tree e63dfd3b89590f9e2ebb87f776d20c14c96bdfec
parent 2f103aad88e65868ca2b4101439c3388bec1e328

Make some variables const in MOTION_VAR experiment

Change-Id: Ib9b52d60aba72ee81a298fcbdbf0b25509ff6466

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 5889fb3..d9df67d 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -1553,7 +1553,8 @@
   xd->mi[0]->mbmi.overlappable_neighbors[1] = 0;
 
   if (xd->up_available) {
-    for (i = 0; i < AOMMIN(xd->n8_w, cm->mi_cols - mi_col); i += mi_step) {
+    const int ilimit = AOMMIN(xd->n8_w, cm->mi_cols - mi_col);
+    for (i = 0; i < ilimit; i += mi_step) {
       int mi_row_offset = -1;
       int mi_col_offset = i;
       MODE_INFO *above_mi =
@@ -1572,7 +1573,8 @@
   }
 
   if (xd->left_available) {
-    for (i = 0; i < AOMMIN(xd->n8_h, cm->mi_rows - mi_row); i += mi_step) {
+    const int ilimit = AOMMIN(xd->n8_h, cm->mi_rows - mi_row);
+    for (i = 0; i < ilimit; i += mi_step) {
       int mi_row_offset = i;
       int mi_col_offset = -1;
       MODE_INFO *left_mi =
@@ -1713,12 +1715,13 @@
   const TileInfo *const tile = &xd->tile;
   BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type;
   int i, j, mi_step, ref;
+  const int ilimit = AOMMIN(xd->n8_w, cm->mi_cols - mi_col);
   int mb_to_right_edge_base = xd->mb_to_right_edge;
 
   if (mi_row <= tile->mi_row_start) return;
 
   xd->mb_to_bottom_edge += xd->n8_h * 32;
-  for (i = 0; i < AOMMIN(xd->n8_w, cm->mi_cols - mi_col); i += mi_step) {
+  for (i = 0; i < ilimit; i += mi_step) {
     int mi_row_offset = -1;
     int mi_col_offset = i;
     int mi_x, mi_y, bw, bh;
@@ -1834,12 +1837,13 @@
   const TileInfo *const tile = &xd->tile;
   BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type;
   int i, j, mi_step, ref;
+  const int ilimit = AOMMIN(xd->n8_h, cm->mi_rows - mi_row);
   int mb_to_bottom_edge_base = xd->mb_to_bottom_edge;
 
   if (mi_col == 0 || (mi_col - 1 < tile->mi_col_start)) return;
 
   xd->mb_to_right_edge += xd->n8_w * 32;
-  for (i = 0; i < AOMMIN(xd->n8_h, cm->mi_rows - mi_row); i += mi_step) {
+  for (i = 0; i < ilimit; i += mi_step) {
     int mi_row_offset = i;
     int mi_col_offset = -1;
     int mi_x, mi_y, bw, bh;
@@ -2002,6 +2006,7 @@
   const TileInfo *const tile = &xd->tile;
   BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type;
   int i, j, mi_step, ref;
+  const int ilimit = AOMMIN(xd->n8_w, cm->mi_cols - mi_col);
   int mb_to_right_edge_base = xd->mb_to_right_edge;
 
   if (mi_row + xd->n8_h >= tile->mi_row_end ||
@@ -2010,7 +2015,7 @@
   assert(bsize >= BLOCK_8X8);
 
   xd->mb_to_top_edge -= xd->n8_h * 32;
-  for (i = 0; i < AOMMIN(xd->n8_w, cm->mi_cols - mi_col); i += mi_step) {
+  for (i = 0; i < ilimit; i += mi_step) {
     int mi_row_offset = xd->n8_h;
     int mi_col_offset = i;
     int mi_x, mi_y, bw, bh;
@@ -2127,6 +2132,7 @@
   const TileInfo *const tile = &xd->tile;
   BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type;
   int i, j, mi_step, ref;
+  const int ilimit = AOMMIN(xd->n8_h, cm->mi_rows - mi_row);
   int mb_to_bottom_edge_base = xd->mb_to_bottom_edge;
 
   if (mi_col + xd->n8_w >= tile->mi_col_end ||
@@ -2134,7 +2140,7 @@
     return;
 
   xd->mb_to_left_edge -= xd->n8_w * 32;
-  for (i = 0; i < AOMMIN(xd->n8_h, cm->mi_rows - mi_row); i += mi_step) {
+  for (i = 0; i < ilimit; i += mi_step) {
     int mi_row_offset = i;
     int mi_col_offset = xd->n8_w;
     int mi_x, mi_y, bw, bh;