diff options
Diffstat (limited to 'vp8/encoder/mcomp.h')
-rw-r--r-- | vp8/encoder/mcomp.h | 113 |
1 files changed, 56 insertions, 57 deletions
diff --git a/vp8/encoder/mcomp.h b/vp8/encoder/mcomp.h index f1314533f..d7fd137ca 100644 --- a/vp8/encoder/mcomp.h +++ b/vp8/encoder/mcomp.h @@ -36,71 +36,71 @@ extern void vp8_init3smotion_compensation(MACROBLOCK *x, int stride); extern int vp8_hex_search ( - MACROBLOCK *x, - BLOCK *b, - BLOCKD *d, - int_mv *ref_mv, - int_mv *best_mv, - int search_param, - int error_per_bit, - const vp8_variance_fn_ptr_t *vf, - int *mvsadcost[2], - int *mvcost[2], - int_mv *center_mv + MACROBLOCK *x, + BLOCK *b, + BLOCKD *d, + int_mv *ref_mv, + int_mv *best_mv, + int search_param, + int error_per_bit, + const vp8_variance_fn_ptr_t *vf, + int *mvsadcost[2], + int *mvcost[2], + int_mv *center_mv ); typedef int (fractional_mv_step_fp) - (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); +(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; extern fractional_mv_step_fp vp8_skip_fractional_mv_step; #define prototype_full_search_sad(sym)\ - int (sym)\ - (\ - MACROBLOCK *x, \ - BLOCK *b, \ - BLOCKD *d, \ - int_mv *ref_mv, \ - int sad_per_bit, \ - int distance, \ - vp8_variance_fn_ptr_t *fn_ptr, \ - int *mvcost[2], \ - int_mv *center_mv \ - ) + int (sym)\ + (\ + MACROBLOCK *x, \ + BLOCK *b, \ + BLOCKD *d, \ + int_mv *ref_mv, \ + int sad_per_bit, \ + int distance, \ + vp8_variance_fn_ptr_t *fn_ptr, \ + int *mvcost[2], \ + int_mv *center_mv \ + ) #define prototype_refining_search_sad(sym)\ - int (sym)\ - (\ - MACROBLOCK *x, \ - BLOCK *b, \ - BLOCKD *d, \ - int_mv *ref_mv, \ - int sad_per_bit, \ - int distance, \ - vp8_variance_fn_ptr_t *fn_ptr, \ - int *mvcost[2], \ - int_mv *center_mv \ - ) + int (sym)\ + (\ + MACROBLOCK *x, \ + BLOCK *b, \ + BLOCKD *d, \ + int_mv *ref_mv, \ + int sad_per_bit, \ + int distance, \ + vp8_variance_fn_ptr_t *fn_ptr, \ + int *mvcost[2], \ + int_mv *center_mv \ + ) #define prototype_diamond_search_sad(sym)\ - int (sym)\ - (\ - MACROBLOCK *x, \ - BLOCK *b, \ - BLOCKD *d, \ - int_mv *ref_mv, \ - int_mv *best_mv, \ - int search_param, \ - int sad_per_bit, \ - int *num00, \ - vp8_variance_fn_ptr_t *fn_ptr, \ - int *mvcost[2], \ - int_mv *center_mv \ - ) + int (sym)\ + (\ + MACROBLOCK *x, \ + BLOCK *b, \ + BLOCKD *d, \ + int_mv *ref_mv, \ + int_mv *best_mv, \ + int search_param, \ + int sad_per_bit, \ + int *num00, \ + vp8_variance_fn_ptr_t *fn_ptr, \ + int *mvcost[2], \ + int_mv *center_mv \ + ) #if ARCH_X86 || ARCH_X86_64 #include "x86/mcomp_x86.h" @@ -134,11 +134,10 @@ extern prototype_refining_search_sad(vp8_search_refining_search); #endif extern prototype_diamond_search_sad(vp8_search_diamond_search); -typedef struct -{ - prototype_full_search_sad(*full_search); - prototype_refining_search_sad(*refining_search); - prototype_diamond_search_sad(*diamond_search); +typedef struct { + prototype_full_search_sad(*full_search); + prototype_refining_search_sad(*refining_search); + prototype_diamond_search_sad(*diamond_search); } vp8_search_rtcd_vtable_t; #if CONFIG_RUNTIME_CPU_DETECT |