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

Updated libs compilation

Browse source
This commit is contained in:
Sylvain Berfini 2012-05-23 17:38:16 +02:00
parent 1b1409c18f
commit 5afbeec92b
7 changed files with 17 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,22 +40,16 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
static { static {
// FFMPEG (audio/video) // FFMPEG (audio/video)
if (!hasNeonInCpuFeatures()) {
boolean noNeonLibrariesLoaded = true;
noNeonLibrariesLoaded = noNeonLibrariesLoaded && loadOptionalLibrary("avutilnoneon");
noNeonLibrariesLoaded = noNeonLibrariesLoaded && loadOptionalLibrary("swscalenoneon");
noNeonLibrariesLoaded = noNeonLibrariesLoaded && loadOptionalLibrary("avcorenoneon");
noNeonLibrariesLoaded = noNeonLibrariesLoaded && loadOptionalLibrary("avcodecnoneon");
if (!noNeonLibrariesLoaded) {
loadOptionalLibrary("avutil"); loadOptionalLibrary("avutil");
loadOptionalLibrary("swscale"); loadOptionalLibrary("swscale");
loadOptionalLibrary("avcore"); loadOptionalLibrary("avcore");
if (!hasNeonInCpuFeatures()) {
boolean noNeonLibrariesLoaded = loadOptionalLibrary("avcodecnoneon");
if (!noNeonLibrariesLoaded) {
loadOptionalLibrary("avcodec"); loadOptionalLibrary("avcodec");
} }
} else { } else {
loadOptionalLibrary("avutil");
loadOptionalLibrary("swscale");
loadOptionalLibrary("avcore");
loadOptionalLibrary("avcodec"); loadOptionalLibrary("avcodec");
} }
@ -77,7 +71,11 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
//Main library //Main library
if (!hasNeonInCpuFeatures()) { if (!hasNeonInCpuFeatures()) {
try { try {
if (isArmv5()) {
System.loadLibrary("linphonearmv5");
} else {
System.loadLibrary("linphonenoneon"); System.loadLibrary("linphonenoneon");
}
Log.w("linphone", "No-neon liblinphone loaded"); Log.w("linphone", "No-neon liblinphone loaded");
} catch (UnsatisfiedLinkError ule) { } catch (UnsatisfiedLinkError ule) {
Log.w("linphone", "Failed to load no-neon liblinphone, loading neon liblinphone"); Log.w("linphone", "Failed to load no-neon liblinphone, loading neon liblinphone");
@ -176,4 +174,9 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
} }
return result; return result;
} }
public static boolean isArmv5()
{
return System.getProperty("os.arch").contains("armv5");
}
} }

3
submodules/externals/build/ffmpeg-no-neon/Android.mk vendored
View file

@ -1,4 +1 @@
include $(linphone-root-dir)/submodules/externals/build/ffmpeg-no-neon/Android_libavutil.mk
include $(linphone-root-dir)/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk include $(linphone-root-dir)/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk
include $(linphone-root-dir)/submodules/externals/build/ffmpeg-no-neon/Android_libswscale.mk
include $(linphone-root-dir)/submodules/externals/build/ffmpeg-no-neon/Android_libavcore.mk

2
submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk vendored
View file

@ -103,7 +103,7 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/ \ $(LOCAL_PATH)/ \
$(LOCAL_PATH)/libavutil $(LOCAL_PATH)/libavutil
LOCAL_SHARED_LIBRARIES := libavutilnoneon libavcorenoneon LOCAL_SHARED_LIBRARIES := libavutil libavcore
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

27
submodules/externals/build/ffmpeg-no-neon/Android_libavcore.mk vendored
View file

@ -1,27 +0,0 @@
LOCAL_PATH:= $(call my-dir)/../../ffmpeg/
include $(CLEAR_VARS)
LOCAL_MODULE := libavcorenoneon
LOCAL_SRC_FILES := \
libavcore/imgutils.c \
libavcore/parseutils.c \
libavcore/utils.c
# libavcore/samplefmt.c \
# libavcore/audioconvert.c
LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
#for including config.h:
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg-no-neon $(LOCAL_PATH)/
LOCAL_SHARED_LIBRARIES := libavutilnoneon
include $(BUILD_SHARED_LIBRARY)

45
submodules/externals/build/ffmpeg-no-neon/Android_libavutil.mk vendored
View file

@ -1,45 +0,0 @@
LOCAL_PATH:= $(call my-dir)/../../ffmpeg/
include $(CLEAR_VARS)
LOCAL_MODULE := libavutilnoneon
LOCAL_SRC_FILES = \
libavutil/adler32.c \
libavutil/aes.c \
libavutil/arm/cpu.c \
libavutil/avstring.c \
libavutil/base64.c \
libavutil/cpu.c \
libavutil/crc.c \
libavutil/des.c \
libavutil/error.c \
libavutil/eval.c \
libavutil/fifo.c \
libavutil/intfloat_readwrite.c \
libavutil/inverse.c \
libavutil/lfg.c \
libavutil/lls.c \
libavutil/log.c \
libavutil/lzo.c \
libavutil/mathematics.c \
libavutil/md5.c \
libavutil/mem.c \
libavutil/opt.c \
libavutil/pixdesc.c \
libavutil/random_seed.c \
libavutil/rational.c \
libavutil/rc4.c \
libavutil/sha.c \
libavutil/tree.c \
libavutil/utils.c
LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
LOCAL_ARM_MODE := arm
#for including config.h:
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg-no-neon $(LOCAL_PATH)/
include $(BUILD_SHARED_LIBRARY)

26
submodules/externals/build/ffmpeg-no-neon/Android_libswscale.mk vendored
View file

@ -1,26 +0,0 @@
##lib swcale###################
LOCAL_PATH:= $(call my-dir)/../../ffmpeg/libswscale/
include $(CLEAR_VARS)
LOCAL_MODULE := libswscalenoneon
LOCAL_SRC_FILES = \
options.c \
rgb2rgb.c \
swscale.c \
utils.c \
yuv2rgb.c
LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
LOCAL_ARM_MODE := arm
#for including config.h:
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../build/ffmpeg-no-neon \
$(LOCAL_PATH)/ \
$(LOCAL_PATH)/../
LOCAL_SHARED_LIBRARIES := libavutilnoneon
include $(BUILD_SHARED_LIBRARY)

2
submodules/linphone

@ -1 +1 @@
Subproject commit c6a6de60dbab77fbf6246551f36858df63daade6 Subproject commit e44d9f334f949f60d0692cdf433a2f6c2d722275