| Index: source/libvpx/vp8/encoder/pickinter.c
|
| ===================================================================
|
| --- source/libvpx/vp8/encoder/pickinter.c (revision 172621)
|
| +++ source/libvpx/vp8/encoder/pickinter.c (working copy)
|
| @@ -389,16 +389,15 @@
|
|
|
| }
|
|
|
| -static void update_mvcount(VP8_COMP *cpi, MACROBLOCK *x, int_mv *best_ref_mv)
|
| +static void update_mvcount(VP8_COMP *cpi, MACROBLOCKD *xd, int_mv *best_ref_mv)
|
| {
|
| - MACROBLOCKD *xd = &x->e_mbd;
|
| /* Split MV modes currently not supported when RD is nopt enabled,
|
| * therefore, only need to modify MVcount in NEWMV mode. */
|
| if (xd->mode_info_context->mbmi.mode == NEWMV)
|
| {
|
| - x->MVcount[0][mv_max+((xd->mode_info_context->mbmi.mv.as_mv.row -
|
| + cpi->MVcount[0][mv_max+((xd->mode_info_context->mbmi.mv.as_mv.row -
|
| best_ref_mv->as_mv.row) >> 1)]++;
|
| - x->MVcount[1][mv_max+((xd->mode_info_context->mbmi.mv.as_mv.col -
|
| + cpi->MVcount[1][mv_max+((xd->mode_info_context->mbmi.mv.as_mv.col -
|
| best_ref_mv->as_mv.col) >> 1)]++;
|
| }
|
| }
|
| @@ -1241,11 +1240,11 @@
|
| != cpi->common.ref_frame_sign_bias[xd->mode_info_context->mbmi.ref_frame])
|
| best_ref_mv.as_int = best_ref_mv_sb[!sign_bias].as_int;
|
|
|
| - update_mvcount(cpi, x, &best_ref_mv);
|
| + update_mvcount(cpi, &x->e_mbd, &best_ref_mv);
|
| }
|
|
|
|
|
| -void vp8_pick_intra_mode(MACROBLOCK *x, int *rate_)
|
| +void vp8_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate_)
|
| {
|
| int error4x4, error16x16 = INT_MAX;
|
| int rate, best_rate = 0, distortion, best_sse;
|
|
|