diff options
| author | Suman Sunkara <sunkaras@google.com> | 2010-11-16 15:09:26 -0500 |
|---|---|---|
| committer | Suman Sunkara <sunkaras@google.com> | 2010-11-16 16:30:59 -0500 |
| commit | 4b3f72001de952aaf3874d3ce2dca3cb3fbe3928 (patch) | |
| tree | 754d87a4fa5cae908388f0a26b2affad7cd8a523 /vp8/vp8dx_arm.mk | |
| parent | b9a18344cf8e5283928525c5ac0897ede79f9e57 (diff) | |
| parent | 00fe7441e9c5cbd898a8382d49cf9396d8482464 (diff) | |
| download | libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.tar libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.tar.gz libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.tar.bz2 libvpx-4b3f72001de952aaf3874d3ce2dca3cb3fbe3928.zip | |
Merge branch 'experimental' of ssh://on2-git.corp.google.com:29418/libvpx into test
Conflicts:
vp8/common/blockd.h
vp8/decoder/decodemv.c
vp8/decoder/decodframe.c
vp8/decoder/demode.c
vp8/decoder/onyxd_if.c
vp8/decoder/onyxd_int.h
vp8/encoder/encodeframe.c
Change-Id: Ic379f4dffaded9796dc19d56be304d3f8527c61f
Diffstat (limited to 'vp8/vp8dx_arm.mk')
| -rw-r--r-- | vp8/vp8dx_arm.mk | 48 |
1 files changed, 18 insertions, 30 deletions
diff --git a/vp8/vp8dx_arm.mk b/vp8/vp8dx_arm.mk index 1b4a7ecf7..0803a9cb0 100644 --- a/vp8/vp8dx_arm.mk +++ b/vp8/vp8dx_arm.mk @@ -1,44 +1,32 @@ ## -## Copyright (c) 2010 The VP8 project authors. All Rights Reserved. +## Copyright (c) 2010 The WebM project authors. All Rights Reserved. ## -## Use of this source code is governed by a BSD-style license and patent -## grant that can be found in the LICENSE file in the root of the source -## tree. All contributing project authors may be found in the AUTHORS -## file in the root of the source tree. +## Use of this source code is governed by a BSD-style license +## that can be found in the LICENSE file in the root of the source +## tree. An additional intellectual property rights grant can be found +## in the file PATENTS. All contributing project authors may +## be found in the AUTHORS file in the root of the source tree. ## #VP8_DX_SRCS list is modified according to different platforms. -#File list for arm -# decoder -#VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/decodframe_arm.c -VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/dequantize_arm.c -VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/dsystemdependent.c +VP8_DX_SRCS-$(ARCH_ARM) += decoder/arm/arm_dsystemdependent.c -#VP8_DX_SRCS_REMOVE-$(HAVE_ARMV6) += decoder/decodframe.c -VP8_DX_SRCS_REMOVE-$(HAVE_ARMV6) += decoder/dequantize.c -VP8_DX_SRCS_REMOVE-$(HAVE_ARMV6) += decoder/generic/dsystemdependent.c +VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/dequantize_arm.c +VP8_DX_SRCS-$(CONFIG_ARM_ASM_DETOK) += decoder/arm/detokenize$(ASM) #File list for armv6 -# decoder -VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/armv6/dequantdcidct_v6$(ASM) -VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/armv6/dequantidct_v6$(ASM) +VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/armv6/dequant_dc_idct_v6$(ASM) +VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/armv6/dequant_idct_v6$(ASM) VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/armv6/dequantize_v6$(ASM) +VP8_DX_SRCS-$(HAVE_ARMV6) += decoder/arm/armv6/idct_blk_v6.c #File list for neon -# decoder -VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/dequantdcidct_neon$(ASM) -VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/dequantidct_neon$(ASM) +VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/idct_dequant_dc_full_2x_neon$(ASM) +VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/idct_dequant_dc_0_2x_neon$(ASM) +VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/dequant_idct_neon$(ASM) +VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/idct_dequant_full_2x_neon$(ASM) +VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/idct_dequant_0_2x_neon$(ASM) VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/dequantizeb_neon$(ASM) - - -#for new token test -ifeq ($(ARCH_ARM),yes) -VP8_DX_SRCS-$(CONFIG_NEW_TOKENS) += decoder/arm/detokenize_arm_sjl.c -VP8_DX_SRCS-$(CONFIG_NEW_TOKENS) += decoder/arm/detokenize_arm_v6$(ASM) -VP8_DX_SRCS-$(CONFIG_NEW_TOKENS) += decoder/onyxd_if_sjl.c - -VP8_DX_SRCS_REMOVE-$(CONFIG_NEW_TOKENS) += decoder/arm/detokenize_arm.c -VP8_DX_SRCS_REMOVE-$(CONFIG_NEW_TOKENS) += decoder/onyxd_if.c -endif +VP8_DX_SRCS-$(HAVE_ARMV7) += decoder/arm/neon/idct_blk_neon.c |