Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix ffmpeg compil (runtime issue)

Browse source
This commit is contained in:
Sylvain Berfini 2014-11-07 15:16:57 +01:00
parent bba5b343da
commit 2fa62d4315
4 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

@ -119,9 +119,9 @@ prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c
#ffmpeg #ffmpeg
ifeq ($(BUILD_VIDEO),1) ifeq ($(BUILD_VIDEO),1)
BUILD_FFMPEG_DEPS=$(FFMPEG_SRC_DIR)/non_versioned_soname_patch_applied.txt $(FFMPEG_BUILD_DIR)/arm/libavcodec/libavcodec-linphone-arm.so BUILD_FFMPEG_DEPS=$(FFMPEG_SRC_DIR)/non_versioned_soname_patch_applied.txt $(FFMPEG_BUILD_DIR)/arm/libffmpeg-linphone-arm.so
ifeq ($(BUILD_FOR_X86), 1) ifeq ($(BUILD_FOR_X86), 1)
BUILD_FFMPEG_DEPS+=$(FFMPEG_BUILD_DIR)/x86/libavcodec/libavcodec-linphone-x86.so BUILD_FFMPEG_DEPS+=$(FFMPEG_BUILD_DIR)/x86/libffmpeg-linphone-x86.so
endif endif
endif endif
FFMPEG_SRC_DIR=$(TOPDIR)/submodules/externals/ffmpeg FFMPEG_SRC_DIR=$(TOPDIR)/submodules/externals/ffmpeg
@ -131,7 +131,7 @@ FFMPEG_CONFIGURE_OPTIONS=--target-os=linux --enable-cross-compile --enable-runti
--disable-avdevice --disable-avfilter --disable-avformat --disable-swresample --disable-network \ --disable-avdevice --disable-avfilter --disable-avformat --disable-swresample --disable-network \
--enable-decoder=mjpeg --enable-encoder=mjpeg --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 \ --enable-decoder=mjpeg --enable-encoder=mjpeg --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 \
--enable-decoder=h263p --enable-encoder=h263p --enable-decoder=h263 --enable-encoder=h263\ --enable-decoder=h263p --enable-encoder=h263p --enable-decoder=h263 --enable-encoder=h263\
--disable-static --enable-shared --disable-static --enable-shared --disable-symver
FFMPEG_ARM_CONFIGURE_OPTIONS=--build-suffix=-linphone-arm --arch=arm --sysroot=$(ARM_SYSROOT) --cross-prefix=$(ARM_TOOLCHAIN_PATH) --enable-pic FFMPEG_ARM_CONFIGURE_OPTIONS=--build-suffix=-linphone-arm --arch=arm --sysroot=$(ARM_SYSROOT) --cross-prefix=$(ARM_TOOLCHAIN_PATH) --enable-pic
FFMPEG_X86_CONFIGURE_OPTIONS=--build-suffix=-linphone-x86 --arch=x86 --sysroot=$(X86_SYSROOT) --cross-prefix=$(X86_TOOLCHAIN_PATH) --disable-mmx --disable-sse2 --disable-ssse3 --extra-cflags='-O3' FFMPEG_X86_CONFIGURE_OPTIONS=--build-suffix=-linphone-x86 --arch=x86 --sysroot=$(X86_SYSROOT) --cross-prefix=$(X86_TOOLCHAIN_PATH) --disable-mmx --disable-sse2 --disable-ssse3 --extra-cflags='-O3'
@ -151,6 +151,11 @@ $(FFMPEG_BUILD_DIR)/arm/libavcodec/libavcodec-linphone-arm.so: $(FFMPEG_BUILD_DI
make -j ${NUMCPUS} \ make -j ${NUMCPUS} \
|| ( echo "Build of ffmpeg for arm failed." ; exit 1 ) || ( echo "Build of ffmpeg for arm failed." ; exit 1 )
$(FFMPEG_BUILD_DIR)/arm/libffmpeg-linphone-arm.so: $(FFMPEG_BUILD_DIR)/arm/libavcodec/libavcodec-linphone-arm.so
cd $(FFMPEG_BUILD_DIR)/arm && \
rm libavcodec/log2_tab.o && \
$(ARM_TOOLCHAIN_PATH)gcc -lm -lz --sysroot=$(ARM_SYSROOT) -Wl,--no-undefined -Wl,-z,noexecstack -shared libavutil/*.o libavutil/arm/*.o libavcodec/*.o libavcodec/arm/*.o libswscale/*.o -o libffmpeg-linphone-arm.so
$(FFMPEG_BUILD_DIR)/x86/config.h: $(FFMPEG_BUILD_DIR)/x86/config.h:
mkdir -p $(FFMPEG_BUILD_DIR)/x86 && \ mkdir -p $(FFMPEG_BUILD_DIR)/x86 && \
cd $(FFMPEG_BUILD_DIR)/x86 && \ cd $(FFMPEG_BUILD_DIR)/x86 && \
@ -163,6 +168,11 @@ $(FFMPEG_BUILD_DIR)/x86/libavcodec/libavcodec-linphone-x86.so: $(FFMPEG_BUILD_DI
make -j ${NUMCPUS} \ make -j ${NUMCPUS} \
|| ( echo "Build of ffmpeg for x86 failed." ; exit 1 ) || ( echo "Build of ffmpeg for x86 failed." ; exit 1 )
$(FFMPEG_BUILD_DIR)/x86/libffmpeg-linphone-x86.so: $(FFMPEG_BUILD_DIR)/x86/libavcodec/libavcodec-linphone-x86.so
cd $(FFMPEG_BUILD_DIR)/x86 && \
rm libavcodec/log2_tab.o && \
$(X86_TOOLCHAIN_PATH)gcc -lm -lz --sysroot=$(X86_SYSROOT) -Wl,--no-undefined -Wl,-z,noexecstack -shared libavutil/*.o libavutil/x86/*.o libavcodec/*.o libavcodec/x86/*.o libswscale/*.o -o libffmpeg-linphone-x86.so
build-ffmpeg: $(BUILD_FFMPEG_DEPS) build-ffmpeg: $(BUILD_FFMPEG_DEPS)
clean-ffmpeg: clean-ffmpeg:

2
jni/Application.mk
View file

@ -57,7 +57,7 @@ endif
endif endif
ifeq ($(BUILD_VIDEO),1) ifeq ($(BUILD_VIDEO),1)
APP_MODULES += libavutil-linphone libavcodec-linphone libswscale-linphone APP_MODULES += libffmpeg-linphone
APP_MODULES += libvpx APP_MODULES += libvpx
ifeq ($(BUILD_X264),1) ifeq ($(BUILD_X264),1)
APP_MODULES +=libx264 libmsx264 APP_MODULES +=libx264 libmsx264

11
submodules/externals/build/ffmpeg/Android.mk vendored
View file

@ -1,3 +1,8 @@
include $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android_libavutil.mk LOCAL_PATH:= $(call my-dir)
include $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android_libavcodec.mk include $(CLEAR_VARS)
include $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android_libswscale.mk
LOCAL_MODULE := libffmpeg-linphone
LOCAL_MODULE_FILENAME := libffmpeg-linphone-$(TARGET_ARCH)
LOCAL_SRC_FILES := $(TARGET_ARCH)/libffmpeg-linphone-$(TARGET_ARCH).so
include $(PREBUILT_SHARED_LIBRARY)

2
submodules/linphone

@ -1 +1 @@
Subproject commit cc5ec63197fba457f66f1d589fc27dddd4e7ed0b Subproject commit 52312c0361290bab0c955f134e660ab44220ca85