Commit 27825e9e authored by Scott LaVarnway's avatar Scott LaVarnway Committed by Gerrit Code Review

Merge "Remove cpi parameter from update_mvcount()"

parents bdca030c 358b0efe
...@@ -389,7 +389,7 @@ static void pick_intra_mbuv_mode(MACROBLOCK *mb) ...@@ -389,7 +389,7 @@ static void pick_intra_mbuv_mode(MACROBLOCK *mb)
} }
static void update_mvcount(VP8_COMP *cpi, MACROBLOCK *x, int_mv *best_ref_mv) static void update_mvcount(MACROBLOCK *x, int_mv *best_ref_mv)
{ {
MACROBLOCKD *xd = &x->e_mbd; MACROBLOCKD *xd = &x->e_mbd;
/* Split MV modes currently not supported when RD is nopt enabled, /* Split MV modes currently not supported when RD is nopt enabled,
...@@ -1241,7 +1241,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, ...@@ -1241,7 +1241,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
!= cpi->common.ref_frame_sign_bias[xd->mode_info_context->mbmi.ref_frame]) != 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; best_ref_mv.as_int = best_ref_mv_sb[!sign_bias].as_int;
update_mvcount(cpi, x, &best_ref_mv); update_mvcount(x, &best_ref_mv);
} }
......
...@@ -1733,7 +1733,7 @@ void vp8_cal_sad(VP8_COMP *cpi, MACROBLOCKD *xd, MACROBLOCK *x, int recon_yoffse ...@@ -1733,7 +1733,7 @@ void vp8_cal_sad(VP8_COMP *cpi, MACROBLOCKD *xd, MACROBLOCK *x, int recon_yoffse
} }
} }
static void rd_update_mvcount(VP8_COMP *cpi, MACROBLOCK *x, int_mv *best_ref_mv) static void rd_update_mvcount(MACROBLOCK *x, int_mv *best_ref_mv)
{ {
if (x->e_mbd.mode_info_context->mbmi.mode == SPLITMV) if (x->e_mbd.mode_info_context->mbmi.mode == SPLITMV)
{ {
...@@ -2608,7 +2608,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, ...@@ -2608,7 +2608,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
!= cpi->common.ref_frame_sign_bias[xd->mode_info_context->mbmi.ref_frame]) != 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; best_ref_mv.as_int = best_ref_mv_sb[!sign_bias].as_int;
rd_update_mvcount(cpi, x, &best_ref_mv); rd_update_mvcount(x, &best_ref_mv);
} }
void vp8_rd_pick_intra_mode(MACROBLOCK *x, int *rate_) void vp8_rd_pick_intra_mode(MACROBLOCK *x, int *rate_)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment