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

Improved opensles soundcard to keep Android 2.2 compatibility

Browse source
This commit is contained in:
Sylvain Berfini 2014-02-05 15:53:24 +01:00
parent ce7cbe756d
commit 35c57ff01b
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -63,7 +63,6 @@ BUILD_SQLITE=1
BUILD_CONTACT_HEADER=0 BUILD_CONTACT_HEADER=0
BUILD_RTP_MAP=0 BUILD_RTP_MAP=0
BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0 BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0
BUILD_OPENSLES_SOUNDCARD=1
# Checks # Checks
CHECK_MSG=$(shell ./check_tools.sh) CHECK_MSG=$(shell ./check_tools.sh)
@ -335,9 +334,7 @@ prepare-sources: build-ffmpeg build-x264 prepare-ilbc build-vpx prepare-silk pre
GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \ GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \
BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) \ BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) \
BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) \ BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) \
BUILD_UPNP=$(BUILD_UPNP) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC) \ BUILD_UPNP=$(BUILD_UPNP) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC)
BUILD_OPENSLES_SOUNDCARD=$(BUILD_OPENSLES_SOUNDCARD)
LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \ LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \
LINPHONE_VERSION=$(LINPHONE_VERSION) BELLESIP_VERSION=$(BELLESIP_VERSION) USE_JAVAH=$(USE_JAVAH) \ LINPHONE_VERSION=$(LINPHONE_VERSION) BELLESIP_VERSION=$(BELLESIP_VERSION) USE_JAVAH=$(USE_JAVAH) \

10
README
View file

@ -35,6 +35,12 @@ To create an apk with a different package name, you need to edit the custom_rule
If you encounter troubles with the make clean target and you are using the 8e android ndk, the solution can be found here: https://groups.google.com/forum/?fromgroups=#!topic/android-ndk/3wIbb-h3nDU If you encounter troubles with the make clean target and you are using the 8e android ndk, the solution can be found here: https://groups.google.com/forum/?fromgroups=#!topic/android-ndk/3wIbb-h3nDU
When using the ndk-r9b or ndk-r9c you may have an issue when compiling with x264. If so, use ndk-r9 instead. When using the ndk-r9b or ndk-r9c you may have an issue when compiling with x264. If so, use ndk-r9 instead.
If you built the app using eclipse, ensure you ran at least once the make command (see above steps 0 to 3) ! Else you'll have this exceptions:
FATAL EXCEPTION: main
java.lang.ExceptionInInitializerError
...
Caused by: java.lang.UnsatisfiedLinkError: Couldn't load linphone-armeabi-v7a: findLibrary returned null
...
CUSTOMIZATION CUSTOMIZATION
***************************** *****************************
@ -98,7 +104,3 @@ BUILD_OPUS
BUILD_UPNP BUILD_UPNP
values: 0 (don't build upnp), 1 (do build upnp), default value: 1 values: 0 (don't build upnp), 1 (do build upnp), default value: 1
BUILD_OPENSLES_SOUNDCARD
values: 0 (don't build ms2 opensles soundcard, requiered to be able to run the app on Android 2.2), 1 (do build ms2 opensles soundcard, used on Android >= 4.4 devices)
default value: 1

2
submodules/linphone

@ -1 +1 @@
Subproject commit 10b8224e38fec5895aec47b888f11c6a5f19f2b1 Subproject commit 1817c82f7cd91b090f915e775e2a6ff83dd514e1