Merge "Refactor tx_size to pixel number mapping in reconintra.c" into nextgenv2

av1/common/reconintra.c

@@ -228,7 +228,7 @@ static int av1_has_right(BLOCK_SIZE bsize, int mi_row, int mi_col,
                          TX_SIZE txsz, int y, int x, int ss_x) {
   const int wl = mi_width_log2_lookup[bsize];
   const int w = AOMMAX(num_4x4_blocks_wide_lookup[bsize] >> ss_x, 1);
-  const int step = 1 << txsz;
+  const int step = tx_size_wide_unit[txsz];
 
   // TODO(bshacklett, huisu): Currently the RD loop traverses 4X8 blocks in
   // inverted N order while in the bitstream the subblocks are stored in Z
@@ -238,9 +238,8 @@ static int av1_has_right(BLOCK_SIZE bsize, int mi_row, int mi_col,
   // blocks in inverted N order, and then update this function appropriately.
   if (bsize == BLOCK_4X8 && y == 1) return 0;
 
-  if (!right_available) {
+  if (!right_available) return 0;
-    return 0;
+
-  } else {
   // Handle block size 4x8 and 4x4
   if (ss_x == 0 && num_4x4_blocks_wide_lookup[bsize] < 2 && x == 0) return 1;
 
@@ -273,7 +272,6 @@ static int av1_has_right(BLOCK_SIZE bsize, int mi_row, int mi_col,
   } else {
     return x + step < w;
   }
-  }
 }
 
 static int av1_has_bottom(BLOCK_SIZE bsize, int mi_row, int mi_col,