Merge "remove unused vp8_hex_search parameter"

Johann Koenig committed 7 years ago

Commit 8d85e792 parents a4b2025 c08c3034 files · +4 −6Browse files

Unified · Split

4 files

vp8/encoder/mcomp.c +1 −3
vp8/encoder/mcomp.h +1 −1
vp8/encoder/pickinter.c +1 −1
vp8/encoder/temporal_filter.c +1 −1

vp8/encoder/mcomp.c+1−3

@@ -837,7 +837,7 @@ static const MV next_chkpts[6][3] = { · 836 unmodified lines
837	837	int vp8_hex_search(MACROBLOCK x, BLOCK b, BLOCKD d, int_mv ref_mv,
838	838	int_mv *best_mv, int search_param, int sad_per_bit,
839	839	const vp8_variance_fn_ptr_t vfp, int mvsadcost[2],
840		− int mvcost[2], int_mv center_mv) {
	840	+ int_mv *center_mv) {
841	841	MV hex[6] = {
842	842	{ -1, -2 }, { 1, -2 }, { 2, 0 }, { 1, 2 }, { -1, 2 }, { -2, 0 }
843	843	};
@@ -866,8 +866,6 @@ int vp8_hex_search(MACROBLOCK x, BLOCK b, BLOCKD d, int_mv ref_mv, · 22 unmodified lines
866	866	fcenter_mv.as_mv.row = center_mv->as_mv.row >> 3;
867	867	fcenter_mv.as_mv.col = center_mv->as_mv.col >> 3;
868	868
869		− (void)mvcost;
870		−
871	869	/* adjust ref_mv to make sure it is within MV range */
872	870	vp8_clamp_mv(ref_mv, x->mv_col_min, x->mv_col_max, x->mv_row_min,
873	871	x->mv_row_max);

vp8/encoder/mcomp.h+1−1

@@ -36,7 +36,7 @@ void vp8_init3smotion_compensation(MACROBLOCK *x, int stride); · 35 unmodified lines
36	36	int vp8_hex_search(MACROBLOCK x, BLOCK b, BLOCKD d, int_mv ref_mv,
37	37	int_mv *best_mv, int search_param, int sad_per_bit,
38	38	const vp8_variance_fn_ptr_t vfp, int mvsadcost[2],
39		− int mvcost[2], int_mv center_mv);
	39	+ int_mv *center_mv);
40	40
41	41	typedef int(fractional_mv_step_fp)(MACROBLOCK x, BLOCK b, BLOCKD *d,
42	42	int_mv bestmv, int_mv ref_mv,

vp8/encoder/pickinter.c+1−1

@@ -1018,7 +1018,7 @@ void vp8_pick_inter_mode(VP8_COMP cpi, MACROBLOCK x, int recon_yoffset, · 1017 unmodified lines
1018	1018	#endif
1019	1019	bestsme = vp8_hex_search(x, b, d, &mvp_full, &d->bmi.mv, step_param,
1020	1020	sadpb, &cpi->fn_ptr[BLOCK_16X16],
1021		− x->mvsadcost, x->mvcost, &best_ref_mv);
	1021	+ x->mvsadcost, &best_ref_mv);
1022	1022	mode_mv[NEWMV].as_int = d->bmi.mv.as_int;
1023	1023	} else {
1024	1024	bestsme = cpi->diamond_search_sad(

vp8/encoder/temporal_filter.c+1−1

@@ -158,7 +158,7 @@ static int vp8_temporal_filter_find_matching_mb_c(VP8_COMP *cpi, · 157 unmodified lines
158	158	/* Ignore mv costing by sending NULL cost arrays */
159	159	bestsme =
160	160	vp8_hex_search(x, b, d, &best_ref_mv1_full, &d->bmi.mv, step_param, sadpb,
161		− &cpi->fn_ptr[BLOCK_16X16], NULL, NULL, &best_ref_mv1);
	161	+ &cpi->fn_ptr[BLOCK_16X16], NULL, &best_ref_mv1);
162	162	(void)bestsme; // Ignore unused return value.
163	163
164	164	#if ALT_REF_SUBPEL_ENABLED