From 574f492441002911b7d0f8a44df7a42d2cf233b8 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 20 May 2010 12:10:50 +0200 Subject: [PATCH 1/4] add support for retrieving RTP statistics. --- coreapi/linphonecore.c | 39 +++++++++++++++++++++++++++++++++++++++ coreapi/linphonecore.h | 6 ++++++ 2 files changed, 45 insertions(+) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 3d5cb9a4e..5b4016ffe 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -379,6 +379,23 @@ char * linphone_call_log_to_str(LinphoneCallLog *cl){ return tmp; } +/** + * Returns RTP statistics computed locally regarding the call. + * +**/ +const rtp_stats_t *linphone_call_log_get_local_stats(const LinphoneCallLog *cl){ + return &cl->local_stats; +} + +/** + * Returns RTP statistics computed by remote end and sent back via RTCP. + * + * @note Not implemented yet. +**/ +const rtp_stats_t *linphone_call_log_get_remote_stats(const LinphoneCallLog *cl){ + return &cl->remote_stats; +} + void linphone_call_log_set_user_pointer(LinphoneCallLog *cl, void *up){ cl->user_pointer=up; } @@ -3354,6 +3371,28 @@ void linphone_core_set_audio_transports(LinphoneCore *lc, RtpTransport *rtp, Rtp lc->a_rtcp=rtcp; } +/** + * Retrieve RTP statistics regarding current call. + * @param local RTP statistics computed locally. + * @param remote RTP statistics computed by far end (obtained via RTCP feedback). + * + * @note Remote RTP statistics is not implemented yet. + * + * @returns 0 or -1 if no call is running. +**/ + +int linphone_core_get_current_call_stats(LinphoneCore *lc, rtp_stats_t *local, rtp_stats_t *remote){ + LinphoneCall *call=linphone_core_get_current_call (lc); + if (call!=NULL){ + if (lc->audiostream!=NULL){ + memset(remote,0,sizeof(*remote)); + audio_stream_get_local_rtp_stats (lc->audiostream,local); + return 0; + } + } + return -1; +} + void net_config_uninit(LinphoneCore *lc) { net_config_t *config=&lc->net_conf; diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 945ea25ea..a19f1f7b3 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -127,6 +127,8 @@ typedef struct _LinphoneCallLog{ int duration; /** Date: Thu, 20 May 2010 12:11:49 +0200 Subject: [PATCH 2/4] update mediastreamer --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 049945684..57896d513 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 049945684790ca2651ed3cefa80abdf81ba5587e +Subproject commit 57896d513f6fbf41fde3c777931ebc744e53e366 From ff1bcf922596183432a5599f14cccbcbdd13cb1b Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 20 May 2010 15:01:54 +0200 Subject: [PATCH 3/4] set RTP stats at end of call --- coreapi/linphonecore.c | 5 +++++ oRTP | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 5b4016ffe..f62449e62 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -2316,8 +2316,13 @@ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){ lc->call->state=LCStateAVRunning; } +static void linphone_call_log_fill_stats(LinphoneCallLog *log, AudioStream *st){ + audio_stream_get_local_rtp_stats (st,&log->local_stats); +} + void linphone_core_stop_media_streams(LinphoneCore *lc, LinphoneCall *call){ if (lc->audiostream!=NULL) { + linphone_call_log_fill_stats (call->log,lc->audiostream); audio_stream_stop(lc->audiostream); lc->audiostream=NULL; } diff --git a/oRTP b/oRTP index a80e7b594..4ad63e9a1 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit a80e7b5949e64ec01d4149d5e0f56c9843df35b0 +Subproject commit 4ad63e9a106aee8d9dfb675aa0532962f322609c From b5497652f2f970174464bfd3e7dbde440d16b8a5 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 21 May 2010 12:19:12 +0200 Subject: [PATCH 4/4] automatically surround displayname without quotes, to allow users to use non ascii characters. --- coreapi/address.c | 8 ++++++++ coreapi/linphonecore.h | 3 ++- coreapi/sal.h | 1 + coreapi/sal_eXosip2.c | 29 +++++++++++++++++++++++++++-- gtk-glade/friendlist.c | 8 +++++--- gtk-glade/incall_view.c | 13 +++++-------- gtk-glade/main.c | 2 +- gtk-glade/propertybox.c | 7 +++++-- 8 files changed, 54 insertions(+), 17 deletions(-) diff --git a/coreapi/address.c b/coreapi/address.c index 1d893aede..f8051318c 100644 --- a/coreapi/address.c +++ b/coreapi/address.c @@ -57,6 +57,14 @@ const char *linphone_address_get_display_name(const LinphoneAddress* u){ return sal_address_get_display_name(u); } +/** + * Returns the display name without quotes. + * @note WARNING: the returned string must be freed by user. +**/ +char *linphone_address_get_display_name_unquoted(const LinphoneAddress *addr){ + return sal_address_get_display_name_unquoted(addr); +} + /** * Returns the username. **/ diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index a19f1f7b3..39606ae35 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -1,6 +1,6 @@ /* linphone -Copyright (C) 2000 Simon MORLAT (simon.morlat@linphone.org) +Copyright (C) 2000 - 2010 Simon MORLAT (simon.morlat@linphone.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -64,6 +64,7 @@ LinphoneAddress * linphone_address_new(const char *uri); LinphoneAddress * linphone_address_clone(const LinphoneAddress *uri); const char *linphone_address_get_scheme(const LinphoneAddress *u); const char *linphone_address_get_display_name(const LinphoneAddress* u); +char *linphone_address_get_display_name_unquoted(const LinphoneAddress *u); const char *linphone_address_get_username(const LinphoneAddress *u); const char *linphone_address_get_domain(const LinphoneAddress *u); void linphone_address_set_display_name(LinphoneAddress *u, const char *display_name); diff --git a/coreapi/sal.h b/coreapi/sal.h index d3943a64d..6cb1fd426 100644 --- a/coreapi/sal.h +++ b/coreapi/sal.h @@ -45,6 +45,7 @@ SalAddress * sal_address_new(const char *uri); SalAddress * sal_address_clone(const SalAddress *addr); const char *sal_address_get_scheme(const SalAddress *addr); const char *sal_address_get_display_name(const SalAddress* addr); +char *sal_address_get_display_name_unquoted(const SalAddress *addr); const char *sal_address_get_username(const SalAddress *addr); const char *sal_address_get_domain(const SalAddress *addr); void sal_address_set_display_name(SalAddress *addr, const char *display_name); diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index ba5730139..d9612fe11 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -1575,7 +1575,17 @@ int sal_unregister(SalOp *h){ return 0; } - +static void sal_address_quote_displayname(SalAddress *addr){ + osip_from_t *u=(osip_from_t*)addr; + if (u->displayname!=NULL && u->displayname[0]!='\0' + && u->displayname[0]!='"'){ + int len=strlen(u->displayname)+1+2; + char *quoted=osip_malloc(len); + snprintf(quoted,len,"\"%s\"",u->displayname); + osip_free(u->displayname); + u->displayname=quoted; + } +} SalAddress * sal_address_new(const char *uri){ osip_from_t *from; @@ -1584,6 +1594,7 @@ SalAddress * sal_address_new(const char *uri){ osip_from_free(from); return NULL; } + sal_address_quote_displayname ((SalAddress*)from); return (SalAddress*)from; } @@ -1605,6 +1616,18 @@ const char *sal_address_get_display_name(const SalAddress* addr){ return null_if_empty(u->displayname); } +char *sal_address_get_display_name_unquoted(const SalAddress *addr){ + const osip_from_t *u=(const osip_from_t*)addr; + const char *dn=null_if_empty(u->displayname); + char *ret=NULL; + if (dn!=NULL) { + char *tmp=osip_strdup_without_quote(dn); + ret=ms_strdup(tmp); + osip_free(tmp); + } + return ret; +} + const char *sal_address_get_username(const SalAddress *addr){ const osip_from_t *u=(const osip_from_t*)addr; return null_if_empty(u->url->username); @@ -1621,8 +1644,10 @@ void sal_address_set_display_name(SalAddress *addr, const char *display_name){ osip_free(u->displayname); u->displayname=NULL; } - if (display_name!=NULL) + if (display_name!=NULL && display_name[0]!='\0'){ u->displayname=osip_strdup(display_name); + sal_address_quote_displayname(addr); + } } void sal_address_set_username(SalAddress *addr, const char *username){ diff --git a/gtk-glade/friendlist.c b/gtk-glade/friendlist.c index d4fddf871..ecb3ee963 100644 --- a/gtk-glade/friendlist.c +++ b/gtk-glade/friendlist.c @@ -308,7 +308,7 @@ void linphone_gtk_show_friends(void){ LinphoneFriend *lf=(LinphoneFriend*)itf->data; const LinphoneAddress *f_uri=linphone_friend_get_address(lf); char *uri=linphone_address_as_string(f_uri); - const char *name=linphone_address_get_display_name(f_uri); + char *name=linphone_address_get_display_name_unquoted (f_uri); const char *display=name; char *escaped=NULL; if (lookup){ @@ -341,6 +341,7 @@ void linphone_gtk_show_friends(void){ } } ms_free(uri); + if (name!=NULL) ms_free(name); } } @@ -372,16 +373,17 @@ void linphone_gtk_remove_contact(GtkWidget *button){ void linphone_gtk_show_contact(LinphoneFriend *lf){ GtkWidget *w=linphone_gtk_create_window("contact"); char *uri; - const char *name; + char *name; const LinphoneAddress *f_uri=linphone_friend_get_address(lf); uri=linphone_address_as_string_uri_only(f_uri); - name=linphone_address_get_display_name(f_uri); + name=linphone_address_get_display_name_unquoted (f_uri); if (uri) { gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(w,"sip_address")),uri); ms_free(uri); } if (name){ gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(w,"name")),name); + ms_free(name); } gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"show_presence")), linphone_friend_get_send_subscribe(lf)); diff --git a/gtk-glade/incall_view.c b/gtk-glade/incall_view.c index c3c95eabe..4e6baf6a3 100644 --- a/gtk-glade/incall_view.c +++ b/gtk-glade/incall_view.c @@ -72,7 +72,7 @@ void linphone_gtk_show_idle_view(void){ void display_peer_name_in_label(GtkWidget *label, const char *uri){ LinphoneAddress *from; - const char *displayname=NULL; + char *displayname=NULL; char *id=NULL; char *uri_label; @@ -83,18 +83,15 @@ void display_peer_name_in_label(GtkWidget *label, const char *uri){ from=linphone_address_new(uri); if (from!=NULL){ - - if (linphone_address_get_display_name(from)) - displayname=linphone_address_get_display_name(from); - + displayname=linphone_address_get_display_name_unquoted (from); id=linphone_address_as_string_uri_only(from); - }else id=ms_strdup(uri); - if (displayname!=NULL) + if (displayname!=NULL){ uri_label=g_markup_printf_escaped("%s\n%s", displayname,id); - else + ms_free(displayname); + }else uri_label=g_markup_printf_escaped("%s\n",id); gtk_label_set_markup(GTK_LABEL(label),uri_label); ms_free(id); diff --git a/gtk-glade/main.c b/gtk-glade/main.c index 3ce841ad0..e59aec0ca 100644 --- a/gtk-glade/main.c +++ b/gtk-glade/main.c @@ -395,7 +395,7 @@ static void set_video_window_decorations(GdkWindow *w){ linphone_address_clean(uri); if (linphone_address_get_display_name(uri)!=NULL){ - display_name=ms_strdup(linphone_address_get_display_name(uri)); + display_name=linphone_address_get_display_name_unquoted (uri); }else{ display_name=linphone_address_as_string(uri); } diff --git a/gtk-glade/propertybox.c b/gtk-glade/propertybox.c index 85ebdbb8d..3faf28dab 100644 --- a/gtk-glade/propertybox.c +++ b/gtk-glade/propertybox.c @@ -802,8 +802,11 @@ void linphone_gtk_show_parameters(void){ /* SIP CONFIG */ contact=linphone_core_get_primary_contact_parsed(lc); if (contact){ - if (linphone_address_get_display_name(contact)) - gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(pb,"displayname")),linphone_address_get_display_name(contact)); + if (linphone_address_get_display_name(contact)) { + char *dn=linphone_address_get_display_name_unquoted (contact); + gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(pb,"displayname")),dn); + ms_free(dn); + } if (linphone_address_get_username(contact)) gtk_entry_set_text(GTK_ENTRY(linphone_gtk_get_widget(pb,"username")),linphone_address_get_username(contact)); }