diff options
| author | James Zern <jzern@google.com> | 2014-07-11 00:05:57 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2014-09-04 20:50:42 -0700 |
| commit | 35fadf1d2533c1cf2ce521330b4fe13724d14cf0 (patch) | |
| tree | 86aeabae6eea19d0c7d2d1d50ac53a4121a05d19 /vp8 | |
| parent | c7b925c3fe3405cbd18d761bbe26245796225418 (diff) | |
| download | libvpx-35fadf1d2533c1cf2ce521330b4fe13724d14cf0.tar libvpx-35fadf1d2533c1cf2ce521330b4fe13724d14cf0.tar.gz libvpx-35fadf1d2533c1cf2ce521330b4fe13724d14cf0.tar.bz2 libvpx-35fadf1d2533c1cf2ce521330b4fe13724d14cf0.zip | |
bilinearpredict_neon: fix type conversion warnings
make bifilter4_coeff[][] uint8_t, no values exceed this range and
they're loaded with vdup_n_u8().
Change-Id: I921983e9edd828d29820e40ac30a7801dbe0fb4f
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/common/arm/neon/bilinearpredict_neon.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vp8/common/arm/neon/bilinearpredict_neon.c b/vp8/common/arm/neon/bilinearpredict_neon.c index d77f2baf6..9824a3193 100644 --- a/vp8/common/arm/neon/bilinearpredict_neon.c +++ b/vp8/common/arm/neon/bilinearpredict_neon.c @@ -10,7 +10,7 @@ #include <arm_neon.h> -static const uint16_t bifilter4_coeff[8][2] = { +static const uint8_t bifilter4_coeff[8][2] = { {128, 0}, {112, 16}, { 96, 32}, @@ -64,8 +64,8 @@ void vp8_bilinear_predict4x4_neon( q1u8 = vcombine_u8(d2u8, d3u8); q2u8 = vcombine_u8(d4u8, d5u8); - d0u8 = vdup_n_u8((uint8_t)bifilter4_coeff[xoffset][0]); - d1u8 = vdup_n_u8((uint8_t)bifilter4_coeff[xoffset][1]); + d0u8 = vdup_n_u8(bifilter4_coeff[xoffset][0]); + d1u8 = vdup_n_u8(bifilter4_coeff[xoffset][1]); q4u64 = vshrq_n_u64(vreinterpretq_u64_u8(q1u8), 8); q5u64 = vshrq_n_u64(vreinterpretq_u64_u8(q2u8), 8); @@ -155,8 +155,8 @@ void vp8_bilinear_predict8x4_neon( q4u8 = vld1q_u8(src_ptr); src_ptr += src_pixels_per_line; q5u8 = vld1q_u8(src_ptr); - d0u8 = vdup_n_u8((uint8_t)bifilter4_coeff[xoffset][0]); - d1u8 = vdup_n_u8((uint8_t)bifilter4_coeff[xoffset][1]); + d0u8 = vdup_n_u8(bifilter4_coeff[xoffset][0]); + d1u8 = vdup_n_u8(bifilter4_coeff[xoffset][1]); q6u16 = vmull_u8(vget_low_u8(q1u8), d0u8); q7u16 = vmull_u8(vget_low_u8(q2u8), d0u8); @@ -245,8 +245,8 @@ void vp8_bilinear_predict8x8_neon( q3u8 = vld1q_u8(src_ptr); src_ptr += src_pixels_per_line; q4u8 = vld1q_u8(src_ptr); src_ptr += src_pixels_per_line; - d0u8 = vdup_n_u8((uint8_t)bifilter4_coeff[xoffset][0]); - d1u8 = vdup_n_u8((uint8_t)bifilter4_coeff[xoffset][1]); + d0u8 = vdup_n_u8(bifilter4_coeff[xoffset][0]); + d1u8 = vdup_n_u8(bifilter4_coeff[xoffset][1]); q6u16 = vmull_u8(vget_low_u8(q1u8), d0u8); q7u16 = vmull_u8(vget_low_u8(q2u8), d0u8); |