diff options
Diffstat (limited to 'vp8/encoder/variance.h')
| -rw-r--r-- | vp8/encoder/variance.h | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/vp8/encoder/variance.h b/vp8/encoder/variance.h index 3c9ae987c..f60038f02 100644 --- a/vp8/encoder/variance.h +++ b/vp8/encoder/variance.h @@ -219,6 +219,21 @@ extern prototype_subpixvariance(vp8_variance_subpixvar16x8); #endif extern prototype_subpixvariance(vp8_variance_subpixvar16x16); +#ifndef vp8_variance_halfpixvar16x16_h +#define vp8_variance_halfpixvar16x16_h vp8_half_pixel_variance16x16_c +#endif +extern prototype_variance(vp8_variance_halfpixvar16x16_h); + +#ifndef vp8_variance_halfpixvar16x16_v +#define vp8_variance_halfpixvar16x16_v vp8_half_pixel_variance16x16_c +#endif +extern prototype_variance(vp8_variance_halfpixvar16x16_v); + +#ifndef vp8_variance_halfpixvar16x16_hv +#define vp8_variance_halfpixvar16x16_hv vp8_half_pixel_variance16x16_c +#endif +extern prototype_variance(vp8_variance_halfpixvar16x16_hv); + #ifndef vp8_variance_subpixmse16x16 #define vp8_variance_subpixmse16x16 vp8_sub_pixel_mse16x16_c #endif @@ -283,6 +298,9 @@ typedef struct vp8_subpixvariance_fn_t subpixvar8x16; vp8_subpixvariance_fn_t subpixvar16x8; vp8_subpixvariance_fn_t subpixvar16x16; + vp8_variance_fn_t halfpixvar16x16_h; + vp8_variance_fn_t halfpixvar16x16_v; + vp8_variance_fn_t halfpixvar16x16_hv; vp8_subpixvariance_fn_t subpixmse16x16; vp8_getmbss_fn_t getmbss; @@ -309,11 +327,14 @@ typedef struct typedef struct { - vp8_sad_fn_t sdf; - vp8_sad_multi_fn_t sdx3f; - vp8_sad_multi_d_fn_t sdx4df; - vp8_variance_fn_t vf; + vp8_sad_fn_t sdf; + vp8_variance_fn_t vf; vp8_subpixvariance_fn_t svf; + vp8_variance_fn_t svf_halfpix_h; + vp8_variance_fn_t svf_halfpix_v; + vp8_variance_fn_t svf_halfpix_hv; + vp8_sad_multi_fn_t sdx3f; + vp8_sad_multi_d_fn_t sdx4df; } vp8_variance_fn_ptr_t; #if CONFIG_RUNTIME_CPU_DETECT @@ -322,7 +343,4 @@ typedef struct #define VARIANCE_INVOKE(ctx,fn) vp8_variance_##fn #endif -/* TODO: Determine if this USEBILINEAR flag is necessary. */ -#define USEBILINEAR - #endif |