diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-04-05 00:05:07 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-04-05 00:05:07 -0400 |
| commit | 89bdcc211e717b8f7407dd4af225ffd945dd9fe3 (patch) | |
| tree | 4212fe21393937302ab1ab93b158a5e4146a76fe /vp8/encoder/firstpass.c | |
| parent | 50643fcfd1c82d338a75ada1b26ab3a3a22f8910 (diff) | |
| parent | 91036996ac3871dccf4c6cfe47504c7b99f8555c (diff) | |
| download | libvpx-89bdcc211e717b8f7407dd4af225ffd945dd9fe3.tar libvpx-89bdcc211e717b8f7407dd4af225ffd945dd9fe3.tar.gz libvpx-89bdcc211e717b8f7407dd4af225ffd945dd9fe3.tar.bz2 libvpx-89bdcc211e717b8f7407dd4af225ffd945dd9fe3.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/firstpass.c')
| -rw-r--r-- | vp8/encoder/firstpass.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c index 3ebbba4d6..9a7774863 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -446,7 +446,7 @@ static void first_pass_motion_search(VP8_COMP *cpi, MACROBLOCK *x, MV *ref_mv, M xd->pre.y_buffer = recon_buffer->y_buffer + recon_yoffset; // Initial step/diamond search centred on best mv - tmp_err = cpi->diamond_search_sad(x, b, d, ref_mv, &tmp_mv, step_param, x->errorperbit, &num00, &v_fn_ptr, x->mvsadcost, x->mvcost, ref_mv); + tmp_err = cpi->diamond_search_sad(x, b, d, ref_mv, &tmp_mv, step_param, x->errorperbit, &num00, &v_fn_ptr, x->mvcost, ref_mv); if ( tmp_err < INT_MAX-new_mv_mode_penalty ) tmp_err += new_mv_mode_penalty; @@ -469,7 +469,7 @@ static void first_pass_motion_search(VP8_COMP *cpi, MACROBLOCK *x, MV *ref_mv, M num00--; else { - tmp_err = cpi->diamond_search_sad(x, b, d, ref_mv, &tmp_mv, step_param + n, x->errorperbit, &num00, &v_fn_ptr, x->mvsadcost, x->mvcost, ref_mv); + tmp_err = cpi->diamond_search_sad(x, b, d, ref_mv, &tmp_mv, step_param + n, x->errorperbit, &num00, &v_fn_ptr, x->mvcost, ref_mv); if ( tmp_err < INT_MAX-new_mv_mode_penalty ) tmp_err += new_mv_mode_penalty; @@ -540,7 +540,7 @@ void vp8_first_pass(VP8_COMP *cpi) int flag[2] = {1, 1}; vp8_initialize_rd_consts(cpi, cm->base_qindex+cm->y1dc_delta_q); vpx_memcpy(cm->fc.mvc, vp8_default_mv_context, sizeof(vp8_default_mv_context)); - vp8_build_component_cost_table(cpi->mb.mvcost, cpi->mb.mvsadcost, (const MV_CONTEXT *) cm->fc.mvc, flag); + vp8_build_component_cost_table(cpi->mb.mvcost, (const MV_CONTEXT *) cm->fc.mvc, flag); } // for each macroblock row in image |