Commit 09be534f authored by John Koleszar's avatar John Koleszar Committed by Gerrit Code Review
Browse files

Merge "give vp9 variance struct a unique name"

parents 1a1cacfd e5fb6321
...@@ -14,7 +14,7 @@ struct loop_filter_info; ...@@ -14,7 +14,7 @@ struct loop_filter_info;
/* Encoder forward decls */ /* Encoder forward decls */
struct block; struct block;
struct macroblock; struct macroblock;
struct variance_vtable; struct vp9_variance_vtable;
#define DEC_MVCOSTS int *mvjcost, int *mvcost[2] #define DEC_MVCOSTS int *mvjcost, int *mvcost[2]
union int_mv; union int_mv;
...@@ -722,16 +722,16 @@ specialize vp9_short_walsh8x4_x8 ...@@ -722,16 +722,16 @@ specialize vp9_short_walsh8x4_x8
# #
# Motion search # Motion search
# #
prototype int vp9_full_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" prototype int vp9_full_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv"
specialize vp9_full_search_sad sse3 sse4_1 specialize vp9_full_search_sad sse3 sse4_1
vp9_full_search_sad_sse3=vp9_full_search_sadx3 vp9_full_search_sad_sse3=vp9_full_search_sadx3
vp9_full_search_sad_sse4_1=vp9_full_search_sadx8 vp9_full_search_sad_sse4_1=vp9_full_search_sadx8
prototype int vp9_refining_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" prototype int vp9_refining_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv"
specialize vp9_refining_search_sad sse3 specialize vp9_refining_search_sad sse3
vp9_refining_search_sad_sse3=vp9_refining_search_sadx4 vp9_refining_search_sad_sse3=vp9_refining_search_sadx4
prototype int vp9_diamond_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" prototype int vp9_diamond_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv"
specialize vp9_diamond_search_sad sse3 specialize vp9_diamond_search_sad sse3
vp9_diamond_search_sad_sse3=vp9_diamond_search_sadx4 vp9_diamond_search_sad_sse3=vp9_diamond_search_sadx4
......
...@@ -69,7 +69,7 @@ typedef unsigned int (*vp9_get16x16prederror_fn_t)(const uint8_t *src_ptr, ...@@ -69,7 +69,7 @@ typedef unsigned int (*vp9_get16x16prederror_fn_t)(const uint8_t *src_ptr,
const uint8_t *ref_ptr, const uint8_t *ref_ptr,
int ref_stride); int ref_stride);
typedef struct variance_vtable { typedef struct vp9_variance_vtable {
vp9_sad_fn_t sdf; vp9_sad_fn_t sdf;
vp9_variance_fn_t vf; vp9_variance_fn_t vf;
vp9_subpixvariance_fn_t svf; vp9_subpixvariance_fn_t svf;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment