diff options
| author | Angie Chiang <angiebird@google.com> | 2019-06-25 15:43:43 -0700 |
|---|---|---|
| committer | Angie Chiang <angiebird@google.com> | 2019-06-26 15:09:59 -0700 |
| commit | 30e7f9d856eb1cc6df895f6d9562493e04f6116d (patch) | |
| tree | 2f64f969bb73c9baad47a82499ebe592aff73c57 /vp9/encoder/vp9_rdopt.c | |
| parent | 1a363a8cae8539e82f44028548bb8c1a4ae6bd60 (diff) | |
| download | libvpx-30e7f9d856eb1cc6df895f6d9562493e04f6116d.tar libvpx-30e7f9d856eb1cc6df895f6d9562493e04f6116d.tar.gz libvpx-30e7f9d856eb1cc6df895f6d9562493e04f6116d.tar.bz2 libvpx-30e7f9d856eb1cc6df895f6d9562493e04f6116d.zip | |
Remove mv_dist/mv_cost from new mv search funcs
The functions are
diamond_search_sad_new()
vp9_full_pixel_diamond_new()
vp9_refining_search_sad_new()
Change-Id: Ied6fe98b8a1401c95f0488faf781c5cd5e8e0db6
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 2066396f5..d07d91774 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2495,8 +2495,6 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize, MV pred_mv[3]; #if CONFIG_NON_GREEDY_MV - double mv_dist = 0; - double mv_cost = 0; double bestsme; int_mv nb_full_mvs[NB_MVS_NUM]; const int nb_full_mv_num = NB_MVS_NUM; @@ -2582,9 +2580,9 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize, mvp_full.row >>= 3; #if CONFIG_NON_GREEDY_MV - bestsme = vp9_full_pixel_diamond_new( - cpi, x, &mvp_full, step_param, lambda, 1, &cpi->fn_ptr[bsize], - nb_full_mvs, nb_full_mv_num, &tmp_mv->as_mv, &mv_dist, &mv_cost); + bestsme = vp9_full_pixel_diamond_new(cpi, x, &mvp_full, step_param, lambda, 1, + &cpi->fn_ptr[bsize], nb_full_mvs, + nb_full_mv_num, &tmp_mv->as_mv); #else // CONFIG_NON_GREEDY_MV bestsme = vp9_full_pixel_search( cpi, x, bsize, &mvp_full, step_param, cpi->sf.mv.search_method, sadpb, @@ -2625,8 +2623,8 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize, #if CONFIG_NON_GREEDY_MV this_me = vp9_full_pixel_diamond_new( cpi, x, &mvp_full, VPXMAX(step_param, MAX_MVSEARCH_STEPS - step), - lambda, 1, &cpi->fn_ptr[bsize], nb_full_mvs, nb_full_mv_num, &this_mv, - &mv_dist, &mv_cost); + lambda, 1, &cpi->fn_ptr[bsize], nb_full_mvs, nb_full_mv_num, + &this_mv); #else // CONFIG_NON_GREEDY_MV this_me = vp9_full_pixel_search( cpi, x, bsize, &mvp_full, |