| Index: source/libvpx/vp9/encoder/vp9_temporal_filter.c
|
| diff --git a/source/libvpx/vp9/encoder/vp9_temporal_filter.c b/source/libvpx/vp9/encoder/vp9_temporal_filter.c
|
| index 9c1629edebba844266887959b1618efc76226312..3f2c8eba796e86103f529048584e3f7d9e315f38 100644
|
| --- a/source/libvpx/vp9/encoder/vp9_temporal_filter.c
|
| +++ b/source/libvpx/vp9/encoder/vp9_temporal_filter.c
|
| @@ -216,7 +216,8 @@ static int temporal_filter_find_matching_mb_c(VP9_COMP *cpi,
|
| int stride) {
|
| MACROBLOCK *const x = &cpi->td.mb;
|
| MACROBLOCKD *const xd = &x->e_mbd;
|
| - const MV_SPEED_FEATURES *const mv_sf = &cpi->sf.mv;
|
| + MV_SPEED_FEATURES *const mv_sf = &cpi->sf.mv;
|
| + const SEARCH_METHODS old_search_method = mv_sf->search_method;
|
| int step_param;
|
| int sadpb = x->sadperbit16;
|
| int bestsme = INT_MAX;
|
| @@ -244,10 +245,11 @@ static int temporal_filter_find_matching_mb_c(VP9_COMP *cpi,
|
| step_param = mv_sf->reduce_first_step_size;
|
| step_param = VPXMIN(step_param, MAX_MVSEARCH_STEPS - 2);
|
|
|
| - // Ignore mv costing by sending NULL pointer instead of cost arrays
|
| - vp9_hex_search(x, &best_ref_mv1_full, step_param, sadpb, 1,
|
| - cond_cost_list(cpi, cost_list),
|
| - &cpi->fn_ptr[BLOCK_16X16], 0, &best_ref_mv1, ref_mv);
|
| + mv_sf->search_method = HEX;
|
| + vp9_full_pixel_search(cpi, x, BLOCK_16X16, &best_ref_mv1_full, step_param,
|
| + sadpb, cond_cost_list(cpi, cost_list), &best_ref_mv1,
|
| + ref_mv, 0, 0);
|
| + mv_sf->search_method = old_search_method;
|
|
|
| // Ignore mv costing by sending NULL pointer instead of cost array
|
| bestsme = cpi->find_fractional_mv_step(x, ref_mv,
|
|
|