Adds compound wedge prediction modes
Incorporates wedge compound prediction modes. Change-Id: Ie73b54b629105b9dcc5f3763be87f35b09ad2ec7
This commit is contained in:
@@ -53,12 +53,12 @@ int vp10_mv_bit_cost(const MV *mv, const MV *ref,
|
||||
// Utility to compute variance + MV rate cost for a given MV
|
||||
int vp10_get_mvpred_var(const MACROBLOCK *x,
|
||||
const MV *best_mv, const MV *center_mv,
|
||||
const vp9_variance_fn_ptr_t *vfp,
|
||||
const vp10_variance_fn_ptr_t *vfp,
|
||||
int use_mvcost);
|
||||
int vp10_get_mvpred_av_var(const MACROBLOCK *x,
|
||||
const MV *best_mv, const MV *center_mv,
|
||||
const uint8_t *second_pred,
|
||||
const vp9_variance_fn_ptr_t *vfp,
|
||||
const vp10_variance_fn_ptr_t *vfp,
|
||||
int use_mvcost);
|
||||
|
||||
struct VP10_COMP;
|
||||
@@ -69,7 +69,7 @@ int vp10_init_search_range(int size);
|
||||
int vp10_refining_search_sad(const struct macroblock *x,
|
||||
struct mv *ref_mv,
|
||||
int sad_per_bit, int distance,
|
||||
const struct vp9_variance_vtable *fn_ptr,
|
||||
const vp10_variance_fn_ptr_t *fn_ptr,
|
||||
const struct mv *center_mv);
|
||||
|
||||
// Runs sequence of diamond searches in smaller steps for RD.
|
||||
@@ -77,7 +77,7 @@ int vp10_full_pixel_diamond(const struct VP10_COMP *cpi, MACROBLOCK *x,
|
||||
MV *mvp_full, int step_param,
|
||||
int sadpb, int further_steps, int do_refine,
|
||||
int *cost_list,
|
||||
const vp9_variance_fn_ptr_t *fn_ptr,
|
||||
const vp10_variance_fn_ptr_t *fn_ptr,
|
||||
const MV *ref_mv, MV *dst_mv);
|
||||
|
||||
// Perform integral projection based motion estimation.
|
||||
@@ -93,7 +93,7 @@ typedef int (integer_mv_pattern_search_fn) (
|
||||
int error_per_bit,
|
||||
int do_init_search,
|
||||
int *cost_list,
|
||||
const vp9_variance_fn_ptr_t *vf,
|
||||
const vp10_variance_fn_ptr_t *vf,
|
||||
int use_mvcost,
|
||||
const MV *center_mv,
|
||||
MV *best_mv);
|
||||
@@ -109,7 +109,7 @@ typedef int (fractional_mv_step_fp) (
|
||||
MV *bestmv, const MV *ref_mv,
|
||||
int allow_hp,
|
||||
int error_per_bit,
|
||||
const vp9_variance_fn_ptr_t *vfp,
|
||||
const vp10_variance_fn_ptr_t *vfp,
|
||||
int forced_stop, // 0 - full, 1 - qtr only, 2 - half only
|
||||
int iters_per_step,
|
||||
int *cost_list,
|
||||
@@ -130,13 +130,13 @@ extern fractional_mv_step_fp vp10_find_best_sub_pixel_tree_pruned_evenmore;
|
||||
typedef int (*vp10_full_search_fn_t)(const MACROBLOCK *x,
|
||||
const MV *ref_mv, int sad_per_bit,
|
||||
int distance,
|
||||
const vp9_variance_fn_ptr_t *fn_ptr,
|
||||
const vp10_variance_fn_ptr_t *fn_ptr,
|
||||
const MV *center_mv, MV *best_mv);
|
||||
|
||||
typedef int (*vp10_refining_search_fn_t)(const MACROBLOCK *x,
|
||||
MV *ref_mv, int sad_per_bit,
|
||||
int distance,
|
||||
const vp9_variance_fn_ptr_t *fn_ptr,
|
||||
const vp10_variance_fn_ptr_t *fn_ptr,
|
||||
const MV *center_mv);
|
||||
|
||||
typedef int (*vp10_diamond_search_fn_t)(const MACROBLOCK *x,
|
||||
@@ -144,13 +144,13 @@ typedef int (*vp10_diamond_search_fn_t)(const MACROBLOCK *x,
|
||||
MV *ref_mv, MV *best_mv,
|
||||
int search_param, int sad_per_bit,
|
||||
int *num00,
|
||||
const vp9_variance_fn_ptr_t *fn_ptr,
|
||||
const vp10_variance_fn_ptr_t *fn_ptr,
|
||||
const MV *center_mv);
|
||||
|
||||
int vp10_refining_search_8p_c(const MACROBLOCK *x,
|
||||
MV *ref_mv, int error_per_bit,
|
||||
int search_range,
|
||||
const vp9_variance_fn_ptr_t *fn_ptr,
|
||||
const vp10_variance_fn_ptr_t *fn_ptr,
|
||||
const MV *center_mv, const uint8_t *second_pred);
|
||||
|
||||
struct VP10_COMP;
|
||||
@@ -162,6 +162,26 @@ int vp10_full_pixel_search(struct VP10_COMP *cpi, MACROBLOCK *x,
|
||||
const MV *ref_mv, MV *tmp_mv,
|
||||
int var_max, int rd);
|
||||
|
||||
#if CONFIG_EXT_INTER
|
||||
int vp10_find_best_masked_sub_pixel_tree(const MACROBLOCK *x,
|
||||
const uint8_t *mask, int mask_stride,
|
||||
MV *bestmv, const MV *ref_mv,
|
||||
int allow_hp,
|
||||
int error_per_bit,
|
||||
const vp10_variance_fn_ptr_t *vfp,
|
||||
int forced_stop,
|
||||
int iters_per_step,
|
||||
int *mvjcost, int *mvcost[2],
|
||||
int *distortion,
|
||||
unsigned int *sse1, int is_second);
|
||||
int vp10_masked_full_pixel_diamond(const struct VP10_COMP *cpi, MACROBLOCK *x,
|
||||
const uint8_t *mask, int mask_stride,
|
||||
MV *mvp_full, int step_param,
|
||||
int sadpb, int further_steps, int do_refine,
|
||||
const vp10_variance_fn_ptr_t *fn_ptr,
|
||||
const MV *ref_mv, MV *dst_mv,
|
||||
int is_second);
|
||||
#endif // CONFIG_EXT_INTER
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user