Revert "Add VP9 inter-frame prediction intrinsic"
This reverts commit 60498fe9679ea25a260a503d6dfd27cbc0a0c079.
Change-Id: I4d8bb284793874a08c0cc991c0e04ecc104e1e0f
Conflicts:
cpu_ref/Android.mk
cpu_ref/rsCpuCore.cpp
rsDefines.h
diff --git a/cpu_ref/Android.mk b/cpu_ref/Android.mk
index 44df7cb..a521bfb 100644
--- a/cpu_ref/Android.mk
+++ b/cpu_ref/Android.mk
@@ -29,12 +29,10 @@
rsCpuIntrinsicConvolve3x3.cpp \
rsCpuIntrinsicConvolve5x5.cpp \
rsCpuIntrinsicHistogram.cpp \
- rsCpuIntrinsicInterPred.cpp \
rsCpuIntrinsicLoopFilter.cpp \
rsCpuIntrinsicYuvToRGB.cpp \
rsCpuIntrinsicResize.cpp \
- rsCpuIntrinsicLUT.cpp \
- convolve/convolve.c
+ rsCpuIntrinsicLUT.cpp
LOCAL_CFLAGS_arm64 += -DARCH_ARM_HAVE_NEON
LOCAL_CFLAGS_64 += -DFAKE_ARM64_BUILD
@@ -61,11 +59,6 @@
rsCpuIntrinsics_neon_Convolve.S \
rsCpuIntrinsics_neon_ColorMatrix.S \
rsCpuIntrinsics_neon_YuvToRGB.S \
- convolve/convolve_copy_neon.s \
- convolve/convolve_avg_neon.s \
- convolve/convolve8_neon.s \
- convolve/convolve8_avg_neon.s \
- convolve/convolve_neon.c\
vp9_loopfilter_16_neon.S \
vp9_loopfilter_neon.S \
vp9_mb_lpf_neon.S