shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "give vp9 variance struct a unique name"

--- a/vp9/common/vp9_rtcd_defs.sh

+++ b/vp9/common/vp9_rtcd_defs.sh

@@ -14,7 +14,7 @@

 /* Encoder forward decls */

 struct block;

 struct macroblock;

-struct variance_vtable;

+struct vp9_variance_vtable;

 #define DEC_MVCOSTS int *mvjcost, int *mvcost[2]

 union int_mv;

@@ -722,16 +722,16 @@

 #

 # 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

 vp9_full_search_sad_sse3=vp9_full_search_sadx3

 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

 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

 vp9_diamond_search_sad_sse3=vp9_diamond_search_sadx4

--- a/vp9/encoder/vp9_variance.h

+++ b/vp9/encoder/vp9_variance.h

@@ -69,7 +69,7 @@

                                                    const uint8_t *ref_ptr,

                                                    int  ref_stride);

-typedef struct variance_vtable {

+typedef struct vp9_variance_vtable {

     vp9_sad_fn_t            sdf;

     vp9_variance_fn_t       vf;

     vp9_subpixvariance_fn_t svf;