diff options
| author | James Zern <jzern@google.com> | 2015-06-25 02:14:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-25 02:14:18 +0000 |
| commit | 3393243d5e484c4530d96ffb8e3ac4e4ee070b43 (patch) | |
| tree | 9db128ce99878bb23749e30417b215e6b3de8c21 | |
| parent | 3dd9cde2a5e9661f096e4d42f6012ff52a7c156a (diff) | |
| parent | 4bd87a9b9eda6b223087bcdb4c96d2555ff60780 (diff) | |
| download | libvpx-3393243d5e484c4530d96ffb8e3ac4e4ee070b43.tar libvpx-3393243d5e484c4530d96ffb8e3ac4e4ee070b43.tar.gz libvpx-3393243d5e484c4530d96ffb8e3ac4e4ee070b43.tar.bz2 libvpx-3393243d5e484c4530d96ffb8e3ac4e4ee070b43.zip | |
Merge "vp8_subpixelvariance_neon: right size coeff table"
| -rw-r--r-- | vp8/common/arm/neon/vp8_subpixelvariance_neon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp8/common/arm/neon/vp8_subpixelvariance_neon.c b/vp8/common/arm/neon/vp8_subpixelvariance_neon.c index 974d3b653..3c8ed11f0 100644 --- a/vp8/common/arm/neon/vp8_subpixelvariance_neon.c +++ b/vp8/common/arm/neon/vp8_subpixelvariance_neon.c @@ -12,7 +12,7 @@ #include "vpx_ports/mem.h" #include "vpx/vpx_integer.h" -static const uint16_t bilinear_taps_coeff[8][2] = { +static const uint8_t bilinear_taps_coeff[8][2] = { {128, 0}, {112, 16}, { 96, 32}, @@ -972,9 +972,9 @@ static void var_filter_block2d_bil_w8(const uint8_t *src_ptr, int pixel_step, unsigned int output_height, unsigned int output_width, - const uint16_t *vpx_filter) { - const uint8x8_t f0 = vmov_n_u8((uint8_t)vpx_filter[0]); - const uint8x8_t f1 = vmov_n_u8((uint8_t)vpx_filter[1]); + const uint8_t *vpx_filter) { + const uint8x8_t f0 = vmov_n_u8(vpx_filter[0]); + const uint8x8_t f1 = vmov_n_u8(vpx_filter[1]); unsigned int i; for (i = 0; i < output_height; ++i) { const uint8x8_t src_0 = vld1_u8(&src_ptr[0]); |