From e68e4ad7f2ecf45cd7c28c1192eab2059b477dd3 Mon Sep 17 00:00:00 2001 From: Johann Date: Tue, 4 Aug 2015 15:36:06 -0700 Subject: 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) --- armv7a-neon/vp8_rtcd.h | 3 +-- 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 77b0e47..66ad28a 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 fd9afd2..4aa0e0c 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; # -- cgit v1.2.3