From 928e9717531c342ec38b00a66dd7fe1f77fd8909 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 20 Jun 2011 11:17:41 +0200 Subject: [PATCH 1/4] update ms2 --- coreapi/lsd.c | 1 - mediastreamer2 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/coreapi/lsd.c b/coreapi/lsd.c index 1ad7c7db4..f22a5b207 100644 --- a/coreapi/lsd.c +++ b/coreapi/lsd.c @@ -250,7 +250,6 @@ LinphoneSoundDaemon * linphone_sound_daemon_new(const char *cardname, int rate, lsd_player_init(&lsd->branches[0],mp,MS_ITC_SOURCE_ID,lsd); ms_filter_set_notify_callback(lsd->branches[0].player,(MSFilterNotifyFunc)lsd_player_configure,&lsd->branches[0]); - ms_filter_enable_synchronous_notifcations (lsd->branches[0].player,TRUE); for(i=1;ibranches[i],mp,MS_FILE_PLAYER_ID,lsd); diff --git a/mediastreamer2 b/mediastreamer2 index 07d1b02eb..1e18ab2f4 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 07d1b02eb57b7fc5cc8e4821c6485df2f138906e +Subproject commit 1e18ab2f4bf3ad6e8cac65b7bc9643ed3b80f455 From 541b186df248fea4b6de5fede96f369ed7c799c7 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 21 Jun 2011 16:18:20 +0200 Subject: [PATCH 2/4] don't add transport=UDP --- coreapi/sal_eXosip2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 42574dc8f..fd184a40f 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -835,7 +835,7 @@ void sal_op_cancel_authentication(SalOp *h) { static void set_network_origin(SalOp *op, osip_message_t *req){ const char *received=NULL; int rport=5060; - char origin[64]; + char origin[64]={0}; SalTransport transport; if (extract_received_rport(req,&received,&rport,&transport)!=0){ osip_via_t *via=NULL; @@ -1019,7 +1019,8 @@ static void update_contact_from_response(SalOp *op, osip_message_t *response){ char *tmp; sal_address_set_domain(addr,received); sal_address_set_port_int(addr,rport); - sal_address_set_transport(addr,transport); + if (transport!=SalTransportUDP) + sal_address_set_transport(addr,transport); tmp=sal_address_as_string(addr); ms_message("Contact address updated to %s",tmp); sal_op_set_contact(op,tmp); From c971007361d0ae52991e7f2bceead04ac23751b0 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 22 Jun 2011 12:26:41 +0200 Subject: [PATCH 3/4] rename up_ptime into upload_ptime --- coreapi/linphonecore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 651eca134..49a2601da 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -880,7 +880,7 @@ int linphone_core_get_download_ptime(LinphoneCore *lc) { * **/ void linphone_core_set_upload_ptime(LinphoneCore *lc, int ptime){ - lp_config_set_int(lc->config,"rtp","up_ptime",ptime); + lp_config_set_int(lc->config,"rtp","upload_ptime",ptime); } /** @@ -889,7 +889,7 @@ void linphone_core_set_upload_ptime(LinphoneCore *lc, int ptime){ * **/ int linphone_core_get_upload_ptime(LinphoneCore *lc){ - return lp_config_get_int(lc->config,"rtp","up_ptime",0); + return lp_config_get_int(lc->config,"rtp","upload_ptime",0); } From c8f4f8f296baa01f5839104327f1707626b7cf63 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 22 Jun 2011 13:06:13 +0200 Subject: [PATCH 4/4] add missing jni --- coreapi/linphonecore_jni.cc | 9 +++++++++ java/common/org/linphone/core/LinphoneCore.java | 12 ++++++++++++ 2 files changed, 21 insertions(+) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 2492e8f61..f858f8d17 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -1206,6 +1206,15 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDownloadBandwidth(JNI extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setUploadBandwidth(JNIEnv *env, jobject thiz, jlong lc, jint bw){ linphone_core_set_upload_bandwidth((LinphoneCore *)lc, (int) bw); } + +extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDownloadPtime(JNIEnv *env, jobject thiz, jlong lc, jint ptime){ + linphone_core_set_download_ptime((LinphoneCore *)lc, (int) ptime); +} + +extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setUploadPtime(JNIEnv *env, jobject thiz, jlong lc, jint ptime){ + linphone_core_set_upload_ptime((LinphoneCore *)lc, (int) ptime); +} + extern "C" int Java_org_linphone_core_LinphoneProxyConfigImpl_getState(JNIEnv* env,jobject thiz,jlong ptr) { return (int) linphone_proxy_config_get_state((const LinphoneProxyConfig *) ptr); } diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java index 1c7dd2ff9..4afe7182f 100644 --- a/java/common/org/linphone/core/LinphoneCore.java +++ b/java/common/org/linphone/core/LinphoneCore.java @@ -531,6 +531,18 @@ public interface LinphoneCore { void setUploadBandwidth(int bw); void setDownloadBandwidth(int bw); + + /** + * Sets audio packetization interval suggested for remote end. + * @param ptime packetization interval in milliseconds + */ + void setDownloadPtime(int ptime); + + /** + * Sets audio packetization interval sent to remote end. + * @param ptime packetization interval in milliseconds + */ + void setUploadPtime(int ptime); void setPreferredVideoSize(VideoSize vSize);