From 373334fcce348290ae4f8503f45edfdb7255956f Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 26 Jul 2012 16:04:38 +0200 Subject: [PATCH 1/6] Fix ringtone issue --- src/org/linphone/LinphoneService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index 594baf803..6e395df19 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -539,12 +539,17 @@ public final class LinphoneService extends Service implements LinphoneServiceLis } public void onRingerPlayerCreated(MediaPlayer mRingerPlayer) { - String uriString = PreferenceManager.getDefaultSharedPreferences(this).getString(getString(R.string.pref_audio_ringtone), RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE).toString()); + String uriString = PreferenceManager.getDefaultSharedPreferences(this).getString(getString(R.string.pref_audio_ringtone), + android.provider.Settings.System.DEFAULT_RINGTONE_URI.toString()); try { - FileInputStream fis = new FileInputStream(uriString); - mRingerPlayer.setDataSource(fis.getFD()); + if (uriString.startsWith("content://")) { + mRingerPlayer.setDataSource(this, Uri.parse(uriString)); + } else { + FileInputStream fis = new FileInputStream(uriString); + mRingerPlayer.setDataSource(fis.getFD()); + } } catch (IOException e) { - Log.e(e, "cannot set ringtone"); + Log.e(e, "Cannot set ringtone"); } } From 23f34ea2927d6158150599ff018714155b14df38 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 30 Jul 2012 14:43:33 +0200 Subject: [PATCH 2/6] fix Makefile for mac os --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 87c875628..b0e24b05e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NDK_PATH=$(shell dirname `which ndk-build`) SDK_PATH=$(shell dirname `which android`) -NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo) +NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" ) TOPDIR=$(shell pwd) PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon) KEYSTORE=bc-android.keystore From 0d83c3b1caffd065e4dec58ba167cccab7973419 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 31 Jul 2012 09:58:24 +0200 Subject: [PATCH 3/6] add godaddy root ca --- res/raw/rootca.pem | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/res/raw/rootca.pem b/res/raw/rootca.pem index cb25772cd..16f4fe95b 100644 --- a/res/raw/rootca.pem +++ b/res/raw/rootca.pem @@ -3963,3 +3963,27 @@ IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ O+7ETPTsJ3xCwnR8gooJybQDJbw= -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh +MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE +YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3 +MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo +ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg +MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN +ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA +PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w +wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi +EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY +avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+ +YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE +sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h +/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5 +IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj +YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD +ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy +OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P +TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ +HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER +dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf +ReYNnyicsbkqWletNw+vHX/bvZ8= +-----END CERTIFICATE----- From 8ded3cd7cbc72af66abce775912b2854b4eea4b8 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 8 Aug 2012 09:48:53 +0200 Subject: [PATCH 4/6] Updated linphone --- src/org/linphone/core/LinphoneCoreImpl.java | 5 +++++ submodules/linphone | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java index 4a962e52e..c742ea313 100644 --- a/src/org/linphone/core/LinphoneCoreImpl.java +++ b/src/org/linphone/core/LinphoneCoreImpl.java @@ -729,4 +729,9 @@ class LinphoneCoreImpl implements LinphoneCore { public void refreshRegisters() { refreshRegisters(nativePtr); } + @Override + public String getVersion() { + // TODO Auto-generated method stub + return null; + } } diff --git a/submodules/linphone b/submodules/linphone index c4bf7958a..e93d9096f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c4bf7958ab6272155547c1f12e06189e1f84275c +Subproject commit e93d9096ff433d3195c177e4c767881406e71d88 From 180e0d9a785274fc8a63e7fb781a75501c2dfcab Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 9 Aug 2012 09:38:07 +0200 Subject: [PATCH 5/6] Fix compilation with updated linphone --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b0e24b05e..021137551 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ SDK_PATH=$(shell dirname `which android`) NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" ) TOPDIR=$(shell pwd) PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon) +LINPHONE_VERSION=$(shell grep -e '^.C_INIT' submodules/linphone/configure.ac | sed -e 's/.*linphone]\,\[//' |sed -e 's/\].*//' ) KEYSTORE=bc-android.keystore KEYALIAS=nw8000 @@ -48,7 +49,7 @@ prepare-mediastreamer2: prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2 generate-libs: - $(NDK_PATH)/ndk-build BUILD_SILK=1 -j$(NUMCPUS) + $(NDK_PATH)/ndk-build LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_SILK=1 BUILD_AMRNB=full -j$(NUMCPUS) update-project: $(SDK_PATH)/android update project --path . @@ -73,3 +74,4 @@ clean: ant clean .PHONY: clean + From 812c6a9302f0780c7c68de75ba95eac69206c9bc Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 29 Aug 2012 11:12:17 +0200 Subject: [PATCH 6/6] Added jpeg encoder for noneon ffmpeg --- submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk b/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk index 9e6687e1f..5c558ea3b 100755 --- a/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk +++ b/submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk @@ -70,6 +70,7 @@ LOCAL_SRC_FILES = \ libavcodec/jrevdct.c \ libavcodec/mjpeg.c.arm \ libavcodec/mjpegdec.c.arm \ + libavcodec/mjpegenc.c.arm \ libavcodec/motion_est.c.arm \ libavcodec/mpeg12data.c \ libavcodec/mpeg4video.c.arm \