diff options
| author | Johann Koenig <johannkoenig@google.com> | 2019-11-08 19:48:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-08 19:48:42 +0000 |
| commit | 8d85e79d6ed90db4c9ab56b72d54e8fd625fdb07 (patch) | |
| tree | 2ce533401923ba244616c51f3b4c2c24f3db3ef6 /vp8 | |
| parent | a4b20252937a2892253314b72bf73c12a472e5e8 (diff) | |
| parent | c08c30348c7327d8ea867a0df56be3c376f6cb16 (diff) | |
| download | libvpx-8d85e79d6ed90db4c9ab56b72d54e8fd625fdb07.tar libvpx-8d85e79d6ed90db4c9ab56b72d54e8fd625fdb07.tar.gz libvpx-8d85e79d6ed90db4c9ab56b72d54e8fd625fdb07.tar.bz2 libvpx-8d85e79d6ed90db4c9ab56b72d54e8fd625fdb07.zip | |
Merge "remove unused vp8_hex_search parameter"
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/mcomp.c | 4 | ||||
| -rw-r--r-- | vp8/encoder/mcomp.h | 2 | ||||
| -rw-r--r-- | vp8/encoder/pickinter.c | 2 | ||||
| -rw-r--r-- | vp8/encoder/temporal_filter.c | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c index 9030f3cbd..9e7f5c7ac 100644 --- a/vp8/encoder/mcomp.c +++ b/vp8/encoder/mcomp.c @@ -837,7 +837,7 @@ static const MV next_chkpts[6][3] = { int vp8_hex_search(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv, int_mv *best_mv, int search_param, int sad_per_bit, const vp8_variance_fn_ptr_t *vfp, int *mvsadcost[2], - int *mvcost[2], int_mv *center_mv) { + int_mv *center_mv) { MV hex[6] = { { -1, -2 }, { 1, -2 }, { 2, 0 }, { 1, 2 }, { -1, 2 }, { -2, 0 } }; @@ -866,8 +866,6 @@ int vp8_hex_search(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv, fcenter_mv.as_mv.row = center_mv->as_mv.row >> 3; fcenter_mv.as_mv.col = center_mv->as_mv.col >> 3; - (void)mvcost; - /* adjust ref_mv to make sure it is within MV range */ vp8_clamp_mv(ref_mv, x->mv_col_min, x->mv_col_max, x->mv_row_min, x->mv_row_max); diff --git a/vp8/encoder/mcomp.h b/vp8/encoder/mcomp.h index 6c77995da..57c18f523 100644 --- a/vp8/encoder/mcomp.h +++ b/vp8/encoder/mcomp.h @@ -36,7 +36,7 @@ void vp8_init3smotion_compensation(MACROBLOCK *x, int stride); int vp8_hex_search(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv, int_mv *best_mv, int search_param, int sad_per_bit, const vp8_variance_fn_ptr_t *vfp, int *mvsadcost[2], - int *mvcost[2], int_mv *center_mv); + int_mv *center_mv); typedef int(fractional_mv_step_fp)(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *bestmv, int_mv *ref_mv, diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index dc72eed88..04f68c324 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -1018,7 +1018,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, #endif bestsme = vp8_hex_search(x, b, d, &mvp_full, &d->bmi.mv, step_param, sadpb, &cpi->fn_ptr[BLOCK_16X16], - x->mvsadcost, x->mvcost, &best_ref_mv); + x->mvsadcost, &best_ref_mv); mode_mv[NEWMV].as_int = d->bmi.mv.as_int; } else { bestsme = cpi->diamond_search_sad( diff --git a/vp8/encoder/temporal_filter.c b/vp8/encoder/temporal_filter.c index 76f99a17d..1c1a55fde 100644 --- a/vp8/encoder/temporal_filter.c +++ b/vp8/encoder/temporal_filter.c @@ -158,7 +158,7 @@ static int vp8_temporal_filter_find_matching_mb_c(VP8_COMP *cpi, /* Ignore mv costing by sending NULL cost arrays */ bestsme = vp8_hex_search(x, b, d, &best_ref_mv1_full, &d->bmi.mv, step_param, sadpb, - &cpi->fn_ptr[BLOCK_16X16], NULL, NULL, &best_ref_mv1); + &cpi->fn_ptr[BLOCK_16X16], NULL, &best_ref_mv1); (void)bestsme; // Ignore unused return value. #if ALT_REF_SUBPEL_ENABLED |