shithub: libvpx

Info  •  Files  •  Log  •  Branches

Fix build failure with Android NDK

The version of gcc4.6 included with the Android NDK through r10b
fails to compile this function. Replace it with C code.

BUG=860

Change-Id: Ifcc0476664071aec46a171cdd5ad17305930986a

--- a/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c

+++ b/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c

@@ -9,11 +9,21 @@

  */

 #include <arm_neon.h>

+#include "vpx_ports/arm.h"

+#ifdef VPX_INCOMPATIBLE_GCC

+#include "./vp8_rtcd.h"

 void vp8_short_walsh4x4_neon(

         int16_t *input,

         int16_t *output,

         int pitch) {

+  vp8_short_walsh4x4_c(input, output, pitch);

+}

+#else

+void vp8_short_walsh4x4_neon(

+        int16_t *input,

+        int16_t *output,

+        int pitch) {

     uint16x4_t d16u16;

     int16x8_t q0s16, q1s16;

     int16x4_t dEmptys16, d0s16, d1s16, d2s16, d3s16, d4s16, d5s16, d6s16, d7s16;

@@ -116,3 +126,4 @@

     vst1q_s16(output + 8, q1s16);

     return;

 }

+#endif  // VPX_INCOMPATIBLE_GCC