mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-26 23:58:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update ffmpeg.

Browse source
This commit is contained in:
Ghislain MARY 2013-09-25 13:47:21 +02:00
parent 4c34a2c798
commit 677f187492
3 changed files with 10 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
build/android/Android-no-neon.mk
View file

@ -1,49 +0,0 @@
##
## Android.mk -Android build script-
##
##
## Copyright (C) 2010 Belledonne Communications, Grenoble, France
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
##
LOCAL_PATH:= $(call my-dir)/../../coreapi
include $(CLEAR_VARS)
ifeq ($(TARGET_ARCH), arm)
include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
ifeq ($(_BUILD_VIDEO),1)
LOCAL_SHARED_LIBRARIES += \
liblinavcodecnoneon \
liblinswscale \
liblinavcore \
liblinavutil
endif
endif
LOCAL_MODULE := liblinphonenoneon
ifeq ($(TARGET_ARCH_ABI),armeabi)
LOCAL_MODULE_FILENAME := liblinphonearmv5noneon
endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_MODULE_FILENAME := liblinphonearmv7noneon
endif
include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/cpufeatures)

13
build/android/Android.mk
View file

@ -27,19 +27,12 @@ include $(linphone-root-dir)/submodules/linphone/build/android/common.mk
ifeq ($(_BUILD_VIDEO),1)
LOCAL_SHARED_LIBRARIES += \
liblinavcodec \
liblinswscale \
liblinavcore \
liblinavutil
libavcodec-linphone \
libswscale-linphone \
libavutil-linphone
endif
LOCAL_MODULE := liblinphone
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_MODULE_FILENAME := liblinphonearmv7
endif
ifeq ($(TARGET_ARCH_ABI),x86)
LOCAL_MODULE_FILENAME := liblinphonex86
endif
include $(BUILD_SHARED_LIBRARY)

37
java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
View file

@ -39,22 +39,13 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
}
static {
// FFMPEG (audio/video)
loadOptionalLibrary("linavutil");
loadOptionalLibrary("linswscale");
loadOptionalLibrary("linavcore");
System.loadLibrary("neon");
if (!hasNeonInCpuFeatures()) {
boolean noNeonLibrariesLoaded = loadOptionalLibrary("linavcodecnoneon");
if (!noNeonLibrariesLoaded) {
loadOptionalLibrary("linavcodec");
}
} else {
loadOptionalLibrary("linavcodec");
}
// FFMPEG (audio/video)
loadOptionalLibrary("avutil-linphone");
loadOptionalLibrary("swscale-linphone");
loadOptionalLibrary("avcodec-linphone");
// OPENSSL (cryptography)
// lin prefix avoids collision with libs in /system/lib
loadOptionalLibrary("lincrypto");
@ -71,21 +62,7 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
loadOptionalLibrary("bcg729");
//Main library
if (isArmv7()) {
if (hasNeonInCpuFeatures()) {
Log.d("linphone", "armv7 liblinphone loaded");
System.loadLibrary("linphonearmv7");
} else {
Log.w("linphone", "No-neon armv7 liblinphone loaded");
System.loadLibrary("linphonearmv7noneon");
}
} else if (Version.isX86()) {
Log.d("linphone", "No-neon x86 liblinphone loaded");
System.loadLibrary("linphonex86");
} else {
Log.d("linphone", "No-neon armv5 liblinphone loaded");
System.loadLibrary("linphonearmv5noneon");
}
System.loadLibrary("linphone");
Version.dumpCapabilities();
}