kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

more formatting and logging tuning

This commit is contained in:
jchavanton 2014-09-10 14:53:43 +02:00 committed by Brian West
parent 764faad671
commit 0e89bbd033
1 changed files with 65 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/switch_rtp.c
View File

@ -499,13 +499,6 @@ struct switch_rtcp_receiver_report {
struct switch_rtcp_s_desc_head sr_desc_head; struct switch_rtcp_s_desc_head sr_desc_head;
struct switch_rtcp_s_desc_trunk sr_desc_ssrc; struct switch_rtcp_s_desc_trunk sr_desc_ssrc;
}; };
/* This is limited to a single block with force description. Not to be used as reference of the rtcp packet*/
//struct switch_rtcp_senderinfo {
// struct switch_rtcp_sr_head sr_head;
// struct switch_rtcp_report_block sr_block;
// struct switch_rtcp_s_desc_head sr_desc_head;
// struct switch_rtcp_s_desc_trunk sr_desc_ssrc;
//};
typedef enum { typedef enum {
RESULT_CONTINUE, RESULT_CONTINUE,
@ -1884,18 +1877,17 @@ static void rtcp_generate_report_block(switch_rtp_t *rtp_session, struct switch_
/* Packet loss */ /* Packet loss */
if (stats->rtcp_rtp_count == 0) { if (stats->rtcp_rtp_count == 0) {
expected_pkt = stats->high_ext_seq_recv - stats->base_seq + 1; expected_pkt = stats->high_ext_seq_recv - stats->base_seq + 1;
} } else {
else{
expected_pkt = stats->high_ext_seq_recv - stats->last_rpt_ext_seq; expected_pkt = stats->high_ext_seq_recv - stats->last_rpt_ext_seq;
} }
pkt_lost = expected_pkt - stats->period_pkt_count; pkt_lost = expected_pkt - stats->period_pkt_count;
stats->cum_lost=stats->cum_lost+pkt_lost; stats->cum_lost=stats->cum_lost+pkt_lost;
if(expected_pkt > 0 && pkt_lost > 0) if (expected_pkt > 0 && pkt_lost > 0) {
rtcp_report_block->fraction = (uint8_t) (pkt_lost * 256 / expected_pkt); rtcp_report_block->fraction = (uint8_t) (pkt_lost * 256 / expected_pkt);
else } else {
rtcp_report_block->fraction = 0; rtcp_report_block->fraction = 0;
}
#if SWITCH_BYTE_ORDER != __BIG_ENDIAN #if SWITCH_BYTE_ORDER != __BIG_ENDIAN
/* Reversing byte order for 24bits */ /* Reversing byte order for 24bits */
rtcp_report_block->lost = (((stats->cum_lost&0x0000FF)<<16) | ((stats->cum_lost&0x00FF00)) | ((stats->cum_lost&0xFF0000)>>16)); rtcp_report_block->lost = (((stats->cum_lost&0x0000FF)<<16) | ((stats->cum_lost&0x00FF00)) | ((stats->cum_lost&0xFF0000)>>16));
@ -1918,8 +1910,7 @@ static void rtcp_generate_report_block(switch_rtp_t *rtp_session, struct switch_
if (stats->last_recv_lsr_local) { if (stats->last_recv_lsr_local) {
dlsr = lsr_now - stats->last_recv_lsr_local; dlsr = lsr_now - stats->last_recv_lsr_local;
} } else {
else{
dlsr = 0; dlsr = 0;
} }
rtcp_report_block->lsr = stats->last_recv_lsr_peer; rtcp_report_block->lsr = stats->last_recv_lsr_peer;
@ -1948,13 +1939,17 @@ static void rtcp_stats_init(switch_rtp_t *rtp_session)
stats->pkt_count = 0; stats->pkt_count = 0;
stats->rtcp_rtp_count = 0; stats->rtcp_rtp_count = 0;
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "rtcp_stats_init: ssrc[%d] base_seq[%d]", stats->ssrc, stats->base_seq); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "rtcp_stats_init: ssrc[%d] base_seq[%d]", stats->ssrc, stats->base_seq);
if(!rtp_session->rtcp_sock_output)
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "rtcp_stats_init: no rtcp socket"); if (!rtp_session->flags[SWITCH_RTP_FLAG_ENABLE_RTCP]) {
if(!rtp_session->flags[SWITCH_RTP_FLAG_ENABLE_RTCP])
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "rtcp_stats_init: rtcp disabled"); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "rtcp_stats_init: rtcp disabled");
if(rtp_session->flags[SWITCH_RTP_FLAG_RTCP_PASSTHRU]) }
if (!rtp_session->rtcp_sock_output) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "rtcp_stats_init: no rtcp socket");
}
if (rtp_session->flags[SWITCH_RTP_FLAG_RTCP_PASSTHRU]) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "rtcp_stats_init: rtcp passthru"); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "rtcp_stats_init: rtcp passthru");
} }
}
static int rtcp_stats(switch_rtp_t *rtp_session) static int rtcp_stats(switch_rtp_t *rtp_session)
{ {
@ -1968,7 +1963,7 @@ static int rtcp_stats(switch_rtp_t *rtp_session)
const int RTP_SEQ_MOD = (1<<16); const int RTP_SEQ_MOD = (1<<16);
if(!rtp_session->rtcp_sock_output || !rtp_session->flags[SWITCH_RTP_FLAG_ENABLE_RTCP] || rtp_session->flags[SWITCH_RTP_FLAG_RTCP_PASSTHRU] || !rtp_session->rtcp_interval) if(!rtp_session->rtcp_sock_output || !rtp_session->flags[SWITCH_RTP_FLAG_ENABLE_RTCP] || rtp_session->flags[SWITCH_RTP_FLAG_RTCP_PASSTHRU] || !rtp_session->rtcp_interval)
return 0; // do not process RTCP in current state return 0; /* do not process RTCP in current state */
pkt_seq = (uint16_t) ntohs((uint16_t) rtp_session->recv_msg.header.seq); pkt_seq = (uint16_t) ntohs((uint16_t) rtp_session->recv_msg.header.seq);
@ -1983,19 +1978,18 @@ static int rtcp_stats(switch_rtp_t *rtp_session)
pkt_seq, stats->cycle, max_seq, stats->ssrc, rtp_session->timer.samplecount); pkt_seq, stats->cycle, max_seq, stats->ssrc, rtp_session->timer.samplecount);
} }
pkt_extended_seq = stats->cycle << 16 | pkt_seq; /* getting the extended packet extended sequence ID */ pkt_extended_seq = stats->cycle << 16 | pkt_seq; /* getting the extended packet extended sequence ID */
if(pkt_extended_seq > stats->high_ext_seq_recv) if (pkt_extended_seq > stats->high_ext_seq_recv) {
stats->high_ext_seq_recv = pkt_extended_seq; stats->high_ext_seq_recv = pkt_extended_seq;
} }
}
else if (seq_diff <= (RTP_SEQ_MOD - MAX_MISORDER)) { /* the sequence number made a very large jump */ else if (seq_diff <= (RTP_SEQ_MOD - MAX_MISORDER)) { /* the sequence number made a very large jump */
if (pkt_seq == stats->bad_seq) { if (pkt_seq == stats->bad_seq) {
rtcp_stats_init(rtp_session); rtcp_stats_init(rtp_session);
} } else {
else{
stats->bad_seq = (pkt_seq + 1) & (RTP_SEQ_MOD-1); stats->bad_seq = (pkt_seq + 1) & (RTP_SEQ_MOD-1);
} }
return 0; /* no stats, packet is out of sync and will be accounted as lost */ return 0; /* no stats, packet is out of sync and will be accounted as lost */
} } else {
else {
/* duplicate or reordered packet */ /* duplicate or reordered packet */
} }
@ -2014,8 +2008,7 @@ static int rtcp_stats(switch_rtp_t *rtp_session)
pkt_tsdiff = rtp_session->timer.samplecount - ntohl(hdr->ts) ; /* relative transit times for this packet */ pkt_tsdiff = rtp_session->timer.samplecount - ntohl(hdr->ts) ; /* relative transit times for this packet */
if (stats->pkt_count < 2) { /* Can not compute Jitter with only one packet */ if (stats->pkt_count < 2) { /* Can not compute Jitter with only one packet */
stats->last_pkt_tsdiff = pkt_tsdiff; stats->last_pkt_tsdiff = pkt_tsdiff;
} } else {
else{
packet_spacing_diff = pkt_tsdiff - stats->last_pkt_tsdiff; /* Jitter : difference of relative transit times for the two packets */ packet_spacing_diff = pkt_tsdiff - stats->last_pkt_tsdiff; /* Jitter : difference of relative transit times for the two packets */
stats->last_pkt_tsdiff = pkt_tsdiff; stats->last_pkt_tsdiff = pkt_tsdiff;
/* Interarrival jitter estimation, "J(i) = J(i-1) + ( |D(i-1,i)| - J(i-1) )/16" */ /* Interarrival jitter estimation, "J(i) = J(i-1) + ( |D(i-1,i)| - J(i-1) )/16" */
@ -2100,8 +2093,7 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
rr->ssrc = htonl(rtp_session->ssrc); rr->ssrc = htonl(rtp_session->ssrc);
rtcp_report_block = &rr->report_block; rtcp_report_block = &rr->report_block;
rtcp_bytes += sizeof(struct switch_rtcp_report_block); rtcp_bytes += sizeof(struct switch_rtcp_report_block);
} } else {
else {
struct switch_rtcp_sender_info *rtcp_sender_info; struct switch_rtcp_sender_info *rtcp_sender_info;
rtp_session->rtcp_send_msg.header.type = 200; /* Sender report */ rtp_session->rtcp_send_msg.header.type = 200; /* Sender report */
sr = (struct switch_rtcp_sender_report*) rtp_session->rtcp_send_msg.body; sr = (struct switch_rtcp_sender_report*) rtp_session->rtcp_send_msg.body;
@ -2125,7 +2117,9 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
/* ToBeDone : there was some issue with this report block so I commented the following lines of code to fix it please see /* ToBeDone : there was some issue with this report block so I commented the following lines of code to fix it please see
* RFC3550 section 6.5 SDES: Source Description RTCP Packet * RFC3550 section 6.5 SDES: Source Description RTCP Packet
* I guess it could be made optionnal, I do not see much value in incresing the size of the RTCP report */ * I guess it could be made optionnal, I do not see much value in incresing the size of the RTCP report
**/
/* /*
rtcp_header->v = 0x02; rtcp_header->v = 0x02;
rtcp_header->padding = 0; rtcp_header->padding = 0;
@ -2161,8 +2155,6 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
} }
*/ */
#ifdef ENABLE_SRTP #ifdef ENABLE_SRTP
if (rtp_session->flags[SWITCH_RTP_FLAG_SECURE_SEND]) { if (rtp_session->flags[SWITCH_RTP_FLAG_SECURE_SEND]) {
int sbytes = (int) rtcp_bytes; int sbytes = (int) rtcp_bytes;
@ -5164,7 +5156,7 @@ static switch_status_t process_rtcp_packet(switch_rtp_t *rtp_session, switch_siz
switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session"); switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG10,"Received an RTCP packet of length %" SWITCH_SIZE_T_FMT " bytes\n", *bytes); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG10,"Received an RTCP packet of length %" SWITCH_SIZE_T_FMT " bytes\n", *bytes);
if (rtp_session->rtcp_recv_msg.header.version == 2) { if (rtp_session->rtcp_recv_msg.header.version == 2) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,"RTCP packet type is %d\n", rtp_session->rtcp_recv_msg.header.type); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG10,"RTCP packet type is %d\n", rtp_session->rtcp_recv_msg.header.type);
if (rtp_session->rtcp_recv_msg.header.type == 200 || rtp_session->rtcp_recv_msg.header.type == 201) { if (rtp_session->rtcp_recv_msg.header.type == 200 || rtp_session->rtcp_recv_msg.header.type == 201) {
struct switch_rtcp_report_block *report_block; struct switch_rtcp_report_block *report_block;
@ -5205,8 +5197,7 @@ static switch_status_t process_rtcp_packet(switch_rtp_t *rtp_session, switch_siz
ntohl(sr->sender_info.ts), ntohl(sr->sender_info.ts),
ntohl(sr->sender_info.pc), ntohl(sr->sender_info.pc),
ntohl(sr->sender_info.oc)); ntohl(sr->sender_info.oc));
} } else { /* Receiver report */
else{ /* Receiver report */
struct switch_rtcp_receiver_report* rr = (struct switch_rtcp_receiver_report*)rtp_session->rtcp_recv_msg.body; struct switch_rtcp_receiver_report* rr = (struct switch_rtcp_receiver_report*)rtp_session->rtcp_recv_msg.body;
report_block = &rr->report_block; report_block = &rr->report_block;
packet_ssrc = rr->ssrc; packet_ssrc = rr->ssrc;
@ -5228,8 +5219,7 @@ static switch_status_t process_rtcp_packet(switch_rtp_t *rtp_session, switch_siz
rtp_session->stats.rtcp.peer_ssrc = ntohl(packet_ssrc); rtp_session->stats.rtcp.peer_ssrc = ntohl(packet_ssrc);
status = SWITCH_STATUS_SUCCESS; status = SWITCH_STATUS_SUCCESS;
} }
} } else {
else {
if (rtp_session->rtcp_recv_msg_p->header.version != 2) { if (rtp_session->rtcp_recv_msg_p->header.version != 2) {
if (rtp_session->rtcp_recv_msg_p->header.version == 0) { if (rtp_session->rtcp_recv_msg_p->header.version == 0) {
if (rtp_session->ice.ice_user) { if (rtp_session->ice.ice_user) {
@ -5238,7 +5228,7 @@ static switch_status_t process_rtcp_packet(switch_rtp_t *rtp_session, switch_siz
} else { } else {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session),
SWITCH_LOG_NOTICE, "Received an unsupported RTCP packet version %d\nn", rtp_session->rtcp_recv_msg_p->header.version); SWITCH_LOG_DEBUG, "Received an unsupported RTCP packet version %d\nn", rtp_session->rtcp_recv_msg_p->header.version);
} }
} }
@ -6213,7 +6203,6 @@ SWITCH_DECLARE(switch_status_t) switch_rtcp_zerocopy_read_frame(switch_rtp_t *rt
/* A fresh frame has been found! */ /* A fresh frame has been found! */
if (rtp_session->rtcp_fresh_frame) { if (rtp_session->rtcp_fresh_frame) {
// struct switch_rtcp_senderinfo* sr = (struct switch_rtcp_senderinfo*)rtp_session->rtcp_recv_msg_p->body;
struct switch_rtcp_sender_report* sr = (struct switch_rtcp_sender_report*)rtp_session->rtcp_recv_msg.body; struct switch_rtcp_sender_report* sr = (struct switch_rtcp_sender_report*)rtp_session->rtcp_recv_msg.body;
int i = 0; int i = 0;