From 08c0c8dd08a6e3f3652b47f2c3fad69ded95a0f5 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 16 Sep 2011 15:51:27 +0200 Subject: [PATCH] libvpx: enable runtime cpu detection feature --- submodules/externals/build/libvpx/Android.mk | 5 +++-- submodules/externals/build/libvpx/vpx_config.h | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/submodules/externals/build/libvpx/Android.mk b/submodules/externals/build/libvpx/Android.mk index eb00e45bf..37b208d29 100755 --- a/submodules/externals/build/libvpx/Android.mk +++ b/submodules/externals/build/libvpx/Android.mk @@ -195,7 +195,7 @@ ASM_FILES += \ vp8/decoder/arm/armv6/dequant_dc_idct_v6.$(ASM) \ vp8/decoder/arm/armv6/dequant_idct_v6.$(ASM) \ vp8/decoder/arm/armv6/dequantize_v6.$(ASM) - + # vpx_mem subfolder [vpx_mem.mk] LOCAL_SRC_FILES += vpx_mem/vpx_mem.c @@ -213,6 +213,8 @@ ASM_FILES += \ vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.$(ASM) \ vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.$(ASM) \ +LOCAL_SRC_FILES += vpx_ports/arm_cpudetect.c + LOCAL_SRC_FILES += $(ASM_FILES) LOCAL_CFLAGS += \ @@ -231,4 +233,3 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/vpx_codec include $(BUILD_STATIC_LIBRARY) - diff --git a/submodules/externals/build/libvpx/vpx_config.h b/submodules/externals/build/libvpx/vpx_config.h index 88e0aec32..8cecad7e6 100644 --- a/submodules/externals/build/libvpx/vpx_config.h +++ b/submodules/externals/build/libvpx/vpx_config.h @@ -1,7 +1,7 @@ /* This file automatically generated by configure. Do not edit! */ #ifndef VPX_CONFIG_H #define VPX_CONFIG_H -#define RESTRICT +#define RESTRICT #define ARCH_ARM 1 #define ARCH_MIPS 0 #define ARCH_X86 0 @@ -49,7 +49,7 @@ #define CONFIG_MD5 1 #define CONFIG_DEQUANT_TOKENS 0 #define CONFIG_DC_RECON 0 -#define CONFIG_RUNTIME_CPU_DETECT 0 +#define CONFIG_RUNTIME_CPU_DETECT 1 #define CONFIG_POSTPROC 0 #define CONFIG_MULTITHREAD 1 #define CONFIG_INTERNAL_STATS 0