diff options
Diffstat (limited to 'libvpx/vp9/encoder/x86/vp9_variance_mmx.c')
| -rw-r--r-- | libvpx/vp9/encoder/x86/vp9_variance_mmx.c | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/libvpx/vp9/encoder/x86/vp9_variance_mmx.c b/libvpx/vp9/encoder/x86/vp9_variance_mmx.c index d141560..a3d0114 100644 --- a/libvpx/vp9/encoder/x86/vp9_variance_mmx.c +++ b/libvpx/vp9/encoder/x86/vp9_variance_mmx.c @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vpx_config.h" +#include "./vpx_config.h" #include "vp9/encoder/vp9_variance.h" #include "vp9/common/vp9_pragmas.h" #include "vpx_ports/mem.h" -extern unsigned int vp9_get_mb_ss_mmx(const short *src_ptr); +extern unsigned int vp9_get_mb_ss_mmx(const int16_t *src_ptr); extern unsigned int vp9_get8x8var_mmx ( const unsigned char *src_ptr, @@ -45,7 +45,6 @@ unsigned int vp9_variance4x4_mmx( vp9_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg); *sse = var; return (var - (((unsigned int)avg * avg) >> 4)); - } unsigned int vp9_variance8x8_mmx( @@ -61,7 +60,6 @@ unsigned int vp9_variance8x8_mmx( *sse = var; return (var - (((unsigned int)avg * avg) >> 6)); - } unsigned int vp9_mse16x16_mmx( @@ -74,10 +72,14 @@ unsigned int vp9_mse16x16_mmx( int sum0, sum1, sum2, sum3; - vp9_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0); - vp9_get8x8var_mmx(src_ptr + 8, source_stride, ref_ptr + 8, recon_stride, &sse1, &sum1); - vp9_get8x8var_mmx(src_ptr + 8 * source_stride, source_stride, ref_ptr + 8 * recon_stride, recon_stride, &sse2, &sum2); - vp9_get8x8var_mmx(src_ptr + 8 * source_stride + 8, source_stride, ref_ptr + 8 * recon_stride + 8, recon_stride, &sse3, &sum3); + vp9_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, + &sum0); + vp9_get8x8var_mmx(src_ptr + 8, source_stride, ref_ptr + 8, recon_stride, + &sse1, &sum1); + vp9_get8x8var_mmx(src_ptr + 8 * source_stride, source_stride, + ref_ptr + 8 * recon_stride, recon_stride, &sse2, &sum2); + vp9_get8x8var_mmx(src_ptr + 8 * source_stride + 8, source_stride, + ref_ptr + 8 * recon_stride + 8, recon_stride, &sse3, &sum3); var = sse0 + sse1 + sse2 + sse3; *sse = var; @@ -94,11 +96,14 @@ unsigned int vp9_variance16x16_mmx( unsigned int sse0, sse1, sse2, sse3, var; int sum0, sum1, sum2, sum3, avg; - - vp9_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0); - vp9_get8x8var_mmx(src_ptr + 8, source_stride, ref_ptr + 8, recon_stride, &sse1, &sum1); - vp9_get8x8var_mmx(src_ptr + 8 * source_stride, source_stride, ref_ptr + 8 * recon_stride, recon_stride, &sse2, &sum2); - vp9_get8x8var_mmx(src_ptr + 8 * source_stride + 8, source_stride, ref_ptr + 8 * recon_stride + 8, recon_stride, &sse3, &sum3); + vp9_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, + &sum0); + vp9_get8x8var_mmx(src_ptr + 8, source_stride, ref_ptr + 8, recon_stride, + &sse1, &sum1); + vp9_get8x8var_mmx(src_ptr + 8 * source_stride, source_stride, + ref_ptr + 8 * recon_stride, recon_stride, &sse2, &sum2); + vp9_get8x8var_mmx(src_ptr + 8 * source_stride + 8, source_stride, + ref_ptr + 8 * recon_stride + 8, recon_stride, &sse3, &sum3); var = sse0 + sse1 + sse2 + sse3; avg = sum0 + sum1 + sum2 + sum3; @@ -115,14 +120,15 @@ unsigned int vp9_variance16x8_mmx( unsigned int sse0, sse1, var; int sum0, sum1, avg; - vp9_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0); - vp9_get8x8var_mmx(src_ptr + 8, source_stride, ref_ptr + 8, recon_stride, &sse1, &sum1); + vp9_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, + &sum0); + vp9_get8x8var_mmx(src_ptr + 8, source_stride, ref_ptr + 8, recon_stride, + &sse1, &sum1); var = sse0 + sse1; avg = sum0 + sum1; *sse = var; return (var - (((unsigned int)avg * avg) >> 7)); - } @@ -135,13 +141,14 @@ unsigned int vp9_variance8x16_mmx( unsigned int sse0, sse1, var; int sum0, sum1, avg; - vp9_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0); - vp9_get8x8var_mmx(src_ptr + 8 * source_stride, source_stride, ref_ptr + 8 * recon_stride, recon_stride, &sse1, &sum1); + vp9_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, + &sum0); + vp9_get8x8var_mmx(src_ptr + 8 * source_stride, source_stride, + ref_ptr + 8 * recon_stride, recon_stride, &sse1, &sum1); var = sse0 + sse1; avg = sum0 + sum1; *sse = var; return (var - (((unsigned int)avg * avg) >> 7)); - } |