diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2016-01-19 16:40:20 -0800 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2016-01-19 16:40:20 -0800 |
| commit | 5232326716af469eafa6d98fba64f8154c69d9f8 (patch) | |
| tree | be0511ba21d18a0a2b1e389deefae092030ea9b6 /vp9/encoder/vp9_mcomp.c | |
| parent | c0307e6cea0fcd79577eaa107f76b07acaf1d4e6 (diff) | |
| download | libvpx-5232326716af469eafa6d98fba64f8154c69d9f8.tar libvpx-5232326716af469eafa6d98fba64f8154c69d9f8.tar.gz libvpx-5232326716af469eafa6d98fba64f8154c69d9f8.tar.bz2 libvpx-5232326716af469eafa6d98fba64f8154c69d9f8.zip | |
VP9: Eliminate MB_MODE_INFO
Change-Id: Ifa607dd2bb366ce09fa16dfcad3cc45a2440c185
Diffstat (limited to 'vp9/encoder/vp9_mcomp.c')
| -rw-r--r-- | vp9/encoder/vp9_mcomp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index eab07bccb..84ef1b43e 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -1825,7 +1825,7 @@ unsigned int vp9_int_pro_motion_estimation(const VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize, int mi_row, int mi_col) { MACROBLOCKD *xd = &x->e_mbd; - MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi; + MODE_INFO *mi = xd->mi[0]; struct buf_2d backup_yv12[MAX_MB_PLANE] = {{0, 0}}; DECLARE_ALIGNED(16, int16_t, hbuf[128]); DECLARE_ALIGNED(16, int16_t, vbuf[128]); @@ -1839,12 +1839,12 @@ unsigned int vp9_int_pro_motion_estimation(const VP9_COMP *cpi, MACROBLOCK *x, const int src_stride = x->plane[0].src.stride; const int ref_stride = xd->plane[0].pre[0].stride; uint8_t const *ref_buf, *src_buf; - MV *tmp_mv = &xd->mi[0]->mbmi.mv[0].as_mv; + MV *tmp_mv = &xd->mi[0]->mv[0].as_mv; unsigned int best_sad, tmp_sad, this_sad[4]; MV this_mv; const int norm_factor = 3 + (bw >> 5); const YV12_BUFFER_CONFIG *scaled_ref_frame = - vp9_get_scaled_ref_frame(cpi, mbmi->ref_frame[0]); + vp9_get_scaled_ref_frame(cpi, mi->ref_frame[0]); if (scaled_ref_frame) { int i; |