Index: source/libvpx/vp9/common/vp9_mvref_common.c |
=================================================================== |
--- source/libvpx/vp9/common/vp9_mvref_common.c (revision 292072) |
+++ source/libvpx/vp9/common/vp9_mvref_common.c (working copy) |
@@ -21,9 +21,9 @@ |
const int *ref_sign_bias = cm->ref_frame_sign_bias; |
int i, refmv_count = 0; |
const MODE_INFO *prev_mi = !cm->error_resilient_mode && cm->prev_mi |
- ? cm->prev_mi_grid_visible[mi_row * xd->mi_stride + mi_col] |
+ ? cm->prev_mi[mi_row * xd->mi_stride + mi_col].src_mi |
: NULL; |
- const MB_MODE_INFO *const prev_mbmi = prev_mi ? &prev_mi->mbmi : NULL; |
+ const MB_MODE_INFO *const prev_mbmi = prev_mi ? &prev_mi->src_mi->mbmi : NULL; |
const POSITION *const mv_ref_search = mv_ref_blocks[mi->mbmi.sb_type]; |
@@ -41,7 +41,7 @@ |
const POSITION *const mv_ref = &mv_ref_search[i]; |
if (is_inside(tile, mi_col, mi_row, cm->mi_rows, mv_ref)) { |
const MODE_INFO *const candidate_mi = xd->mi[mv_ref->col + mv_ref->row * |
- xd->mi_stride]; |
+ xd->mi_stride].src_mi; |
const MB_MODE_INFO *const candidate = &candidate_mi->mbmi; |
// Keep counts for entropy encoding. |
context_counter += mode_2_counter[candidate->mode]; |
@@ -61,7 +61,7 @@ |
const POSITION *const mv_ref = &mv_ref_search[i]; |
if (is_inside(tile, mi_col, mi_row, cm->mi_rows, mv_ref)) { |
const MB_MODE_INFO *const candidate = &xd->mi[mv_ref->col + mv_ref->row * |
- xd->mi_stride]->mbmi; |
+ xd->mi_stride].src_mi->mbmi; |
different_ref_found = 1; |
if (candidate->ref_frame[0] == ref_frame) |
@@ -87,7 +87,7 @@ |
const POSITION *mv_ref = &mv_ref_search[i]; |
if (is_inside(tile, mi_col, mi_row, cm->mi_rows, mv_ref)) { |
const MB_MODE_INFO *const candidate = &xd->mi[mv_ref->col + mv_ref->row |
- * xd->mi_stride]->mbmi; |
+ * xd->mi_stride].src_mi->mbmi; |
// If the candidate is INTRA we don't want to consider its mv. |
IF_DIFF_REF_FRAME_ADD_MV(candidate); |
@@ -145,7 +145,7 @@ |
int block, int ref, int mi_row, int mi_col, |
int_mv *nearest, int_mv *near) { |
int_mv mv_list[MAX_MV_REF_CANDIDATES]; |
- MODE_INFO *const mi = xd->mi[0]; |
+ MODE_INFO *const mi = xd->mi[0].src_mi; |
b_mode_info *bmi = mi->bmi; |
int n; |