diff options
author | James Zern <jzern@google.com> | 2016-09-30 19:36:08 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-30 19:36:08 +0000 |
commit | b6277a47c7b5edac25156206043d4c16ce81e941 (patch) | |
tree | 1ae348f08238444edb2f35b756f0a923fddc29fc /vpx_dsp/vpx_dsp.mk | |
parent | 8c744fd9783ae7bcfb2d0ef1dfa95fda4c19f38b (diff) | |
parent | 1396d1210337775127d284b208b8929fb04f13e7 (diff) | |
download | libvpx-b6277a47c7b5edac25156206043d4c16ce81e941.tar libvpx-b6277a47c7b5edac25156206043d4c16ce81e941.tar.gz libvpx-b6277a47c7b5edac25156206043d4c16ce81e941.tar.bz2 libvpx-b6277a47c7b5edac25156206043d4c16ce81e941.zip |
Merge changes from topic '8bit-hbd-idct'
* changes:
*idct*_neon.c: add missing rtcd include
idct,msa/neon: exclude idct files from hbd build
*rtcd_defs.pl: remove empty specialize calls
Diffstat (limited to 'vpx_dsp/vpx_dsp.mk')
-rw-r--r-- | vpx_dsp/vpx_dsp.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk index b3c4d5ae0..f6d106e28 100644 --- a/vpx_dsp/vpx_dsp.mk +++ b/vpx_dsp/vpx_dsp.mk @@ -196,8 +196,10 @@ ifeq ($(ARCH_X86_64),yes) DSP_SRCS-$(HAVE_SSSE3) += x86/inv_txfm_ssse3_x86_64.asm 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/save_reg_neon$(ASM) DSP_SRCS-yes += arm/idct4x4_1_add_neon$(ASM) DSP_SRCS-yes += arm/idct4x4_add_neon$(ASM) DSP_SRCS-yes += arm/idct8x8_1_add_neon$(ASM) @@ -226,7 +228,6 @@ DSP_SRCS-$(HAVE_MSA) += mips/idct8x8_msa.c DSP_SRCS-$(HAVE_MSA) += mips/idct16x16_msa.c DSP_SRCS-$(HAVE_MSA) += mips/idct32x32_msa.c -ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes) DSP_SRCS-$(HAVE_DSPR2) += mips/inv_txfm_dspr2.h DSP_SRCS-$(HAVE_DSPR2) += mips/itrans4_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/itrans8_dspr2.c |