From 64a23f9b67cab8aa0f4cac22211722d1fa9e3716 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 21 Oct 2011 16:02:52 +0200 Subject: [PATCH 1/4] add silk for IOS --- coreapi/linphonecore.c | 6 +++++- mediastreamer2 | 2 +- oRTP | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 7f706cc81..7e3a1f262 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -1043,7 +1043,11 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta linphone_core_assign_payload_type(lc,&payload_type_aal2_g726_24,-1,NULL); linphone_core_assign_payload_type(lc,&payload_type_aal2_g726_32,-1,NULL); linphone_core_assign_payload_type(lc,&payload_type_aal2_g726_40,-1,NULL); - + linphone_core_assign_payload_type(lc,&payload_type_silk_nb,-1,NULL); + linphone_core_assign_payload_type(lc,&payload_type_silk_mb,-1,NULL); + linphone_core_assign_payload_type(lc,&payload_type_silk_wb,-1,NULL); + linphone_core_assign_payload_type(lc,&payload_type_silk_swb,-1,NULL); + ms_init(); /* create a mediastreamer2 event queue and set it as global */ /* This allows to run event's callback in linphone_core_iterate() */ diff --git a/mediastreamer2 b/mediastreamer2 index 084ac9a21..f77b325c2 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 084ac9a21334d3f91d51666a36bf9f717741f23d +Subproject commit f77b325c2aa7068adaa5a0c7353b99056732ca48 diff --git a/oRTP b/oRTP index d1ca9b6c5..760620790 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit d1ca9b6c5fbcaafa59299dc1a5f790bb92dc4e6e +Subproject commit 7606207905bd3dc661e68576097adce471916697 From a85f334c663037f53f534907e1c357866f636cfe Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 21 Oct 2011 18:24:12 +0200 Subject: [PATCH 2/4] fix IOS build --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index f77b325c2..f87ab8a60 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit f77b325c2aa7068adaa5a0c7353b99056732ca48 +Subproject commit f87ab8a6003c6a9af7ebe9b5818c7e2c04b03a32 From 388ef155ae078d2423cb7d8fddb7529be000bc52 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 21 Oct 2011 23:09:52 +0200 Subject: [PATCH 3/4] update ms2 with fix for SILK under IOS --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index f87ab8a60..887ca16dd 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit f87ab8a6003c6a9af7ebe9b5818c7e2c04b03a32 +Subproject commit 887ca16ddda8e5f84d7c64d5decfd7f7c9b92b5d From 0fb206da3a4602e23d48579674a8210dccef2c4b Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Mon, 24 Oct 2011 10:47:51 +0200 Subject: [PATCH 4/4] More verbose traces on SAL call. --- coreapi/sal_eXosip2.c | 9 ++++++--- mediastreamer2 | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 03fec5b47..772997b6b 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -541,13 +541,16 @@ int sal_call_set_local_media_description(SalOp *h, SalMediaDescription *desc){ int sal_call(SalOp *h, const char *from, const char *to){ int err; + const char *route; osip_message_t *invite=NULL; sal_op_set_from(h,from); sal_op_set_to(h,to); sal_exosip_fix_route(h); - err=eXosip_call_build_initial_invite(&invite,to,from,sal_op_get_route(h),"Phone call"); + route = sal_op_get_route(h); + err=eXosip_call_build_initial_invite(&invite,to,from,route,"Phone call"); if (err!=0){ - ms_error("Could not create call."); + ms_error("Could not create call. Error %d (from=%s to=%s route=%s)", + err, from, to, route); return -1; } osip_message_set_allow(invite, "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO"); @@ -574,7 +577,7 @@ int sal_call(SalOp *h, const char *from, const char *to){ eXosip_unlock(); h->cid=err; if (err<0){ - ms_error("Fail to send invite !"); + ms_error("Fail to send invite ! Error code %d", err); return -1; }else{ sal_add_call(h->base.root,h); diff --git a/mediastreamer2 b/mediastreamer2 index 887ca16dd..061bf62cc 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 887ca16ddda8e5f84d7c64d5decfd7f7c9b92b5d +Subproject commit 061bf62cc0d3112b1003c5567230ae2b35e8910b