diff options
author | Johann <johannkoenig@google.com> | 2015-08-04 15:36:06 -0700 |
---|---|---|
committer | Wei Jia <wjia@google.com> | 2015-08-19 19:03:25 +0000 |
commit | e68e4ad7f2ecf45cd7c28c1192eab2059b477dd3 (patch) | |
tree | bd85ef78b8130fdd7c809d009e753386bc4e7308 | |
parent | c1dac2a28d9609d1cca8a06ecf4cebd1dcc54dcd (diff) | |
download | libvpx-e68e4ad7f2ecf45cd7c28c1192eab2059b477dd3.tar.gz |
Disable bilinear_predict4x4_neon
When built with newer versions of clang the alignments hints may cause
the loads to fail.
BUG=22943772
Change-Id: I7464de73f260458bc490f9178d0cfcc4eca8661b
(cherry picked from commit 939bda3fbdcbb7d56301f31010d10970c5d10612)
-rw-r--r-- | armv7a-neon/vp8_rtcd.h | 3 | ||||
-rw-r--r-- | libvpx/vp8/common/rtcd_defs.pl | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/armv7a-neon/vp8_rtcd.h b/armv7a-neon/vp8_rtcd.h index 77b0e479e..66ad28a50 100644 --- a/armv7a-neon/vp8_rtcd.h +++ b/armv7a-neon/vp8_rtcd.h @@ -33,8 +33,7 @@ void vp8_bilinear_predict16x16_neon(unsigned char *src, int src_pitch, int xofst void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_bilinear_predict4x4_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); -#define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_neon +#define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_armv6 void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_bilinear_predict8x4_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); diff --git a/libvpx/vp8/common/rtcd_defs.pl b/libvpx/vp8/common/rtcd_defs.pl index fd9afd2ac..4aa0e0c4f 100644 --- a/libvpx/vp8/common/rtcd_defs.pl +++ b/libvpx/vp8/common/rtcd_defs.pl @@ -238,7 +238,7 @@ specialize qw/vp8_bilinear_predict8x4 mmx media neon/; $vp8_bilinear_predict8x4_media=vp8_bilinear_predict8x4_armv6; add_proto qw/void vp8_bilinear_predict4x4/, "unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch"; -specialize qw/vp8_bilinear_predict4x4 mmx media neon/; +specialize qw/vp8_bilinear_predict4x4 mmx media/; $vp8_bilinear_predict4x4_media=vp8_bilinear_predict4x4_armv6; # |