diff options
author | Deb Mukherjee <debargha@google.com> | 2014-10-09 11:14:51 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-10-09 11:14:51 -0700 |
commit | 3117830af31452ab85590770f2b75cc48a60041a (patch) | |
tree | 8ec64162b4463bccff887d84c2dfd6be6f5a3832 /vp9/encoder/vp9_pickmode.c | |
parent | 9ffbc31367668034538c1af707f430e463f022a1 (diff) | |
parent | d78dbff09a1b3166fdd5be07b5227179e6e2dfcb (diff) | |
download | libvpx-3117830af31452ab85590770f2b75cc48a60041a.tar libvpx-3117830af31452ab85590770f2b75cc48a60041a.tar.gz libvpx-3117830af31452ab85590770f2b75cc48a60041a.tar.bz2 libvpx-3117830af31452ab85590770f2b75cc48a60041a.zip |
Merge "Subpel search cleanups and enhancements"
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
-rw-r--r-- | vp9/encoder/vp9_pickmode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index e9fdf1176..b977d859c 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -132,7 +132,7 @@ static int combined_motion_search(VP9_COMP *cpi, MACROBLOCK *x, const int tmp_row_min = x->mv_row_min; const int tmp_row_max = x->mv_row_max; int rv = 0; - int sad_list[5]; + int cost_list[5]; const YV12_BUFFER_CONFIG *scaled_ref_frame = vp9_get_scaled_ref_frame(cpi, ref); if (cpi->common.show_frame && @@ -160,7 +160,7 @@ static int combined_motion_search(VP9_COMP *cpi, MACROBLOCK *x, mvp_full.row >>= 3; vp9_full_pixel_search(cpi, x, bsize, &mvp_full, step_param, sadpb, - cond_sad_list(cpi, sad_list), + cond_cost_list(cpi, cost_list), &ref_mv, &tmp_mv->as_mv, INT_MAX, 0); x->mv_col_min = tmp_col_min; @@ -187,7 +187,7 @@ static int combined_motion_search(VP9_COMP *cpi, MACROBLOCK *x, &cpi->fn_ptr[bsize], cpi->sf.mv.subpel_force_stop, cpi->sf.mv.subpel_iters_per_step, - cond_sad_list(cpi, sad_list), + cond_cost_list(cpi, cost_list), x->nmvjointcost, x->mvcost, &dis, &x->pred_sse[ref], NULL, 0, 0); x->pred_mv[ref] = tmp_mv->as_mv; |