diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-08-24 00:05:11 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-08-24 00:05:11 -0400 |
| commit | d2a2d5a6d5ea1886eef6078d180be364d80501bc (patch) | |
| tree | f127bda8bd187da850a9c43e8c98163f4ee758d1 /vp8/encoder/variance.h | |
| parent | 7cb25d9c562e094c47f37ad34a94d5cafcba2ece (diff) | |
| parent | c5f890af2cff951048cc41630f2523b61fb74a0b (diff) | |
| download | libvpx-d2a2d5a6d5ea1886eef6078d180be364d80501bc.tar libvpx-d2a2d5a6d5ea1886eef6078d180be364d80501bc.tar.gz libvpx-d2a2d5a6d5ea1886eef6078d180be364d80501bc.tar.bz2 libvpx-d2a2d5a6d5ea1886eef6078d180be364d80501bc.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: If53ec5c1219b31e5ef9ae552d9cc79432ebda267
Diffstat (limited to 'vp8/encoder/variance.h')
| -rw-r--r-- | vp8/encoder/variance.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/vp8/encoder/variance.h b/vp8/encoder/variance.h index 5fd6d3ae0..d9bf66975 100644 --- a/vp8/encoder/variance.h +++ b/vp8/encoder/variance.h @@ -320,16 +320,16 @@ extern prototype_variance(vp8_variance_mse16x16); #endif extern prototype_get16x16prederror(vp8_variance_get4x4sse_cs); -#ifndef vp8_ssimpf -#define vp8_ssimpf ssim_parms_c -#endif -extern prototype_ssimpf(vp8_ssimpf) - #ifndef vp8_ssimpf_8x8 -#define vp8_ssimpf_8x8 ssim_parms_8x8_c +#define vp8_ssimpf_8x8 vp8_ssim_parms_8x8_c #endif extern prototype_ssimpf(vp8_ssimpf_8x8) +#ifndef vp8_ssimpf_16x16 +#define vp8_ssimpf_16x16 vp8_ssim_parms_16x16_c +#endif +extern prototype_ssimpf(vp8_ssimpf_16x16) + typedef prototype_sad(*vp8_sad_fn_t); typedef prototype_sad_multi_same_address(*vp8_sad_multi_fn_t); typedef prototype_sad_multi_same_address_1(*vp8_sad_multi1_fn_t); @@ -394,7 +394,7 @@ typedef struct #if CONFIG_INTERNAL_STATS vp8_ssimpf_fn_t ssimpf_8x8; - vp8_ssimpf_fn_t ssimpf; + vp8_ssimpf_fn_t ssimpf_16x16; #endif } vp8_variance_rtcd_vtable_t; @@ -417,8 +417,10 @@ typedef struct #if CONFIG_RUNTIME_CPU_DETECT #define VARIANCE_INVOKE(ctx,fn) (ctx)->fn +#define SSIMPF_INVOKE(ctx,fn) (ctx)->ssimpf_##fn #else #define VARIANCE_INVOKE(ctx,fn) vp8_variance_##fn +#define SSIMPF_INVOKE(ctx,fn) vp8_ssimpf_##fn #endif #endif |