enable compilation with neon
This commit is contained in:
parent
17580885fe
commit
28b51c7130
7 changed files with 40 additions and 29 deletions
Binary file not shown.
Binary file not shown.
|
@ -11,16 +11,25 @@ LOCAL_SRC_FILES = \
|
|||
libavcodec/arm/dsputil_init_arm.c \
|
||||
libavcodec/arm/dsputil_init_armv5te.c \
|
||||
libavcodec/arm/dsputil_init_armv6.c \
|
||||
libavcodec/arm/dsputil_init_neon.c \
|
||||
libavcodec/arm/dsputil_init_vfp.c \
|
||||
libavcodec/arm/dsputil_neon.S.neon \
|
||||
libavcodec/arm/fft_init_arm.c \
|
||||
libavcodec/arm/h264dsp_init_arm.c \
|
||||
libavcodec/arm/h264dsp_neon.S.neon \
|
||||
libavcodec/arm/h264idct_neon.S.neon \
|
||||
libavcodec/arm/h264pred_init_arm.c \
|
||||
libavcodec/arm/h264pred_neon.S.neon \
|
||||
libavcodec/arm/int_neon.S.neon \
|
||||
libavcodec/arm/jrevdct_arm.S \
|
||||
libavcodec/arm/mpegvideo_arm.c \
|
||||
libavcodec/arm/mpegvideo_armv5te.c \
|
||||
libavcodec/arm/mpegvideo_armv5te_s.S \
|
||||
libavcodec/arm/mpegvideo_neon.S.neon \
|
||||
libavcodec/arm/simple_idct_arm.S \
|
||||
libavcodec/arm/simple_idct_armv5te.S \
|
||||
libavcodec/arm/simple_idct_armv6.S \
|
||||
libavcodec/arm/simple_idct_neon.S.neon \
|
||||
libavcodec/audioconvert.c.arm \
|
||||
libavcodec/avpacket.c \
|
||||
libavcodec/bitstream.c \
|
||||
|
|
|
@ -16,6 +16,7 @@ LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
|
|||
#for including config.h:
|
||||
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg \
|
||||
$(LOCAL_PATH)/../ffmpeg \
|
||||
$(LOCAL_PATH)/
|
||||
$(LOCAL_PATH)/ \
|
||||
$(LOCAL_PATH)/../
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
|
|
3
submodules/externals/build/ffmpeg/README
vendored
Normal file
3
submodules/externals/build/ffmpeg/README
vendored
Normal file
|
@ -0,0 +1,3 @@
|
|||
config.h and list of sources files generated by the following configure invocation:
|
||||
|
||||
./configure --disable-mmx --prefix=/Users/jehanmonnier/opt --enable-cross-compile --arch=arm --target-os=linux --cc=arm-none-linux-gnueabi-gcc --disable-ffplay --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-avdevice --disable-avcore --disable-avfilter --disable-network --disable-everything --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 --disable-avformat --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --enable-pic --extra-cflags='-fPIC -march=armv7-a -mcpu=cortex-a8 -mfloat-abi=softfp -mfpu=neon
|
3
submodules/externals/build/ffmpeg/REAME
vendored
3
submodules/externals/build/ffmpeg/REAME
vendored
|
@ -1,3 +0,0 @@
|
|||
./configure --disable-mmx --prefix=/Users/jehanmonnier/opt --enable-cross-compile --arch=armv5te --target-os=linux --cc=arm-elf-gcc-4.3.2 --disable-ffplay --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-shared --disable-avdevice
|
||||
|
||||
|
51
submodules/externals/build/ffmpeg/config.h
vendored
51
submodules/externals/build/ffmpeg/config.h
vendored
|
@ -1,12 +1,12 @@
|
|||
/* Automatically generated by configure - do not modify! */
|
||||
#ifndef FFMPEG_CONFIG_H
|
||||
#define FFMPEG_CONFIG_H
|
||||
#define FFMPEG_CONFIGURATION "--disable-mmx --prefix=/Users/jehanmonnier/opt --enable-cross-compile --arch=armv7-a --target-os=linux --cc=arm-elf-gcc-4.3.2 --disable-ffplay --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-shared --disable-avdevice --disable-avcore --disable-avfilter --disable-network --disable-everything --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 --disable-avformat --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --cpu=cortex-a8 --extra-cflags='-mfpu=fpa'"
|
||||
#define FFMPEG_CONFIGURATION "--disable-mmx --prefix=/Users/jehanmonnier/opt --enable-cross-compile --arch=arm --target-os=linux --cc=arm-none-linux-gnueabi-gcc --disable-ffplay --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-avdevice --disable-avcore --disable-avfilter --disable-network --disable-everything --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 --disable-avformat --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --enable-pic --extra-cflags='-fPIC -march=armv7-a -mcpu=cortex-a8 -mfloat-abi=softfp -mfpu=neon'"
|
||||
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
|
||||
#define FFMPEG_DATADIR "/Users/jehanmonnier/opt/share/ffmpeg"
|
||||
#define CC_TYPE "gcc"
|
||||
#define CC_VERSION __VERSION__
|
||||
#define restrict
|
||||
#define restrict
|
||||
#define ASMALIGN(ZEROBITS) ".p2align " #ZEROBITS "\n\t"
|
||||
#define EXTERN_PREFIX ""
|
||||
#define EXTERN_ASM
|
||||
|
@ -37,19 +37,19 @@
|
|||
#define HAVE_ARMV5TE 1
|
||||
#define HAVE_ARMV6 1
|
||||
#define HAVE_ARMV6T2 1
|
||||
#define HAVE_ARMVFP 0
|
||||
#define HAVE_ARMVFP 1
|
||||
#define HAVE_IWMMXT 0
|
||||
#define HAVE_MMI 0
|
||||
#define HAVE_MMX 0
|
||||
#define HAVE_MMX2 0
|
||||
#define HAVE_NEON 0
|
||||
#define HAVE_NEON 1
|
||||
#define HAVE_PPC4XX 0
|
||||
#define HAVE_SSE 0
|
||||
#define HAVE_SSSE3 0
|
||||
#define HAVE_VIS 0
|
||||
#define HAVE_BIGENDIAN 0
|
||||
#define HAVE_FAST_UNALIGNED 1
|
||||
#define HAVE_PTHREADS 0
|
||||
#define HAVE_PTHREADS 1
|
||||
#define HAVE_W32THREADS 0
|
||||
#define HAVE_ALIGNED_STACK 0
|
||||
#define HAVE_ALSA_ASOUNDLIB_H 0
|
||||
|
@ -67,8 +67,8 @@
|
|||
#define HAVE_DEV_IC_BT8XX_H 0
|
||||
#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
|
||||
#define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
|
||||
#define HAVE_DLFCN_H 0
|
||||
#define HAVE_DLOPEN 0
|
||||
#define HAVE_DLFCN_H 1
|
||||
#define HAVE_DLOPEN 1
|
||||
#define HAVE_DOS_PATHS 0
|
||||
#define HAVE_EBP_AVAILABLE 0
|
||||
#define HAVE_EBX_AVAILABLE 0
|
||||
|
@ -78,23 +78,23 @@
|
|||
#define HAVE_FAST_CLZ 1
|
||||
#define HAVE_FAST_CMOV 0
|
||||
#define HAVE_FCNTL 1
|
||||
#define HAVE_FORK 0
|
||||
#define HAVE_GETADDRINFO 0
|
||||
#define HAVE_FORK 1
|
||||
#define HAVE_GETADDRINFO 1
|
||||
#define HAVE_GETHRTIME 0
|
||||
#define HAVE_GETPROCESSMEMORYINFO 0
|
||||
#define HAVE_GETPROCESSTIMES 0
|
||||
#define HAVE_GETRUSAGE 0
|
||||
#define HAVE_GETRUSAGE 1
|
||||
#define HAVE_GNU_AS 1
|
||||
#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 0
|
||||
#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
|
||||
#define HAVE_IBM_ASM 0
|
||||
#define HAVE_INET_ATON 0
|
||||
#define HAVE_INET_ATON 1
|
||||
#define HAVE_INLINE_ASM 1
|
||||
#define HAVE_ISATTY 1
|
||||
#define HAVE_LDBRX 0
|
||||
#define HAVE_LIBDC1394_1 0
|
||||
#define HAVE_LIBDC1394_2 0
|
||||
#define HAVE_LLRINT 0
|
||||
#define HAVE_LLRINTF 0
|
||||
#define HAVE_LLRINT 1
|
||||
#define HAVE_LLRINTF 1
|
||||
#define HAVE_LOCAL_ALIGNED_16 0
|
||||
#define HAVE_LOCAL_ALIGNED_8 0
|
||||
#define HAVE_LOG2 1
|
||||
|
@ -109,7 +109,7 @@
|
|||
#define HAVE_MEMALIGN 1
|
||||
#define HAVE_MKSTEMP 1
|
||||
#define HAVE_PLD 1
|
||||
#define HAVE_POSIX_MEMALIGN 0
|
||||
#define HAVE_POSIX_MEMALIGN 1
|
||||
#define HAVE_ROUND 1
|
||||
#define HAVE_ROUNDF 1
|
||||
#define HAVE_SDL 0
|
||||
|
@ -117,8 +117,8 @@
|
|||
#define HAVE_SETMODE 0
|
||||
#define HAVE_SOCKLEN_T 0
|
||||
#define HAVE_SOUNDCARD_H 0
|
||||
#define HAVE_POLL_H 0
|
||||
#define HAVE_SETRLIMIT 0
|
||||
#define HAVE_POLL_H 1
|
||||
#define HAVE_SETRLIMIT 1
|
||||
#define HAVE_STRERROR_R 1
|
||||
#define HAVE_STRTOK_R 1
|
||||
#define HAVE_STRUCT_ADDRINFO 0
|
||||
|
@ -129,16 +129,16 @@
|
|||
#define HAVE_SYMVER 1
|
||||
#define HAVE_SYMVER_GNU_ASM 1
|
||||
#define HAVE_SYMVER_ASM_LABEL 0
|
||||
#define HAVE_SYS_MMAN_H 0
|
||||
#define HAVE_SYS_MMAN_H 1
|
||||
#define HAVE_SYS_RESOURCE_H 1
|
||||
#define HAVE_SYS_SELECT_H 0
|
||||
#define HAVE_SYS_SOUNDCARD_H 0
|
||||
#define HAVE_SYS_SELECT_H 1
|
||||
#define HAVE_SYS_SOUNDCARD_H 1
|
||||
#define HAVE_SYS_VIDEOIO_H 0
|
||||
#define HAVE_TEN_OPERANDS 0
|
||||
#define HAVE_TERMIOS_H 0
|
||||
#define HAVE_THREADS 0
|
||||
#define HAVE_TERMIOS_H 1
|
||||
#define HAVE_THREADS 1
|
||||
#define HAVE_TRUNCF 1
|
||||
#define HAVE_VFP_ARGS 1
|
||||
#define HAVE_VFP_ARGS 0
|
||||
#define HAVE_VIRTUALALLOC 0
|
||||
#define HAVE_WINSOCK2_H 0
|
||||
#define HAVE_XFORM_ASM 0
|
||||
|
@ -163,7 +163,7 @@
|
|||
#define CONFIG_AVISYNTH 0
|
||||
#define CONFIG_BZLIB 0
|
||||
#define CONFIG_DCT 0
|
||||
#define CONFIG_DOC 1
|
||||
#define CONFIG_DOC 0
|
||||
#define CONFIG_DWT 0
|
||||
#define CONFIG_DXVA2 0
|
||||
#define CONFIG_FASTDIV 1
|
||||
|
@ -207,7 +207,7 @@
|
|||
#define CONFIG_MPEGAUDIO_HP 1
|
||||
#define CONFIG_NETWORK 0
|
||||
#define CONFIG_NONFREE 0
|
||||
#define CONFIG_PIC 0
|
||||
#define CONFIG_PIC 1
|
||||
#define CONFIG_POSTPROC 0
|
||||
#define CONFIG_RDFT 0
|
||||
#define CONFIG_RUNTIME_CPUDETECT 0
|
||||
|
@ -890,6 +890,7 @@
|
|||
#define CONFIG_ASPECT_FILTER 0
|
||||
#define CONFIG_BLACKFRAME_FILTER 0
|
||||
#define CONFIG_CROP_FILTER 0
|
||||
#define CONFIG_DRAWBOX_FILTER 0
|
||||
#define CONFIG_FIFO_FILTER 0
|
||||
#define CONFIG_FORMAT_FILTER 0
|
||||
#define CONFIG_FREI0R_FILTER 0
|
||||
|
|
Loading…
Reference in a new issue