diff options
| author | Johann <johannkoenig@google.com> | 2015-08-04 15:36:06 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2015-08-14 17:39:12 -0700 |
| commit | efc44fee7c71536f1f169f705cb81d99c8777ca2 (patch) | |
| tree | 1a634c2b822a8105afa63a1b54710acf551236dd | |
| parent | 9b35249446b07f40ac5fcc3205f2c048616efacc (diff) | |
| download | libvpx-efc44fee7c71536f1f169f705cb81d99c8777ca2.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.sh | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/armv7a-neon/vp8_rtcd.h b/armv7a-neon/vp8_rtcd.h index 9cad64ac1..35c36d706 100644 --- a/armv7a-neon/vp8_rtcd.h +++ b/armv7a-neon/vp8_rtcd.h @@ -165,8 +165,7 @@ void vp8_bilinear_predict8x4_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 unsigned int vp8_variance4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); #define vp8_variance4x4 vp8_variance4x4_c diff --git a/libvpx/vp8/common/rtcd_defs.sh b/libvpx/vp8/common/rtcd_defs.sh index 9ebf389d8..48cd8c266 100644 --- a/libvpx/vp8/common/rtcd_defs.sh +++ b/libvpx/vp8/common/rtcd_defs.sh @@ -233,7 +233,7 @@ specialize vp8_bilinear_predict8x4 mmx media neon vp8_bilinear_predict8x4_media=vp8_bilinear_predict8x4_armv6 prototype void vp8_bilinear_predict4x4 "unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch" -specialize vp8_bilinear_predict4x4 mmx media neon +specialize vp8_bilinear_predict4x4 mmx media vp8_bilinear_predict4x4_media=vp8_bilinear_predict4x4_armv6 # |