| author | Zhi Zhou <zhi.zhou@amlogic.com> | 2016-11-09 12:44:37 (GMT) |
|---|---|---|
| committer | Zhi Zhou <zhi.zhou@amlogic.com> | 2016-11-09 12:51:10 (GMT) |
| commit | 96c19a9ec91a3fc5b8ed9b9dff4c50f5d82a31db (patch) | |
| tree | 351acc4b15035826fe8b3a624f7e87c532705d9d | |
| parent | ce2856e687355620f2c9193584b6cf3c89073837 (diff) | |
| download | ffmpeg-96c19a9ec91a3fc5b8ed9b9dff4c50f5d82a31db.zip ffmpeg-96c19a9ec91a3fc5b8ed9b9dff4c50f5d82a31db.tar.gz ffmpeg-96c19a9ec91a3fc5b8ed9b9dff4c50f5d82a31db.tar.bz2 | |
PD#133403 fixed ffmpeg assamber compiler problem.
revert commit:ce2856e687355620f2c9193584b6cf3c89073837
And add asm compiling for soft decoder.
Change-Id: Ife6892b9fa3d3be5ee873309e81a967ecd265e6e
| -rw-r--r-- | Android.mk | 5 | ||||
| -rw-r--r-- | config.h | 25 |
2 files changed, 22 insertions, 8 deletions
@@ -1194,6 +1194,8 @@ LOCAL_CFLAGS_arm := $(FFMPEG_CFLAGS_armv7-a-neon) LOCAL_CFLAGS_32 := -DARCH_ARM +LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as + LOCAL_LDFLAGS += $(FFMPEG_LDFLAGS) LOCAL_LDFLAGS_arm := -Wl,--no-warn-shared-textrel @@ -1204,7 +1206,8 @@ LOCAL_SRC_FILES := \ $(FFMPEG_LIBAVFORMAT_SRC_FILES) \ $(FFMPEG_LIBSWSCALE_SRC_FILES) -#LOCAL_SRC_FILES_arm := \ +LOCAL_SRC_FILES_arm := \ + $(FFMPEG_LOCAL_SRC_FILES_armv7-a-neon) \ libavutil/arm/asm.S \ libavutil/arm/cpu.c \ libavutil/arm/float_dsp_init_arm.c \ @@ -11,8 +11,19 @@ #define EXTERN_ASM #define SLIBSUF ".so" #define HAVE_MMX2 HAVE_MMXEXT +#ifdef ARCH_AARCH64 +#undef ARCH_AARCH64 +#define ARCH_AARCH64 1 +#else +#define ARCH_AARCH64 0 +#endif #define ARCH_ALPHA 0 +#ifdef ARCH_ARM +#undef ARCH_ARM +#define ARCH_ARM 1 +#else #define ARCH_ARM 0 +#endif #define ARCH_AVR32 0 #define ARCH_AVR32_AP 0 #define ARCH_AVR32_UC 0 @@ -34,12 +45,12 @@ #define ARCH_X86 0 #define ARCH_X86_32 0 #define ARCH_X86_64 0 -#define HAVE_ARMV5TE 0 -#define HAVE_ARMV6 0 -#define HAVE_ARMV6T2 0 -#define HAVE_NEON 0 -#define HAVE_VFP 0 -#define HAVE_VFPV3 0 +#define HAVE_ARMV5TE 1 +#define HAVE_ARMV6 1 +#define HAVE_ARMV6T2 1 +#define HAVE_NEON 1 +#define HAVE_VFP 1 +#define HAVE_VFPV3 1 #define HAVE_AMD3DNOW 0 #define HAVE_AMD3DNOWEXT 0 #define HAVE_AVX 0 @@ -389,7 +400,7 @@ #define CONFIG_DWT 1 #define CONFIG_ERROR_RESILIENCE 1 #define CONFIG_FAST_UNALIGNED 1 -#define CONFIG_FFT 0 +#define CONFIG_FFT 1 #define CONFIG_FTRAPV 0 #define CONFIG_GPL 0 #define CONFIG_GRAY 0 |