summaryrefslogtreecommitdiff
path: root/vpx_dsp/vpx_dsp.mk
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2016-11-23 20:48:00 -0800
committerJames Zern <jzern@google.com>2016-12-06 16:09:19 -0800
commit8befcd008924a111c08dc58fa740e905bc0b0d5f (patch)
treee1d37594ea1a929db764519e5748aa021d2b9786 /vpx_dsp/vpx_dsp.mk
parentaf9d7aa9fb81e722a719efd8c2fea7a7a80382e9 (diff)
downloadlibvpx-8befcd008924a111c08dc58fa740e905bc0b0d5f.tar
libvpx-8befcd008924a111c08dc58fa740e905bc0b0d5f.tar.gz
libvpx-8befcd008924a111c08dc58fa740e905bc0b0d5f.tar.bz2
libvpx-8befcd008924a111c08dc58fa740e905bc0b0d5f.zip
enable vpx_idct16x16_10_add_neon in hbd builds
BUG=webm:1294 Change-Id: Ibad079f25e673d4f5181961896a8a8333a51e825
Diffstat (limited to 'vpx_dsp/vpx_dsp.mk')
-rw-r--r--vpx_dsp/vpx_dsp.mk11
1 files changed, 3 insertions, 8 deletions
diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk
index 200ef07f1..a58dcd6b8 100644
--- a/vpx_dsp/vpx_dsp.mk
+++ b/vpx_dsp/vpx_dsp.mk
@@ -204,14 +204,6 @@ endif # ARCH_X86_64
DSP_SRCS-$(HAVE_NEON_ASM) += arm/save_reg_neon$(ASM)
ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
-ifeq ($(HAVE_NEON_ASM),yes)
-DSP_SRCS-yes += arm/idct16x16_add_neon$(ASM)
-else
-ifeq ($(HAVE_NEON),yes)
-DSP_SRCS-yes += arm/idct16x16_add_neon.c
-endif # HAVE_NEON
-endif # HAVE_NEON_ASM
-DSP_SRCS-$(HAVE_NEON) += arm/idct16x16_neon.c
DSP_SRCS-$(HAVE_NEON) += arm/idct32x32_add_neon.c
DSP_SRCS-$(HAVE_MSA) += mips/inv_txfm_msa.h
@@ -235,14 +227,17 @@ DSP_SRCS-yes += arm/idct4x4_add_neon$(ASM)
DSP_SRCS-yes += arm/idct8x8_1_add_neon$(ASM)
DSP_SRCS-yes += arm/idct8x8_add_neon$(ASM)
DSP_SRCS-yes += arm/idct16x16_1_add_neon$(ASM)
+DSP_SRCS-yes += arm/idct16x16_add_neon$(ASM)
else
DSP_SRCS-$(HAVE_NEON) += arm/idct4x4_1_add_neon.c
DSP_SRCS-$(HAVE_NEON) += arm/idct4x4_add_neon.c
DSP_SRCS-$(HAVE_NEON) += arm/idct8x8_1_add_neon.c
DSP_SRCS-$(HAVE_NEON) += arm/idct8x8_add_neon.c
DSP_SRCS-$(HAVE_NEON) += arm/idct16x16_1_add_neon.c
+DSP_SRCS-$(HAVE_NEON) += arm/idct16x16_add_neon.c
endif # HAVE_NEON_ASM
DSP_SRCS-$(HAVE_NEON) += arm/idct_neon.h
+DSP_SRCS-$(HAVE_NEON) += arm/idct16x16_neon.c
DSP_SRCS-$(HAVE_NEON) += arm/idct32x32_1_add_neon.c
DSP_SRCS-$(HAVE_NEON) += arm/idct32x32_34_add_neon.c
DSP_SRCS-$(HAVE_NEON) += arm/idct32x32_135_add_neon.c