From 94fdd26f225d63a2be2fb2bb1ef4e27275431ac7 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 28 Jun 2010 23:00:36 +0200 Subject: [PATCH 01/16] add msilbc for android armv7 --- build/android/Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/android/Android.mk b/build/android/Android.mk index e402eca74..47aec3448 100755 --- a/build/android/Android.mk +++ b/build/android/Android.mk @@ -77,7 +77,10 @@ LOCAL_STATIC_LIBRARIES := \ libeXosip2 \ libosip2 \ libgsm -# libmsilbc \ +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) + LOCAL_CFLAGS += -DHAVE_ILBC=1 + LOCAL_STATIC_LIBRARIES += libmsilbc +endif LOCAL_MODULE_CLASS = SHARED_LIBRARIES include $(BUILD_SHARED_LIBRARY) From 27de7063632c0f13183203582fba85de5ca465b1 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 29 Jun 2010 11:25:09 +0200 Subject: [PATCH 02/16] fix unused fmtp when receiving sdp answer --- coreapi/offeranswer.c | 4 ++-- mediastreamer2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coreapi/offeranswer.c b/coreapi/offeranswer.c index 2abf7174d..d69a22ddd 100644 --- a/coreapi/offeranswer.c +++ b/coreapi/offeranswer.c @@ -59,8 +59,8 @@ static MSList *match_payloads(const MSList *local, const MSList *remote){ matched=find_payload_type_best_match(local,p2); if (matched){ matched=payload_type_clone(matched); - if (p2->recv_fmtp) - payload_type_set_send_fmtp(matched,p2->recv_fmtp); + if (p2->send_fmtp) + payload_type_set_send_fmtp(matched,p2->send_fmtp); res=ms_list_append(res,matched); payload_type_set_number(matched,payload_type_get_number(p2)); }else{ diff --git a/mediastreamer2 b/mediastreamer2 index b6b2f3006..83533eea4 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit b6b2f3006fd2d4331be838fdb34e363f0ea8eed5 +Subproject commit 83533eea4df856c55b54dfa8afcb96dde93c05f9 From 754c5bb6891a8ce16ba7877c1a2fbcccab7c7534 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 30 Jun 2010 09:51:47 +0200 Subject: [PATCH 03/16] add ilbc to android --- coreapi/linphonecore_jni.cc | 4 +++- mediastreamer2 | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 3a5511a00..958170e24 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -161,9 +161,11 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv* LinphoneCoreData* ldata = new LinphoneCoreData(env,thiz,jlistener,juserdata); #ifdef ANDROID ms_andsnd_register_card(jvm); - // requires an fpu libmsilbc_init(); #endif /*ANDROID*/ +#ifdef HAVE_ILBC + libmsilbc_init(); // requires an fpu +#endif jlong nativePtr = (jlong)linphone_core_new( &ldata->vTable ,userConfig ,factoryConfig diff --git a/mediastreamer2 b/mediastreamer2 index 5267b9b3e..adc5516c1 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 5267b9b3e66519a17d75735e65ae0534ebfe3ff1 +Subproject commit adc5516c11707314ae5e17bb5fcd32373710f510 From 8d869f704ffd9d8456478853bf107d39d513dcb5 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 30 Jun 2010 10:33:58 +0200 Subject: [PATCH 04/16] update ms2 --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index adc5516c1..fb5609804 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit adc5516c11707314ae5e17bb5fcd32373710f510 +Subproject commit fb5609804eb8baf4bb55550230e3aa2b18e57d19 From 26913d3cd5d6cb0fc0fcc204aba46c6bb2254429 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 30 Jun 2010 11:07:07 +0200 Subject: [PATCH 05/16] update ms2 Conflicts: mediastreamer2 --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 83533eea4..fe1b42af3 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 83533eea4df856c55b54dfa8afcb96dde93c05f9 +Subproject commit fe1b42af3dc102d873fb77ecd72dfc96c3771d2a From ab5503fca8ef3932bb5211396893012c9ef4ef6d Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 30 Jun 2010 12:09:48 +0200 Subject: [PATCH 06/16] add missing sip: for routes --- coreapi/proxy.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/coreapi/proxy.c b/coreapi/proxy.c index 59d767303..4d31f5071 100644 --- a/coreapi/proxy.c +++ b/coreapi/proxy.c @@ -167,7 +167,12 @@ int linphone_proxy_config_set_route(LinphoneProxyConfig *obj, const char *route) ms_free(obj->reg_route); obj->reg_route=NULL; } - obj->reg_route=ms_strdup(route); + if (route!=NULL){ + /*try to prepend 'sip:' */ + if (strstr(route,"sip:")==NULL){ + obj->reg_route=ms_strdup_printf("sip:%s",route); + }else obj->reg_route=ms_strdup(route); + } return 0; } From ca0cf4725e8b71e9d4f70ee9f559020d93273e6b Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 30 Jun 2010 12:40:07 +0200 Subject: [PATCH 07/16] add a [sound] dc_removal property item to enable DC removal on mic->rtp MSVolume --- coreapi/linphonecore.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 2de23d239..121b32924 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -2246,6 +2246,7 @@ static void post_configure_audio_streams(LinphoneCore *lc){ float recv_gain; float ng_thres=lp_config_get_float(lc->config,"sound","ng_thres",0.05); float ng_floorgain=lp_config_get_float(lc->config,"sound","ng_floorgain",0); + int dc_removal=lp_config_get_int(lc->config,"sound","dc_removal",0); if (mic_gain!=-1) audio_stream_set_mic_gain(st,mic_gain); @@ -2255,6 +2256,9 @@ static void post_configure_audio_streams(LinphoneCore *lc){ if (recv_gain != 0) { linphone_core_set_playback_gain_db (lc,recv_gain); } + if (st->volsend){ + ms_filter_call_method(st->volsend,MS_VOLUME_REMOVE_DC,&dc_removal); + } if (linphone_core_echo_limiter_enabled(lc)){ float speed=lp_config_get_float(lc->config,"sound","el_speed",-1); thres=lp_config_get_float(lc->config,"sound","el_thres",-1); From 32eba752db302854c5c22af738a8568c80fafc3c Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 1 Jul 2010 14:30:38 +0200 Subject: [PATCH 08/16] ready for release ? --- NEWS | 2 +- mediastreamer2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 68bbd71fa..169f91adc 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -linphone-3.3.2 -- June 25, 2010 +linphone-3.3.2 -- July 1st, 2010 * fix crash when setting firewall address in gtk interface * fix crash while closing video window on windows * fix un-sent BYE message in some rare cases. diff --git a/mediastreamer2 b/mediastreamer2 index fe1b42af3..382ebd73c 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit fe1b42af3dc102d873fb77ecd72dfc96c3771d2a +Subproject commit 382ebd73ca41d70834ee07e7eb6fa5cced6b3ce1 From 0f6e5b355cb45695c86a5a26134a690173972783 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 1 Jul 2010 17:15:47 +0200 Subject: [PATCH 09/16] bugfix in mediastreamer2 --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 382ebd73c..c80d82259 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 382ebd73ca41d70834ee07e7eb6fa5cced6b3ce1 +Subproject commit c80d82259504474f8742577d2e0ebb1c58f589b4 From dc959b97bd1447d5b434922e7d6822d0d0163966 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 6 Jul 2010 11:37:38 +0200 Subject: [PATCH 10/16] improve a bit processing of errors --- coreapi/callbacks.c | 10 ++++++---- mediastreamer2 | 2 +- po/POTFILES.in | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index 531f4542e..6833fba82 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -271,7 +271,7 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de /*char *retrymsg=_("%s. Retry after %i minute(s).");*/ char *msg600=_("User does not want to be disturbed."); char *msg603=_("Call declined."); - char *msg=(char*)details; + const char *msg=details; LinphoneCall *call=lc->call; if (sal_op_get_user_pointer(op)!=lc->call){ @@ -281,11 +281,13 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de if (lc->vtable.show) lc->vtable.show(lc); if (error==SalErrorNoResponse){ + msg=_("No response."); if (lc->vtable.display_status) - lc->vtable.display_status(lc,_("No response.")); + lc->vtable.display_status(lc,msg); }else if (error==SalErrorProtocol){ + msg=details ? details : _("Protocol error."); if (lc->vtable.display_status) - lc->vtable.display_status(lc, details ? details : _("Protocol error.")); + lc->vtable.display_status(lc, msg); }else if (error==SalErrorFailure){ switch(sr){ case SalReasonDeclined: @@ -336,7 +338,7 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de if (call!=NULL) { linphone_call_destroy(call); if (sr!=SalReasonDeclined) gstate_new_state(lc, GSTATE_CALL_ERROR, msg); - else gstate_new_state(lc, GSTATE_CALL_END, NULL); + else gstate_new_state(lc, GSTATE_CALL_END, msg); lc->call=NULL; } } diff --git a/mediastreamer2 b/mediastreamer2 index c80d82259..44d29b3dc 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit c80d82259504474f8742577d2e0ebb1c58f589b4 +Subproject commit 44d29b3dcc1261f9999dfd6d02f86ccee0a18873 diff --git a/po/POTFILES.in b/po/POTFILES.in index 2ca5440ea..2b0f2734f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -71,4 +71,4 @@ mediastreamer2/src/drawdib-display.c mediastreamer2/src/audiomixer.c mediastreamer2/src/chanadapt.c mediastreamer2/src/itc.c - +mediastreamer2/src/extdisplay.c From 61677ff44a00aa7cf4760a6faa34177e4faf4387 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 6 Jul 2010 12:49:41 +0200 Subject: [PATCH 11/16] print error message instead of (null) --- coreapi/linphonecore_jni.cc | 5 +++-- java/common/org/linphone/core/LinphoneCoreListener.java | 3 ++- mediastreamer2 | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 958170e24..fcf3cc1ce 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -83,7 +83,7 @@ public: /*displayStatus(LinphoneCore lc,String message);*/ displayStatusId = env->GetMethodID(listernerClass,"displayStatus","(Lorg/linphone/core/LinphoneCore;Ljava/lang/String;)V"); /*void generalState(LinphoneCore lc,int state); */ - generalStateId = env->GetMethodID(listernerClass,"generalState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$GeneralState;)V"); + generalStateId = env->GetMethodID(listernerClass,"generalState","(Lorg/linphone/core/LinphoneCore;Lorg/linphone/core/LinphoneCore$GeneralState;Ljava/lang/String;)V"); generalStateClass = (jclass)env->NewGlobalRef(env->FindClass("org/linphone/core/LinphoneCore$GeneralState")); generalStateFromIntId = env->GetStaticMethodID(generalStateClass,"fromInt","(I)Lorg/linphone/core/LinphoneCore$GeneralState;"); @@ -145,7 +145,8 @@ public: env->CallVoidMethod(lcData->listener ,lcData->generalStateId ,lcData->core - ,env->CallStaticObjectMethod(lcData->generalStateClass,lcData->generalStateFromIntId,gstate->new_state)); + ,env->CallStaticObjectMethod(lcData->generalStateClass,lcData->generalStateFromIntId,gstate->new_state), + gstate->message ? env->NewStringUTF(gstate->message) : NULL); } }; diff --git a/java/common/org/linphone/core/LinphoneCoreListener.java b/java/common/org/linphone/core/LinphoneCoreListener.java index f48f8a9eb..be75b946d 100644 --- a/java/common/org/linphone/core/LinphoneCoreListener.java +++ b/java/common/org/linphone/core/LinphoneCoreListener.java @@ -47,5 +47,6 @@ public interface LinphoneCoreListener { * @param state LinphoneCore.GeneralState * @return * */ - public void generalState(LinphoneCore lc,LinphoneCore.GeneralState state); + public void generalState(LinphoneCore lc,LinphoneCore.GeneralState state, String message); } + diff --git a/mediastreamer2 b/mediastreamer2 index 44d29b3dc..7a8923072 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 44d29b3dcc1261f9999dfd6d02f86ccee0a18873 +Subproject commit 7a8923072b42246db45d122798f2ab62e2f46bd0 From 8b565ff7f31e9ae43142771574fd0d68dbbb93cd Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Jul 2010 15:46:41 +0200 Subject: [PATCH 12/16] update ortp --- oRTP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oRTP b/oRTP index 18eccd4f3..d4868b641 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 18eccd4f3af64f3bd5293d635a1a169dc77c92ad +Subproject commit d4868b64141773b38ba6e8afe3a371fa57525b2b From f71d25264952373c9115604d8d3df9e276f1ae40 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 9 Jul 2010 12:20:29 +0200 Subject: [PATCH 13/16] update ms2 --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 7a8923072..429baf423 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 7a8923072b42246db45d122798f2ab62e2f46bd0 +Subproject commit 429baf423f2db8673ffa98f7f7d6cbac0c23bde9 From 62dcb3e9da5656d79a09d4a9807d83994832c2a7 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Sun, 11 Jul 2010 16:38:04 +0200 Subject: [PATCH 14/16] add history.png to delivery list --- pixmaps/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 6247f4d27..bf2f03a8c 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -10,7 +10,7 @@ status-green.png \ status-orange.png \ status-red.png \ status-offline.png \ -contact-orange.png dialer-orange.png \ +contact-orange.png dialer-orange.png history-orange.png\ startcall-green.png stopcall-red.png EXTRA_DIST=$(pixmap_DATA) From 527fdcbda6ea79d874ff13d5e38a341e71b6fe08 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 16 Jul 2010 15:31:17 +0200 Subject: [PATCH 15/16] add sip: when required to server address --- coreapi/proxy.c | 18 ++++++++---------- mediastreamer2 | 2 +- oRTP | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/coreapi/proxy.c b/coreapi/proxy.c index 4d31f5071..154ae06a2 100644 --- a/coreapi/proxy.c +++ b/coreapi/proxy.c @@ -90,22 +90,20 @@ bool_t linphone_proxy_config_is_registered(const LinphoneProxyConfig *obj){ * - hostnames : sip:sip.example.net **/ int linphone_proxy_config_set_server_addr(LinphoneProxyConfig *obj, const char *server_addr){ - LinphoneAddress *addr; - char *try=NULL; + LinphoneAddress *addr=NULL; + char *modified=NULL; if (obj->reg_proxy!=NULL) ms_free(obj->reg_proxy); obj->reg_proxy=NULL; if (server_addr!=NULL && strlen(server_addr)>0){ - addr=linphone_address_new(server_addr); - if (!addr){ - /*try to prepend 'sip:' */ - if (strstr(server_addr,"sip:")==NULL){ - try=ms_strdup_printf("sip:%s",server_addr); - addr=linphone_address_new(try); - ms_free(try); - } + if (strstr(server_addr,"sip:")==NULL){ + modified=ms_strdup_printf("sip:%s",server_addr); + addr=linphone_address_new(modified); + ms_free(modified); } + if (addr==NULL) + addr=linphone_address_new(server_addr); if (addr){ obj->reg_proxy=linphone_address_as_string_uri_only(addr); linphone_address_destroy(addr); diff --git a/mediastreamer2 b/mediastreamer2 index 429baf423..df9cac524 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 429baf423f2db8673ffa98f7f7d6cbac0c23bde9 +Subproject commit df9cac524bbe77240127630fa5d253b19c8fdae7 diff --git a/oRTP b/oRTP index d4868b641..a8076d948 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit d4868b64141773b38ba6e8afe3a371fa57525b2b +Subproject commit a8076d9487ee91d89df221256e0d3371e0fa3f50 From 3e8f9536eeea2e607e7612928f9ca7658bd2ffc4 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Sun, 18 Jul 2010 22:06:58 +0200 Subject: [PATCH 16/16] add mediastreamer2 with iPhone iounit --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index df9cac524..c6d39ca3e 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit df9cac524bbe77240127630fa5d253b19c8fdae7 +Subproject commit c6d39ca3e664ad89a8c437f630817334ada056ca