diff --git a/project/jni/ffmpeg/Android.mk b/project/jni/ffmpeg/Android.mk index d32d2cc5b..04eb86dd5 100644 --- a/project/jni/ffmpeg/Android.mk +++ b/project/jni/ffmpeg/Android.mk @@ -3,6 +3,7 @@ # Srdjan Obucina LOCAL_PATH:=$(call my-dir) +#FFMPEG_REBUILD_FROM_SOURCE:=yes ifneq ($(FFMPEG_REBUILD_FROM_SOURCE),yes) diff --git a/project/jni/ffmpeg/Android_configure.mk b/project/jni/ffmpeg/Android_configure.mk index 56469fd2b..fc72414c8 100644 --- a/project/jni/ffmpeg/Android_configure.mk +++ b/project/jni/ffmpeg/Android_configure.mk @@ -103,7 +103,8 @@ ifneq ($(FF_CONFIGURATION_STRING), $(FF_LAST_CONFIGURATION_STRING_OUTPUT)) --enable-shared \ --disable-static \ --enable-avresample \ - --disable-everything \ + --disable-indevs \ + --disable-outdevs \ --disable-mmx \ --disable-yasm; \ make -j4; \ @@ -172,6 +173,7 @@ ifneq ($(FF_CONFIGURATION_STRING), $(FF_LAST_CONFIGURATION_STRING_OUTPUT)) ifeq ($(VERSION_BRANCH),1.1) + # NEON presence is checked at runtime, so enable it FF_FIX_CONFIGURATION_COMMAND := \ cd $(FFMPEG_ROOT_DIR)/$(FFMPEG_CONFIG_DIR); \ \ @@ -187,12 +189,38 @@ ifneq ($(FF_CONFIGURATION_STRING), $(FF_LAST_CONFIGURATION_STRING_OUTPUT)) sed 's/\#define HAVE_SYSCTL 1/\#define HAVE_SYSCTL 0/g' | \ sed 's/\#define HAVE_POSIX_MEMALIGN 1/\#define HAVE_POSIX_MEMALIGN 0/g' | \ sed 's/\#define HAVE_PTHREAD_CANCEL 1/\#define HAVE_PTHREAD_CANCEL 0/g' | \ + sed 's/\#define HAVE_GLOB 1/\#define HAVE_GLOB 0/g' | \ + sed 's/\#define HAVE_LOG2 1/\#define HAVE_LOG2 0/g' | \ + sed 's/\#define HAVE_LOG2F 1/\#define HAVE_LOG2F 0/g' | \ + sed 's/\#define HAVE_FAST_CMOV 1/\#define HAVE_FAST_CMOV 0/g' | \ + sed 's/\#define HAVE_CMOV 1/\#define HAVE_CMOV 0/g' | \ + sed 's/\#define HAVE_EBP_AVAILABLE 1/\#define HAVE_EBP_AVAILABLE 0/g' | \ + sed 's/\#define HAVE_EBX_AVAILABLE 1/\#define HAVE_EBX_AVAILABLE 0/g' | \ + sed 's/\#define HAVE_FAST_CLZ 1/\#define HAVE_FAST_CLZ 1/g' | \ + sed 's/\#define HAVE_FAST_UNALIGNED 1/\#define HAVE_FAST_UNALIGNED 0/g' | \ + sed 's/\#define CONFIG_FAST_UNALIGNED 1/\#define CONFIG_FAST_UNALIGNED 0/g' | \ + sed 's/\#define HAVE_ARMV5TE 0/\#define HAVE_ARMV5TE 1/g' | \ + sed 's/\#define HAVE_VFP 0/\#define HAVE_VFP 1/g' | \ + sed 's/\#define HAVE_NEON 0/\#define HAVE_NEON 1/g' | \ + sed 's/\#define HAVE_ARMV6 0/\#define HAVE_ARMV6 1/g' | \ cat > config.h.tmp; \ mv config.h config.h.bak; \ mv config.h.tmp config.h; \ \ cat config.mak | \ sed 's/HAVE_STRERROR_R=yes/!HAVE_STRERROR_R=yes/g' | \ + sed 's/ARCH=x86/ARCH=arm/g' | \ + sed 's/ARCH_X86=yes/!ARCH_X86=yes/g' | \ + sed 's/ARCH_X86_32=yes/!ARCH_X86_32=yes/g' | \ + sed 's/ARCH_X86_64=yes/!ARCH_X86_64=yes/g' | \ + sed 's/!ARCH_ARM=yes/ARCH_ARM=yes/g' | \ + sed 's/!HAVE_ARMV5TE=yes/HAVE_ARMV5TE=yes/g' | \ + sed 's/!HAVE_ARMV6=yes/HAVE_ARMV6=yes/g' | \ + sed 's/!HAVE_NEON=yes/HAVE_NEON=yes/g' | \ + sed 's/!HAVE_VFP=yes/HAVE_VFP=yes/g' | \ + sed 's/HAVE_FAST_UNALIGNED=yes/!HAVE_FAST_UNALIGNED=yes/g' | \ + sed 's/HAVE_LOG2=yes/!HAVE_LOG2=yes/g' | \ + sed 's/HAVE_LOG2F=yes/!HAVE_LOG2F=yes/g' | \ cat > config.mak.tmp; \ mv config.mak config.mak.bak; \ mv config.mak.tmp config.mak; \ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so b/project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so index c57fb8f6d..2112dd2aa 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so and b/project/jni/ffmpeg/lib/armeabi-v7a/libavcodec.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so b/project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so index 0dc7e819b..391007224 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so and b/project/jni/ffmpeg/lib/armeabi-v7a/libavdevice.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so b/project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so index 2ab909fa9..6f6de3a8b 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so and b/project/jni/ffmpeg/lib/armeabi-v7a/libavfilter.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so b/project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so index ce76fa557..29f449139 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so and b/project/jni/ffmpeg/lib/armeabi-v7a/libavformat.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavresample.so b/project/jni/ffmpeg/lib/armeabi-v7a/libavresample.so index d943286d5..35046d37a 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libavresample.so and b/project/jni/ffmpeg/lib/armeabi-v7a/libavresample.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so b/project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so index ca8bd5836..e275ab0e2 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so and b/project/jni/ffmpeg/lib/armeabi-v7a/libavutil.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libswresample.so b/project/jni/ffmpeg/lib/armeabi-v7a/libswresample.so index 7a96d5c07..fd290d116 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libswresample.so and b/project/jni/ffmpeg/lib/armeabi-v7a/libswresample.so differ diff --git a/project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so b/project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so index df3011ef4..4e3520ea5 100755 Binary files a/project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so and b/project/jni/ffmpeg/lib/armeabi-v7a/libswscale.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavcodec.so b/project/jni/ffmpeg/lib/armeabi/libavcodec.so index 182fe0e70..9ffaf49ab 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libavcodec.so and b/project/jni/ffmpeg/lib/armeabi/libavcodec.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavdevice.so b/project/jni/ffmpeg/lib/armeabi/libavdevice.so index dfbcf2a80..326b97201 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libavdevice.so and b/project/jni/ffmpeg/lib/armeabi/libavdevice.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavfilter.so b/project/jni/ffmpeg/lib/armeabi/libavfilter.so index e4c590029..4000d4e70 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libavfilter.so and b/project/jni/ffmpeg/lib/armeabi/libavfilter.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavformat.so b/project/jni/ffmpeg/lib/armeabi/libavformat.so index 4f0497828..8292960b0 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libavformat.so and b/project/jni/ffmpeg/lib/armeabi/libavformat.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavresample.so b/project/jni/ffmpeg/lib/armeabi/libavresample.so index 606e6b60c..360c1748b 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libavresample.so and b/project/jni/ffmpeg/lib/armeabi/libavresample.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libavutil.so b/project/jni/ffmpeg/lib/armeabi/libavutil.so index f245d5c00..a7d887973 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libavutil.so and b/project/jni/ffmpeg/lib/armeabi/libavutil.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libswresample.so b/project/jni/ffmpeg/lib/armeabi/libswresample.so index 52f91dfd4..7a731b44b 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libswresample.so and b/project/jni/ffmpeg/lib/armeabi/libswresample.so differ diff --git a/project/jni/ffmpeg/lib/armeabi/libswscale.so b/project/jni/ffmpeg/lib/armeabi/libswscale.so index 830cb8ff8..c307dde94 100755 Binary files a/project/jni/ffmpeg/lib/armeabi/libswscale.so and b/project/jni/ffmpeg/lib/armeabi/libswscale.so differ