diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-03-26 15:45:11 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-26 15:45:11 -0700 |
| commit | 0437575848c511decf9d298532309e588ec8ce23 (patch) | |
| tree | 8288171bdbedcc9db4bf336690077adb28c34f45 /vp9/common | |
| parent | 38c2d37b9d46f501576ea8914d8d8df1e6099ab8 (diff) | |
| parent | 63f86c149a63c749a3b4061cb948f8e96e9d415c (diff) | |
| download | libvpx-0437575848c511decf9d298532309e588ec8ce23.tar libvpx-0437575848c511decf9d298532309e588ec8ce23.tar.gz libvpx-0437575848c511decf9d298532309e588ec8ce23.tar.bz2 libvpx-0437575848c511decf9d298532309e588ec8ce23.zip | |
Merge "Removing prev_mi_8x8 from MACROBLOCKD."
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 1 | ||||
| -rw-r--r-- | vp9/common/vp9_mvref_common.c | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index ca5a0c2b7..b3f2ec594 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -208,7 +208,6 @@ typedef struct macroblockd { // A NULL indicates that the 8x8 is not part of the image MODE_INFO **mi_8x8; - MODE_INFO **prev_mi_8x8; int up_available; int left_available; diff --git a/vp9/common/vp9_mvref_common.c b/vp9/common/vp9_mvref_common.c index 9f2c2dfac..c043e6c5b 100644 --- a/vp9/common/vp9_mvref_common.c +++ b/vp9/common/vp9_mvref_common.c @@ -193,11 +193,14 @@ static void find_mv_refs_idx(const VP9_COMMON *cm, const MACROBLOCKD *xd, int block, int mi_row, int mi_col) { const int *ref_sign_bias = cm->ref_frame_sign_bias; int i, refmv_count = 0; - const MODE_INFO *prev_mi = cm->coding_use_prev_mi && cm->prev_mi ? - xd->prev_mi_8x8[0] : NULL; + const MODE_INFO *prev_mi = cm->coding_use_prev_mi && cm->prev_mi + ? cm->prev_mi_grid_visible[mi_row * xd->mode_info_stride + mi_col] + : NULL; + const MB_MODE_INFO *const prev_mbmi = prev_mi ? &prev_mi->mbmi : NULL; + + const POSITION *const mv_ref_search = mv_ref_blocks[mi->mbmi.sb_type]; - const MB_MODE_INFO *const prev_mbmi = cm->coding_use_prev_mi && prev_mi ? - &prev_mi->mbmi : NULL; + int different_ref_found = 0; int context_counter = 0; |