Merge "Replacing 64 / MI_SIZE with MI_BLOCK_SIZE."

diff --cc vp9/decoder/vp9_decodframe.c
Simple merge

diff --cc vp9/encoder/vp9_bitstream.c
Simple merge

diff --cc vp9/encoder/vp9_encodeframe.c
index 3b17c367fb909b0b2000e9b58df06da64790224a,bc9b3b55e01254886cde3864b5c61b0c14ec29cf..1a42961b5b6cda990e5e3a87e1c28a55845fd3da
--- 1/vp9/encoder/vp9_encodeframe.c
--- 2/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@@ -1636,22 -1583,9 +1636,22 @@@ static void encode_sb_row(VP9_COMP *cpi
  
    // Code each SB in the row
    for (mi_col = cm->cur_tile_mi_col_start; mi_col < cm->cur_tile_mi_col_end;
-       mi_col += 64 / MI_SIZE) {
+        mi_col += MI_BLOCK_SIZE) {
      int dummy_rate;
      int64_t dummy_dist;
 +
 +    // Initialize a mask of modes that we will not consider;
 +    // cpi->unused_mode_skip_mask = 0x0000000AAE17F800 (test no golden)
 +    if (cpi->common.frame_type == KEY_FRAME)
 +      cpi->unused_mode_skip_mask = 0;
 +    else
 +      cpi->unused_mode_skip_mask = 0xFFFFFFFFFFFFFE00;
 +
 +    if (cpi->sf.reference_masking) {
 +      rd_pick_reference_frame(cpi, tp, mi_row, mi_col,
 +                              &dummy_rate, &dummy_dist);
 +    }
 +
      if (cpi->sf.partition_by_variance || cpi->sf.use_lastframe_partitioning ||
          cpi->sf.use_one_partition_size_always ) {
        const int idx_str = cm->mode_info_stride * mi_row + mi_col;

diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge