Unified · Split
| @@ -837,7 +837,7 @@ static const MV next_chkpts[6][3] = { · 836 unmodified lines | |||
| 837 | int vp8_hex_search(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv, | 837 | int vp8_hex_search(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv, |
| 838 | int_mv *best_mv, int search_param, int sad_per_bit, | 838 | int_mv *best_mv, int search_param, int sad_per_bit, |
| 839 | const vp8_variance_fn_ptr_t *vfp, int *mvsadcost[2], | 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 | MV hex[6] = { | 841 | MV hex[6] = { |
| 842 | { -1, -2 }, { 1, -2 }, { 2, 0 }, { 1, 2 }, { -1, 2 }, { -2, 0 } | 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 | fcenter_mv.as_mv.row = center_mv->as_mv.row >> 3; | 866 | fcenter_mv.as_mv.row = center_mv->as_mv.row >> 3; |
| 867 | fcenter_mv.as_mv.col = center_mv->as_mv.col >> 3; | 867 | fcenter_mv.as_mv.col = center_mv->as_mv.col >> 3; |
| 868 | 868 | ||
| 869 | (void)mvcost; | ||
| 870 | |||
| 871 | /* adjust ref_mv to make sure it is within MV range */ | 869 | /* adjust ref_mv to make sure it is within MV range */ |
| 872 | vp8_clamp_mv(ref_mv, x->mv_col_min, x->mv_col_max, x->mv_row_min, | 870 | vp8_clamp_mv(ref_mv, x->mv_col_min, x->mv_col_max, x->mv_row_min, |
| 873 | x->mv_row_max); | 871 | x->mv_row_max); |
| @@ -36,7 +36,7 @@ void vp8_init3smotion_compensation(MACROBLOCK *x, int stride); · 35 unmodified lines | |||
| 36 | int vp8_hex_search(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv, | 36 | int vp8_hex_search(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv, |
| 37 | int_mv *best_mv, int search_param, int sad_per_bit, | 37 | int_mv *best_mv, int search_param, int sad_per_bit, |
| 38 | const vp8_variance_fn_ptr_t *vfp, int *mvsadcost[2], | 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 | typedef int(fractional_mv_step_fp)(MACROBLOCK *x, BLOCK *b, BLOCKD *d, | 41 | typedef int(fractional_mv_step_fp)(MACROBLOCK *x, BLOCK *b, BLOCKD *d, |
| 42 | int_mv *bestmv, int_mv *ref_mv, | 42 | int_mv *bestmv, int_mv *ref_mv, |
| @@ -1018,7 +1018,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, · 1017 unmodified lines | |||
| 1018 | #endif | 1018 | #endif |
| 1019 | bestsme = vp8_hex_search(x, b, d, &mvp_full, &d->bmi.mv, step_param, | 1019 | bestsme = vp8_hex_search(x, b, d, &mvp_full, &d->bmi.mv, step_param, |
| 1020 | sadpb, &cpi->fn_ptr[BLOCK_16X16], | 1020 | sadpb, &cpi->fn_ptr[BLOCK_16X16], |
| 1021 | x->mvsadcost, x->mvcost, &best_ref_mv); | 1021 | x->mvsadcost, &best_ref_mv); |
| 1022 | mode_mv[NEWMV].as_int = d->bmi.mv.as_int; | 1022 | mode_mv[NEWMV].as_int = d->bmi.mv.as_int; |
| 1023 | } else { | 1023 | } else { |
| 1024 | bestsme = cpi->diamond_search_sad( | 1024 | bestsme = cpi->diamond_search_sad( |
| @@ -158,7 +158,7 @@ static int vp8_temporal_filter_find_matching_mb_c(VP8_COMP *cpi, · 157 unmodified lines | |||
| 158 | /* Ignore mv costing by sending NULL cost arrays */ | 158 | /* Ignore mv costing by sending NULL cost arrays */ |
| 159 | bestsme = | 159 | bestsme = |
| 160 | vp8_hex_search(x, b, d, &best_ref_mv1_full, &d->bmi.mv, step_param, sadpb, | 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 | (void)bestsme; // Ignore unused return value. | 162 | (void)bestsme; // Ignore unused return value. |
| 163 | 163 | ||
| 164 | #if ALT_REF_SUBPEL_ENABLED | 164 | #if ALT_REF_SUBPEL_ENABLED |