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

ffmpeg as shared library.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-03-28 15:59:55 +02:00
parent 3c4c8457d6
commit 5d762a8c61
5 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/org/linphone/core/LinphoneCoreFactoryImpl.java
View file

@ -21,9 +21,25 @@ package org.linphone.core;
import java.io.File;
import java.io.IOException;
import org.linphone.LinphoneManager;
import android.util.Log;
public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
private static void loadOptionalLibrary(String s) {
try {
System.loadLibrary(s);
} catch (Throwable e) {
Log.w(LinphoneManager.TAG, "Unable to load optional library lib" + s);
}
}
static {
loadOptionalLibrary("avutil");
loadOptionalLibrary("swscale");
loadOptionalLibrary("avcore");
loadOptionalLibrary("avcodec");
System.loadLibrary("linphone");
}
@Override

7
submodules/externals/build/ffmpeg/Android_libavcodec.mk vendored
View file

@ -16,6 +16,7 @@ LOCAL_SRC_FILES = \
libavcodec/arm/dsputil_neon.S.neon \
libavcodec/arm/dsputil_vfp.S.neon \
libavcodec/arm/fft_init_arm.c \
libavcodec/arm/fft_neon.S.neon \
libavcodec/arm/h264dsp_init_arm.c \
libavcodec/arm/h264dsp_neon.S.neon \
libavcodec/arm/h264idct_neon.S.neon \
@ -23,6 +24,7 @@ LOCAL_SRC_FILES = \
libavcodec/arm/h264pred_neon.S.neon \
libavcodec/arm/int_neon.S.neon \
libavcodec/arm/jrevdct_arm.S \
libavcodec/arm/mdct_neon.S.neon \
libavcodec/arm/mpegvideo_arm.c \
libavcodec/arm/mpegvideo_armv5te.c \
libavcodec/arm/mpegvideo_armv5te_s.S \
@ -42,6 +44,7 @@ LOCAL_SRC_FILES = \
libavcodec/faanidct.c \
libavcodec/flvdec.c \
libavcodec/flvenc.c \
libavcodec/fft.c \
libavcodec/golomb.c \
libavcodec/h263.c.arm \
libavcodec/h263_parser.c \
@ -99,5 +102,7 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/libavutil
include $(BUILD_STATIC_LIBRARY)
LOCAL_SHARED_LIBRARIES := libavutil libavcore
include $(BUILD_SHARED_LIBRARY)

5
submodules/externals/build/ffmpeg/Android_libavcore.mk vendored
View file

@ -20,5 +20,8 @@ LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
#for including config.h:
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg $(LOCAL_PATH)/
include $(BUILD_STATIC_LIBRARY)
LOCAL_SHARED_LIBRARIES := libavutil
include $(BUILD_SHARED_LIBRARY)

2
submodules/externals/build/ffmpeg/Android_libavutil.mk vendored
View file

@ -41,5 +41,5 @@ LOCAL_ARM_MODE := arm
#for including config.h:
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg $(LOCAL_PATH)/
include $(BUILD_STATIC_LIBRARY)
include $(BUILD_SHARED_LIBRARY)

4
submodules/externals/build/ffmpeg/Android_libswscale.mk vendored
View file

@ -20,5 +20,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../build/ffmpeg \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/../
include $(BUILD_STATIC_LIBRARY)
LOCAL_SHARED_LIBRARIES := libavutil
include $(BUILD_SHARED_LIBRARY)