vp9 -> vpx in names Change-Id: I2be458f7e993fd2ae76a80c0f7d7e3caf3c63d03
diff --git a/vp10/common/vp10_rtcd_defs.pl b/vp10/common/vp10_rtcd_defs.pl index 9860bae..c331b6a 100644 --- a/vp10/common/vp10_rtcd_defs.pl +++ b/vp10/common/vp10_rtcd_defs.pl
@@ -12,7 +12,7 @@ /* Encoder forward decls */ struct macroblock; -struct vp9_variance_vtable; +struct vpx_variance_vtable; struct search_site_config; struct mv; union int_mv; @@ -605,15 +605,15 @@ # # Motion search # -add_proto qw/int vp10_full_search_sad/, "const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv"; +add_proto qw/int vp10_full_search_sad/, "const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct vpx_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv"; specialize qw/vp10_full_search_sad sse3 sse4_1/; $vp10_full_search_sad_sse3=vp10_full_search_sadx3; $vp10_full_search_sad_sse4_1=vp10_full_search_sadx8; -add_proto qw/int vp10_diamond_search_sad/, "const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv"; +add_proto qw/int vp10_diamond_search_sad/, "const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vpx_variance_vtable *fn_ptr, const struct mv *center_mv"; specialize qw/vp10_diamond_search_sad/; -add_proto qw/int vp10_full_range_search/, "const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_variance_vtable *fn_ptr, const struct mv *center_mv"; +add_proto qw/int vp10_full_range_search/, "const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vpx_variance_vtable *fn_ptr, const struct mv *center_mv"; specialize qw/vp10_full_range_search/; add_proto qw/void vp10_temporal_filter_apply/, "uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count";
diff --git a/vp10/encoder/encoder.h b/vp10/encoder/encoder.h index bd6a009..5b79223 100644 --- a/vp10/encoder/encoder.h +++ b/vp10/encoder/encoder.h
@@ -383,7 +383,7 @@ fractional_mv_step_fp *find_fractional_mv_step; vp10_full_search_fn_t full_search_sad; vp10_diamond_search_fn_t diamond_search_sad; - vp9_variance_fn_ptr_t fn_ptr[BLOCK_SIZES]; + vpx_variance_fn_ptr_t fn_ptr[BLOCK_SIZES]; uint64_t time_receive_data; uint64_t time_compress_data; uint64_t time_pick_lpf;
diff --git a/vp10/encoder/firstpass.c b/vp10/encoder/firstpass.c index c41fa3e..e7de6d3 100644 --- a/vp10/encoder/firstpass.c +++ b/vp10/encoder/firstpass.c
@@ -388,7 +388,7 @@ MV ref_mv_full = {ref_mv->row >> 3, ref_mv->col >> 3}; int num00, tmp_err, n; const BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type; - vp9_variance_fn_ptr_t v_fn_ptr = cpi->fn_ptr[bsize]; + vpx_variance_fn_ptr_t v_fn_ptr = cpi->fn_ptr[bsize]; const int new_mv_mode_penalty = NEW_MV_MODE_PENALTY; int step_param = 3;
diff --git a/vp10/encoder/mbgraph.c b/vp10/encoder/mbgraph.c index ed0f539..98c532e 100644 --- a/vp10/encoder/mbgraph.c +++ b/vp10/encoder/mbgraph.c
@@ -31,7 +31,7 @@ MACROBLOCK *const x = &cpi->td.mb; MACROBLOCKD *const xd = &x->e_mbd; const MV_SPEED_FEATURES *const mv_sf = &cpi->sf.mv; - const vp9_variance_fn_ptr_t v_fn_ptr = cpi->fn_ptr[BLOCK_16X16]; + const vpx_variance_fn_ptr_t v_fn_ptr = cpi->fn_ptr[BLOCK_16X16]; const int tmp_col_min = x->mv_col_min; const int tmp_col_max = x->mv_col_max;
diff --git a/vp10/encoder/mcomp.c b/vp10/encoder/mcomp.c index 2c1c591..89f4101 100644 --- a/vp10/encoder/mcomp.c +++ b/vp10/encoder/mcomp.c
@@ -312,7 +312,7 @@ const MV *bestmv, const MV *ref_mv, int error_per_bit, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, const uint8_t *const src, const int src_stride, const uint8_t *const y, @@ -388,7 +388,7 @@ MV *bestmv, const MV *ref_mv, int allow_hp, int error_per_bit, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, int forced_stop, int iters_per_step, int *cost_list, @@ -467,7 +467,7 @@ MV *bestmv, const MV *ref_mv, int allow_hp, int error_per_bit, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, int forced_stop, int iters_per_step, int *cost_list, @@ -541,7 +541,7 @@ MV *bestmv, const MV *ref_mv, int allow_hp, int error_per_bit, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, int forced_stop, int iters_per_step, int *cost_list, @@ -643,7 +643,7 @@ MV *bestmv, const MV *ref_mv, int allow_hp, int error_per_bit, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, int forced_stop, int iters_per_step, int *cost_list, @@ -826,7 +826,7 @@ static INLINE void calc_int_cost_list(const MACROBLOCK *x, const MV *ref_mv, int sadpb, - const vp9_variance_fn_ptr_t *fn_ptr, + const vpx_variance_fn_ptr_t *fn_ptr, const MV *best_mv, int *cost_list) { static const MV neighbors[4] = {{0, -1}, {1, 0}, {0, 1}, {-1, 0}}; @@ -884,7 +884,7 @@ int sad_per_bit, int do_init_search, int *cost_list, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, int use_mvcost, const MV *center_mv, MV *best_mv, @@ -1059,7 +1059,7 @@ int sad_per_bit, int do_init_search, int *cost_list, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, int use_mvcost, const MV *center_mv, MV *best_mv, @@ -1341,7 +1341,7 @@ int vp10_get_mvpred_var(const MACROBLOCK *x, const MV *best_mv, const MV *center_mv, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, int use_mvcost) { const MACROBLOCKD *const xd = &x->e_mbd; const struct buf_2d *const what = &x->plane[0].src; @@ -1358,7 +1358,7 @@ 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 vpx_variance_fn_ptr_t *vfp, int use_mvcost) { const MACROBLOCKD *const xd = &x->e_mbd; const struct buf_2d *const what = &x->plane[0].src; @@ -1378,7 +1378,7 @@ int sad_per_bit, int do_init_search, int *cost_list, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, int use_mvcost, const MV *center_mv, MV *best_mv) { // First scale has 8-closest points, the rest have 6 points in hex shape @@ -1413,7 +1413,7 @@ int sad_per_bit, int do_init_search, int *cost_list, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, int use_mvcost, const MV *center_mv, MV *best_mv) { @@ -1455,7 +1455,7 @@ int sad_per_bit, int do_init_search, int *cost_list, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, int use_mvcost, const MV *center_mv, MV *best_mv) { @@ -1497,7 +1497,7 @@ int sad_per_bit, int do_init_search, // must be zero for fast_hex int *cost_list, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, int use_mvcost, const MV *center_mv, MV *best_mv) { @@ -1512,7 +1512,7 @@ int sad_per_bit, int do_init_search, int *cost_list, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, int use_mvcost, const MV *center_mv, MV *best_mv) { @@ -1528,7 +1528,7 @@ static int exhuastive_mesh_search(const MACROBLOCK *x, MV *ref_mv, MV *best_mv, int range, int step, int sad_per_bit, - const vp9_variance_fn_ptr_t *fn_ptr, + const vpx_variance_fn_ptr_t *fn_ptr, const MV *center_mv) { const MACROBLOCKD *const xd = &x->e_mbd; const struct buf_2d *const what = &x->plane[0].src; @@ -1614,7 +1614,7 @@ const search_site_config *cfg, MV *ref_mv, MV *best_mv, int search_param, int sad_per_bit, int *num00, - const vp9_variance_fn_ptr_t *fn_ptr, + const vpx_variance_fn_ptr_t *fn_ptr, const MV *center_mv) { int i, j, step; @@ -1968,7 +1968,7 @@ 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 vpx_variance_fn_ptr_t *fn_ptr, const MV *ref_mv, MV *dst_mv) { MV temp_mv; int thissme, n, num00 = 0; @@ -2035,7 +2035,7 @@ // according to the encode speed profile. static int full_pixel_exhaustive(VP10_COMP *cpi, MACROBLOCK *x, MV *centre_mv_full, int sadpb, int *cost_list, - const vp9_variance_fn_ptr_t *fn_ptr, + const vpx_variance_fn_ptr_t *fn_ptr, const MV *ref_mv, MV *dst_mv) { const SPEED_FEATURES *const sf = &cpi->sf; MV temp_mv = {centre_mv_full->row, centre_mv_full->col}; @@ -2094,7 +2094,7 @@ int vp10_full_search_sad_c(const MACROBLOCK *x, const MV *ref_mv, int sad_per_bit, int distance, - const vp9_variance_fn_ptr_t *fn_ptr, + const vpx_variance_fn_ptr_t *fn_ptr, const MV *center_mv, MV *best_mv) { int r, c; const MACROBLOCKD *const xd = &x->e_mbd; @@ -2127,7 +2127,7 @@ int vp10_full_search_sadx3(const MACROBLOCK *x, const MV *ref_mv, int sad_per_bit, int distance, - const vp9_variance_fn_ptr_t *fn_ptr, + const vpx_variance_fn_ptr_t *fn_ptr, const MV *center_mv, MV *best_mv) { int r; const MACROBLOCKD *const xd = &x->e_mbd; @@ -2192,7 +2192,7 @@ int vp10_full_search_sadx8(const MACROBLOCK *x, const MV *ref_mv, int sad_per_bit, int distance, - const vp9_variance_fn_ptr_t *fn_ptr, + const vpx_variance_fn_ptr_t *fn_ptr, const MV *center_mv, MV *best_mv) { int r; const MACROBLOCKD *const xd = &x->e_mbd; @@ -2282,7 +2282,7 @@ int vp10_refining_search_sad(const MACROBLOCK *x, MV *ref_mv, int error_per_bit, int search_range, - const vp9_variance_fn_ptr_t *fn_ptr, + const vpx_variance_fn_ptr_t *fn_ptr, const MV *center_mv) { const MACROBLOCKD *const xd = &x->e_mbd; const MV neighbors[4] = {{ -1, 0}, {0, -1}, {0, 1}, {1, 0}}; @@ -2361,7 +2361,7 @@ 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 vpx_variance_fn_ptr_t *fn_ptr, const MV *center_mv, const uint8_t *second_pred) { const MV neighbors[8] = {{-1, 0}, {0, -1}, {0, 1}, {1, 0}, @@ -2425,7 +2425,7 @@ int var_max, int rd) { const SPEED_FEATURES *const sf = &cpi->sf; const SEARCH_METHODS method = sf->mv.search_method; - vp9_variance_fn_ptr_t *fn_ptr = &cpi->fn_ptr[bsize]; + vpx_variance_fn_ptr_t *fn_ptr = &cpi->fn_ptr[bsize]; int var = 0; if (cost_list) { cost_list[0] = INT_MAX;
diff --git a/vp10/encoder/mcomp.h b/vp10/encoder/mcomp.h index 9d1ab2a..9ebf607 100644 --- a/vp10/encoder/mcomp.h +++ b/vp10/encoder/mcomp.h
@@ -53,12 +53,12 @@ // 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 vpx_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 vpx_variance_fn_ptr_t *vfp, int use_mvcost); struct VP10_COMP; @@ -69,7 +69,7 @@ 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 struct vpx_variance_vtable *fn_ptr, const struct mv *center_mv); // Runs sequence of diamond searches in smaller steps for RD. @@ -77,7 +77,7 @@ 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 vpx_variance_fn_ptr_t *fn_ptr, const MV *ref_mv, MV *dst_mv); // Perform integral projection based motion estimation. @@ -93,7 +93,7 @@ int error_per_bit, int do_init_search, int *cost_list, - const vp9_variance_fn_ptr_t *vf, + const vpx_variance_fn_ptr_t *vf, int use_mvcost, const MV *center_mv, MV *best_mv); @@ -109,7 +109,7 @@ MV *bestmv, const MV *ref_mv, int allow_hp, int error_per_bit, - const vp9_variance_fn_ptr_t *vfp, + const vpx_variance_fn_ptr_t *vfp, int forced_stop, // 0 - full, 1 - qtr only, 2 - half only int iters_per_step, int *cost_list, @@ -126,13 +126,13 @@ 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 vpx_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 vpx_variance_fn_ptr_t *fn_ptr, const MV *center_mv); typedef int (*vp10_diamond_search_fn_t)(const MACROBLOCK *x, @@ -140,13 +140,13 @@ MV *ref_mv, MV *best_mv, int search_param, int sad_per_bit, int *num00, - const vp9_variance_fn_ptr_t *fn_ptr, + const vpx_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 vpx_variance_fn_ptr_t *fn_ptr, const MV *center_mv, const uint8_t *second_pred); struct VP10_COMP;
diff --git a/vpx_dsp/variance.h b/vpx_dsp/variance.h index 346680a..17d8abc 100644 --- a/vpx_dsp/variance.h +++ b/vpx_dsp/variance.h
@@ -58,7 +58,7 @@ unsigned int *sse, const uint8_t *second_pred); #if CONFIG_VP10 -typedef struct vp9_variance_vtable { +typedef struct vpx_variance_vtable { vpx_sad_fn_t sdf; vpx_sad_avg_fn_t sdaf; vpx_variance_fn_t vf; @@ -67,7 +67,7 @@ vpx_sad_multi_fn_t sdx3f; vpx_sad_multi_fn_t sdx8f; vpx_sad_multi_d_fn_t sdx4df; -} vp9_variance_fn_ptr_t; +} vpx_variance_fn_ptr_t; #endif // CONFIG_VP10 #ifdef __cplusplus