diff options
author | James Zern <jzern@google.com> | 2016-09-19 16:17:24 -0700 |
---|---|---|
committer | James Zern <jzern@google.com> | 2016-09-19 16:19:29 -0700 |
commit | 6acd061aad8cf62000cc9117390d0c94581a8591 (patch) | |
tree | 49a034545e206c602860faa57facc6c0424263d0 | |
parent | 0695843a216dd63e8ac087e13c44de81e8a50afe (diff) | |
download | libvpx-6acd061aad8cf62000cc9117390d0c94581a8591.tar libvpx-6acd061aad8cf62000cc9117390d0c94581a8591.tar.gz libvpx-6acd061aad8cf62000cc9117390d0c94581a8591.tar.bz2 libvpx-6acd061aad8cf62000cc9117390d0c94581a8591.zip |
variance_avx2: sync variance functions with c-code
add missing int64 -> uint32 cast; quiets -Wshorten-64-to-32 warnings
Change-Id: I4850b36e18dc8b399108342be4bfe0b684aefb78
-rw-r--r-- | vpx_dsp/x86/variance_avx2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vpx_dsp/x86/variance_avx2.c b/vpx_dsp/x86/variance_avx2.c index 7bc2693cf..8428e0520 100644 --- a/vpx_dsp/x86/variance_avx2.c +++ b/vpx_dsp/x86/variance_avx2.c @@ -61,7 +61,7 @@ unsigned int vpx_variance32x16_avx2(const uint8_t *src, int src_stride, int sum; variance_avx2(src, src_stride, ref, ref_stride, 32, 16, sse, &sum, vpx_get32x32var_avx2, 32); - return *sse - (((int64_t)sum * sum) >> 9); + return *sse - (uint32_t)(((int64_t)sum * sum) >> 9); } unsigned int vpx_variance32x32_avx2(const uint8_t *src, int src_stride, @@ -70,7 +70,7 @@ unsigned int vpx_variance32x32_avx2(const uint8_t *src, int src_stride, int sum; variance_avx2(src, src_stride, ref, ref_stride, 32, 32, sse, &sum, vpx_get32x32var_avx2, 32); - return *sse - (((int64_t)sum * sum) >> 10); + return *sse - (uint32_t)(((int64_t)sum * sum) >> 10); } unsigned int vpx_variance64x64_avx2(const uint8_t *src, int src_stride, @@ -79,7 +79,7 @@ unsigned int vpx_variance64x64_avx2(const uint8_t *src, int src_stride, int sum; variance_avx2(src, src_stride, ref, ref_stride, 64, 64, sse, &sum, vpx_get32x32var_avx2, 32); - return *sse - (((int64_t)sum * sum) >> 12); + return *sse - (uint32_t)(((int64_t)sum * sum) >> 12); } unsigned int vpx_variance64x32_avx2(const uint8_t *src, int src_stride, @@ -88,7 +88,7 @@ unsigned int vpx_variance64x32_avx2(const uint8_t *src, int src_stride, int sum; variance_avx2(src, src_stride, ref, ref_stride, 64, 32, sse, &sum, vpx_get32x32var_avx2, 32); - return *sse - (((int64_t)sum * sum) >> 11); + return *sse - (uint32_t)(((int64_t)sum * sum) >> 11); } unsigned int vpx_sub_pixel_variance32xh_avx2(const uint8_t *src, int src_stride, @@ -115,7 +115,7 @@ unsigned int vpx_sub_pixel_variance64x64_avx2(const uint8_t *src, dst + 32, dst_stride, 64, &sse2); const int se = se1 + se2; *sse = sse1 + sse2; - return *sse - (((int64_t)se * se) >> 12); + return *sse - (uint32_t)(((int64_t)se * se) >> 12); } unsigned int vpx_sub_pixel_variance32x32_avx2(const uint8_t *src, @@ -125,7 +125,7 @@ unsigned int vpx_sub_pixel_variance32x32_avx2(const uint8_t *src, unsigned int *sse) { const int se = vpx_sub_pixel_variance32xh_avx2( src, src_stride, x_offset, y_offset, dst, dst_stride, 32, sse); - return *sse - (((int64_t)se * se) >> 10); + return *sse - (uint32_t)(((int64_t)se * se) >> 10); } unsigned int vpx_sub_pixel_avg_variance64x64_avx2( @@ -142,7 +142,7 @@ unsigned int vpx_sub_pixel_avg_variance64x64_avx2( *sse = sse1 + sse2; - return *sse - (((int64_t)se * se) >> 12); + return *sse - (uint32_t)(((int64_t)se * se) >> 12); } unsigned int vpx_sub_pixel_avg_variance32x32_avx2( @@ -151,5 +151,5 @@ unsigned int vpx_sub_pixel_avg_variance32x32_avx2( // Process 32 elements in parallel. const int se = vpx_sub_pixel_avg_variance32xh_avx2( src, src_stride, x_offset, y_offset, dst, dst_stride, sec, 32, 32, sse); - return *sse - (((int64_t)se * se) >> 10); + return *sse - (uint32_t)(((int64_t)se * se) >> 10); } |