Merge "Using mi_cols instead of mb_cols."

diff --cc vp9/common/vp9_onyxc_int.h
index 9d700cda45574944d14ea7ffb1b6fbada7028b6d,f31d5a21c1464aa310c933829565378e3b116737..7094e711d7be9eca86571d17f46eff2f4997432e
--- 1/vp9/common/vp9_onyxc_int.h
--- 2/vp9/common/vp9_onyxc_int.h
+++ b/vp9/common/vp9_onyxc_int.h
@@@ -301,14 -301,15 +301,14 @@@ static void ref_cnt_fb(int *buf, int *i
    buf[new_idx]++;
  }
  
- static int mi_cols_aligned_to_sb(VP9_COMMON *cm) {
-   return 2 * ((cm->mb_cols + 3) & ~3);
+ static int mi_cols_aligned_to_sb(int n_mis) {
+   return ALIGN_POWER_OF_TWO(n_mis, LOG2_MI_BLOCK_SIZE);
  }
  
 -static INLINE void set_partition_seg_context(VP9_COMMON *cm,
 -                                             MACROBLOCKD *xd,
 +static INLINE void set_partition_seg_context(VP9_COMMON *cm, MACROBLOCKD *xd,
                                               int mi_row, int mi_col) {
    xd->above_seg_context = cm->above_seg_context + mi_col;
 -  xd->left_seg_context  = cm->left_seg_context + (mi_row & MI_MASK);
 +  xd->left_seg_context = cm->left_seg_context + (mi_row & MI_MASK);
  }
  
  static int check_bsize_coverage(VP9_COMMON *cm, MACROBLOCKD *xd,

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
Simple merge