diff options
author | hkuang <hkuang@google.com> | 2013-11-07 15:50:31 -0800 |
---|---|---|
committer | hkuang <hkuang@google.com> | 2013-11-08 11:40:06 -0800 |
commit | 5ae7ac49f08a179e4f054d99fcfc9dce78d26e58 (patch) | |
tree | 0d891d2cbbac4c3da6fd15a25bf8797b29b31994 /libvpx/vp9/encoder/x86/vp9_variance_sse2.c | |
parent | e6eeaaa14ccef4c0938fcce21c54979204041a30 (diff) | |
download | android_external_libvpx-5ae7ac49f08a179e4f054d99fcfc9dce78d26e58.tar.gz android_external_libvpx-5ae7ac49f08a179e4f054d99fcfc9dce78d26e58.tar.bz2 android_external_libvpx-5ae7ac49f08a179e4f054d99fcfc9dce78d26e58.zip |
Roll latest libvpx into Android.
The lastest libvpx just added multithread tile decoding support.
Checkout is from master: abdefeaa89a0908327518e5ca75c935c66b2e1aa
Bug:11576718
Change-Id: Icbe5430633e179b8dc6d419e280ad7ebd3cad4a0
Diffstat (limited to 'libvpx/vp9/encoder/x86/vp9_variance_sse2.c')
-rw-r--r-- | libvpx/vp9/encoder/x86/vp9_variance_sse2.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/libvpx/vp9/encoder/x86/vp9_variance_sse2.c b/libvpx/vp9/encoder/x86/vp9_variance_sse2.c index cea934d..79e42c4 100644 --- a/libvpx/vp9/encoder/x86/vp9_variance_sse2.c +++ b/libvpx/vp9/encoder/x86/vp9_variance_sse2.c @@ -8,7 +8,7 @@ * 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" @@ -26,7 +26,7 @@ extern unsigned int vp9_get4x4var_mmx unsigned int vp9_get_mb_ss_sse2 ( - const short *src_ptr + const int16_t *src_ptr ); unsigned int vp9_get16x16var_sse2 ( @@ -250,7 +250,6 @@ unsigned int vp9_mse16x16_sse2( const unsigned char *ref_ptr, int recon_stride, unsigned int *sse) { - unsigned int sse0; int sum0; vp9_get16x16var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, @@ -407,12 +406,12 @@ FN(32, 32, 16, 5, 5, opt1, (int64_t)); \ FN(32, 16, 16, 5, 4, opt1, (int64_t)); \ FN(16, 32, 16, 4, 5, opt1, (int64_t)); \ FN(16, 16, 16, 4, 4, opt1, (unsigned int)); \ -FN(16, 8, 16, 4, 3, opt1,); \ -FN(8, 16, 8, 3, 4, opt1,); \ -FN(8, 8, 8, 3, 3, opt1,); \ -FN(8, 4, 8, 3, 2, opt1,); \ -FN(4, 8, 4, 2, 3, opt2,); \ -FN(4, 4, 4, 2, 2, opt2,) +FN(16, 8, 16, 4, 3, opt1, (unsigned int)); \ +FN(8, 16, 8, 3, 4, opt1, (unsigned int)); \ +FN(8, 8, 8, 3, 3, opt1, (unsigned int)); \ +FN(8, 4, 8, 3, 2, opt1, (unsigned int)); \ +FN(4, 8, 4, 2, 3, opt2, (unsigned int)); \ +FN(4, 4, 4, 2, 2, opt2, (unsigned int)) FNS(sse2, sse); FNS(ssse3, ssse3); @@ -487,12 +486,12 @@ FN(32, 32, 16, 5, 5, opt1, (int64_t)); \ FN(32, 16, 16, 5, 4, opt1, (int64_t)); \ FN(16, 32, 16, 4, 5, opt1, (int64_t)); \ FN(16, 16, 16, 4, 4, opt1, (unsigned int)); \ -FN(16, 8, 16, 4, 3, opt1,); \ -FN(8, 16, 8, 3, 4, opt1,); \ -FN(8, 8, 8, 3, 3, opt1,); \ -FN(8, 4, 8, 3, 2, opt1,); \ -FN(4, 8, 4, 2, 3, opt2,); \ -FN(4, 4, 4, 2, 2, opt2,) +FN(16, 8, 16, 4, 3, opt1, (unsigned int)); \ +FN(8, 16, 8, 3, 4, opt1, (unsigned int)); \ +FN(8, 8, 8, 3, 3, opt1, (unsigned int)); \ +FN(8, 4, 8, 3, 2, opt1, (unsigned int)); \ +FN(4, 8, 4, 2, 3, opt2, (unsigned int)); \ +FN(4, 4, 4, 2, 2, opt2, (unsigned int)) FNS(sse2, sse); FNS(ssse3, ssse3); |