| author | Tellen Yu <tellen.yu@amlogic.com> | 2015-05-22 09:54:39 (GMT) |
|---|---|---|
| committer | Jian Wang <jian.wang@amlogic.com> | 2015-06-03 02:30:30 (GMT) |
| commit | a712f1a748a250a4b96b14ccc62d8b8b03fb288a (patch) | |
| tree | bc7b1d036f342232b20eba28c8a28969768d49af | |
| parent | e6c4553a0af24b8762b7c49f754227f0454e3395 (diff) | |
| download | ffmpeg-a712f1a748a250a4b96b14ccc62d8b8b03fb288a.zip ffmpeg-a712f1a748a250a4b96b14ccc62d8b8b03fb288a.tar.gz ffmpeg-a712f1a748a250a4b96b14ccc62d8b8b03fb288a.tar.bz2 | |
modify for compatibility 64bit
Change-Id: Id93aecaab5775b6d4a2f7f9913c241d719d3f763
| -rw-r--r--[-rwxr-xr-x] | Android.mk | 28 | ||||
| -rw-r--r-- | config.h | 10 |
2 files changed, 27 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk index dcd81b7..52427fd 100755..100644 --- a/Android.mk +++ b/Android.mk @@ -11,9 +11,9 @@ FFMPEG_CFLAGS := \ -Wno-switch \ -fPIC -FFMPEG_LDFLAGS := -Wl,--as-needed -Wl,-Bsymbolic -lm -Wl,--no-warn-shared-textrel +FFMPEG_LDFLAGS := -Wl,--as-needed -Wl,-Bsymbolic -lm -ifeq ($(TARGET_ARCH),arm) +ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm arm64)) # Generated by configure. Should match the list of source files in # FFMPEG_LOCAL_SRC_FILES_armv* below. See libavcodec/<arch>/Makefile. FFMPEG_CFLAGS_armv4t := \ @@ -53,13 +53,6 @@ endif FFMPEG_LIBAVUTIL_SRC_FILES := \ libavutil/adler32.c \ libavutil/aes.c \ - libavutil/arm/asm.S \ - libavutil/arm/cpu.c \ - libavutil/arm/float_dsp_init_arm.c \ - libavutil/arm/float_dsp_init_neon.c \ - libavutil/arm/float_dsp_init_vfp.c \ - libavutil/arm/float_dsp_neon.S \ - libavutil/arm/float_dsp_vfp.S \ libavutil/audio_fifo.c \ libavutil/avstring.c \ libavutil/base64.c \ @@ -1191,21 +1184,34 @@ LOCAL_MODULE := libamffmpeg LOCAL_MODULE_TAGS := optional -ifeq ($(TARGET_ARCH),arm) +ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm arm64)) LOCAL_ARM_MODE := arm endif LOCAL_CFLAGS := $(FFMPEG_CFLAGS) -DFF_API_AV_GETTIME=0 +LOCAL_CFLAGS_arm := $(FFMPEG_CFLAGS_armv7-a-neon) + LOCAL_LDFLAGS += $(FFMPEG_LDFLAGS) +LOCAL_LDFLAGS_arm := -Wl,--no-warn-shared-textrel + LOCAL_SRC_FILES := \ $(FFMPEG_LIBAVUTIL_SRC_FILES) \ $(FFMPEG_LIBAVCODEC_SRC_FILES) \ - ${FFMPEG_LOCAL_SRC_FILES_$(TARGET_ARCH_VARIANT)} \ $(FFMPEG_LIBAVFORMAT_SRC_FILES) \ $(FFMPEG_LIBSWSCALE_SRC_FILES) +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 \ + libavutil/arm/float_dsp_init_neon.c \ + libavutil/arm/float_dsp_init_vfp.c \ + libavutil/arm/float_dsp_neon.S \ + libavutil/arm/float_dsp_vfp.S + LOCAL_SHARED_LIBRARIES := libutils liblog libdl include $(BUILD_SHARED_LIBRARY) @@ -11,9 +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 |