diff options
author | John Koleszar <jkoleszar@google.com> | 2011-05-13 10:16:37 -0400 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2011-05-13 10:16:37 -0400 |
commit | 72913435cb853def83bbbeec7cb69912d75ee368 (patch) | |
tree | 77b53535700782209dd937341886d4071e0afe2d /vp8/encoder/mcomp.h | |
parent | 25f10257f294263848080afcd1c53768fdb1072d (diff) | |
parent | 71a7501bcf6ada5068d102c03ae597023e986538 (diff) | |
download | libvpx-72913435cb853def83bbbeec7cb69912d75ee368.tar libvpx-72913435cb853def83bbbeec7cb69912d75ee368.tar.gz libvpx-72913435cb853def83bbbeec7cb69912d75ee368.tar.bz2 libvpx-72913435cb853def83bbbeec7cb69912d75ee368.zip |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/common/blockd.h
vp8/decoder/decodemv.c
Change-Id: Ib97c226d5b33b1ac1675d9c96eac1986af4dd579
Diffstat (limited to 'vp8/encoder/mcomp.h')
-rw-r--r-- | vp8/encoder/mcomp.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/vp8/encoder/mcomp.h b/vp8/encoder/mcomp.h index d655b837e..85c7513ec 100644 --- a/vp8/encoder/mcomp.h +++ b/vp8/encoder/mcomp.h @@ -26,7 +26,7 @@ extern void accum_mv_refs(MB_PREDICTION_MODE, const int near_mv_ref_cts[4]); #define MAX_FIRST_STEP (1 << (MAX_MVSEARCH_STEPS-1)) // Maximum size of the first step in full pel units extern void print_mode_context(void); -extern int vp8_mv_bit_cost(MV *mv, MV *ref, int *mvcost[2], int Weight); +extern int vp8_mv_bit_cost(int_mv *mv, int_mv *ref, int *mvcost[2], int Weight); extern void vp8_init_dsmotion_compensation(MACROBLOCK *x, int stride); extern void vp8_init3smotion_compensation(MACROBLOCK *x, int stride); @@ -36,20 +36,21 @@ extern int vp8_hex_search MACROBLOCK *x, BLOCK *b, BLOCKD *d, - MV *ref_mv, - MV *best_mv, + int_mv *ref_mv, + int_mv *best_mv, int search_param, int error_per_bit, int *num00, const vp8_variance_fn_ptr_t *vf, int *mvsadcost[2], int *mvcost[2], - MV *center_mv + int_mv *center_mv ); typedef int (fractional_mv_step_fp) - (MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *bestmv, MV *ref_mv, - int error_per_bit, const vp8_variance_fn_ptr_t *vfp, int *mvcost[2], int *distortion, unsigned int *sse); + (MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *bestmv, int_mv *ref_mv, + int error_per_bit, const vp8_variance_fn_ptr_t *vfp, int *mvcost[2], + int *distortion, unsigned int *sse); extern fractional_mv_step_fp vp8_find_best_sub_pixel_step_iteratively; extern fractional_mv_step_fp vp8_find_best_sub_pixel_step; extern fractional_mv_step_fp vp8_find_best_half_pixel_step; @@ -61,12 +62,12 @@ extern fractional_mv_step_fp vp8_skip_fractional_mv_step; MACROBLOCK *x, \ BLOCK *b, \ BLOCKD *d, \ - MV *ref_mv, \ + int_mv *ref_mv, \ int error_per_bit, \ int distance, \ vp8_variance_fn_ptr_t *fn_ptr, \ int *mvcost[2], \ - MV *center_mv \ + int_mv *center_mv \ ) #define prototype_refining_search_sad(sym)\ @@ -75,12 +76,12 @@ extern fractional_mv_step_fp vp8_skip_fractional_mv_step; MACROBLOCK *x, \ BLOCK *b, \ BLOCKD *d, \ - MV *ref_mv, \ + int_mv *ref_mv, \ int error_per_bit, \ int distance, \ vp8_variance_fn_ptr_t *fn_ptr, \ int *mvcost[2], \ - MV *center_mv \ + int_mv *center_mv \ ) #define prototype_diamond_search_sad(sym)\ @@ -89,14 +90,14 @@ extern fractional_mv_step_fp vp8_skip_fractional_mv_step; MACROBLOCK *x, \ BLOCK *b, \ BLOCKD *d, \ - MV *ref_mv, \ - MV *best_mv, \ + int_mv *ref_mv, \ + int_mv *best_mv, \ int search_param, \ int error_per_bit, \ int *num00, \ vp8_variance_fn_ptr_t *fn_ptr, \ int *mvcost[2], \ - MV *center_mv \ + int_mv *center_mv \ ) #if ARCH_X86 || ARCH_X86_64 |