From 28e99d08e189d2a34283dd044c4ddc9cabcf3f16 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 22 Apr 2014 16:34:43 +0200 Subject: [PATCH] Fix compilation with Visual Studio. --- coreapi/lpconfig.c | 3 ++- coreapi/quality_reporting.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/coreapi/lpconfig.c b/coreapi/lpconfig.c index d6ccea612..0ac692cde 100644 --- a/coreapi/lpconfig.c +++ b/coreapi/lpconfig.c @@ -288,13 +288,14 @@ LpConfig * lp_config_new(const char *filename){ LpConfig * lp_config_new_from_buffer(const char *buffer){ LpConfig* conf = lp_new0(LpConfig,1); - conf->refcnt=1; LpSection* current_section = NULL; char* ptr = ms_strdup(buffer); char* strtok_storage = NULL; char* line = strtok_r(ptr, "\n", &strtok_storage); + conf->refcnt=1; + while( line != NULL ){ current_section = lp_config_parse_line(conf,line,current_section); line = strtok_r(NULL, "\n", &strtok_storage); diff --git a/coreapi/quality_reporting.c b/coreapi/quality_reporting.c index fb64a4b28..325ba7985 100644 --- a/coreapi/quality_reporting.c +++ b/coreapi/quality_reporting.c @@ -433,6 +433,8 @@ void linphone_reporting_call_stats_updated(LinphoneCall *call, int stats_type) { if (block != NULL) { switch (rtcp_XR_get_block_type(block)) { case RTCP_XR_VOIP_METRICS: { + uint8_t config; + metrics->quality_estimates.rcq = rtcp_XR_voip_metrics_get_r_factor(block); metrics->quality_estimates.moslq = rtcp_XR_voip_metrics_get_mos_lq(block) / 10.f; metrics->quality_estimates.moscq = rtcp_XR_voip_metrics_get_mos_cq(block) / 10.f; @@ -443,7 +445,7 @@ void linphone_reporting_call_stats_updated(LinphoneCall *call, int stats_type) { metrics->packet_loss.network_packet_loss_rate = rtcp_XR_voip_metrics_get_loss_rate(block); metrics->packet_loss.jitter_buffer_discard_rate = rtcp_XR_voip_metrics_get_discard_rate(block); - uint8_t config = rtcp_XR_voip_metrics_get_rx_config(block); + config = rtcp_XR_voip_metrics_get_rx_config(block); metrics->session_description.packet_loss_concealment = (config >> 6) & 0x3; metrics->jitter_buffer.adaptive = (config >> 4) & 0x3; break;