diff options
| author | Fritz Koenig <frkoenig@google.com> | 2012-01-19 15:18:31 -0800 |
|---|---|---|
| committer | Fritz Koenig <frkoenig@google.com> | 2012-01-20 10:38:15 -0800 |
| commit | 892102842a7bfd5dc8f37ed4c69c3d68e1293df4 (patch) | |
| tree | fcf90d3b86eae619199a80c0d8f2e161937f75a4 /vp8/vp8cx_arm.mk | |
| parent | ac97b089d1000848f350480ec355b90e4f1f4ef7 (diff) | |
| download | libvpx-892102842a7bfd5dc8f37ed4c69c3d68e1293df4.tar libvpx-892102842a7bfd5dc8f37ed4c69c3d68e1293df4.tar.gz libvpx-892102842a7bfd5dc8f37ed4c69c3d68e1293df4.tar.bz2 libvpx-892102842a7bfd5dc8f37ed4c69c3d68e1293df4.zip | |
Disconnect ARM tgt_isa from dsp extensions
A processor with ARMv7 instructions does not
necessarily have NEON dsp extensions. This CL
has the added side effect of allowing the ability
to enable/disable the dsp extensions cleanly.
Change-Id: Ie1e879b8fe131885bc3d4138a0acc9ffe73a36df
Diffstat (limited to 'vp8/vp8cx_arm.mk')
| -rw-r--r-- | vp8/vp8cx_arm.mk | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/vp8/vp8cx_arm.mk b/vp8/vp8cx_arm.mk index f8f054a76..7429e16d7 100644 --- a/vp8/vp8cx_arm.mk +++ b/vp8/vp8cx_arm.mk @@ -23,41 +23,41 @@ VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/quantize_arm.h VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.c VP8_CX_SRCS-$(ARCH_ARM) += encoder/arm/variance_arm.h -#File list for armv5te +#File list for edsp # encoder -VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/boolhuff_arm.c -VP8_CX_SRCS_REMOVE-$(HAVE_ARMV5TE) += encoder/boolhuff.c -VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/boolhuff_armv5te$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_armv5$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_mbrow_armv5$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV5TE) += encoder/arm/armv5te/vp8_packtokens_partitions_armv5$(ASM) +VP8_CX_SRCS-$(HAVE_EDSP) += encoder/arm/boolhuff_arm.c +VP8_CX_SRCS_REMOVE-$(HAVE_EDSP) += encoder/boolhuff.c +VP8_CX_SRCS-$(HAVE_EDSP) += encoder/arm/armv5te/boolhuff_armv5te$(ASM) +VP8_CX_SRCS-$(HAVE_EDSP) += encoder/arm/armv5te/vp8_packtokens_armv5$(ASM) +VP8_CX_SRCS-$(HAVE_EDSP) += encoder/arm/armv5te/vp8_packtokens_mbrow_armv5$(ASM) +VP8_CX_SRCS-$(HAVE_EDSP) += encoder/arm/armv5te/vp8_packtokens_partitions_armv5$(ASM) -#File list for armv6 +#File list for media # encoder -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_subtract_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_short_fdct4x4_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_fast_quantize_b_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_sad16x16_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance16x16_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_mse16x16_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/vp8_variance8x8_armv6$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV6) += encoder/arm/armv6/walsh_v6$(ASM) +VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_subtract_armv6$(ASM) +VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_short_fdct4x4_armv6$(ASM) +VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_fast_quantize_b_armv6$(ASM) +VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_sad16x16_armv6$(ASM) +VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_variance16x16_armv6$(ASM) +VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6$(ASM) +VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6$(ASM) +VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6$(ASM) +VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_mse16x16_armv6$(ASM) +VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/vp8_variance8x8_armv6$(ASM) +VP8_CX_SRCS-$(HAVE_MEDIA) += encoder/arm/armv6/walsh_v6$(ASM) #File list for neon # encoder -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/fastquantizeb_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/picklpf_arm.c -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/sad8_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/sad16_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/shortfdct_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/subtract_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/variance_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_mse16x16_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance8x8_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance16x16_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_memcpy_neon$(ASM) -VP8_CX_SRCS-$(HAVE_ARMV7) += encoder/arm/neon/vp8_shortwalsh4x4_neon$(ASM) +VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/fastquantizeb_neon$(ASM) +VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/picklpf_arm.c +VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/sad8_neon$(ASM) +VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/sad16_neon$(ASM) +VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/shortfdct_neon$(ASM) +VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/subtract_neon$(ASM) +VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/variance_neon$(ASM) +VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp8_mse16x16_neon$(ASM) +VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp8_subpixelvariance8x8_neon$(ASM) +VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp8_subpixelvariance16x16_neon$(ASM) +VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM) +VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp8_memcpy_neon$(ASM) +VP8_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp8_shortwalsh4x4_neon$(ASM) |