Index: source/libvpx/vp9/encoder/vp9_mbgraph.c |
=================================================================== |
--- source/libvpx/vp9/encoder/vp9_mbgraph.c (revision 263011) |
+++ source/libvpx/vp9/encoder/vp9_mbgraph.c (working copy) |
@@ -61,7 +61,9 @@ |
&sse); |
} |
- vp9_set_mbmode_and_mvs(xd, NEWMV, dst_mv); |
+ xd->mi[0]->mbmi.mode = NEWMV; |
+ xd->mi[0]->mbmi.mv[0].as_mv = *dst_mv; |
+ |
vp9_build_inter_predictors_sby(xd, mb_row, mb_col, BLOCK_16X16); |
/* restore UMV window */ |
@@ -143,7 +145,7 @@ |
for (mode = DC_PRED; mode <= TM_PRED; mode++) { |
unsigned int err; |
- xd->mi_8x8[0]->mbmi.mode = mode; |
+ xd->mi[0]->mbmi.mode = mode; |
vp9_predict_intra_block(xd, 0, 2, TX_16X16, mode, |
x->plane[0].src.buf, x->plane[0].src.stride, |
xd->plane[0].dst.buf, xd->plane[0].dst.stride, |
@@ -250,7 +252,7 @@ |
xd->plane[0].dst.stride = buf->y_stride; |
xd->plane[0].pre[0].stride = buf->y_stride; |
xd->plane[1].dst.stride = buf->uv_stride; |
- xd->mi_8x8[0] = &mi_local; |
+ xd->mi[0] = &mi_local; |
mi_local.mbmi.sb_type = BLOCK_16X16; |
mi_local.mbmi.ref_frame[0] = LAST_FRAME; |
mi_local.mbmi.ref_frame[1] = NONE; |
@@ -368,7 +370,6 @@ |
else |
cpi->static_mb_pct = 0; |
- cpi->seg0_cnt = ncnt[0]; |
vp9_enable_segmentation(&cm->seg); |
} else { |
cpi->static_mb_pct = 0; |