From 0ef4dad39ce7ed86e1cb779d0921b2ec7fda314e Mon Sep 17 00:00:00 2001 From: Olle Johansson Date: Wed, 18 Apr 2007 20:28:53 +0000 Subject: [PATCH] Issue #9554 - Improve RTCP (Dave Troy) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@61674 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/rtp.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/main/rtp.c b/main/rtp.c index 35409ed2cf..c69351b529 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -925,6 +925,7 @@ struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp) lsr = (double)((ntohl(rtcpheader[i + 4]) & 0xffff0000) >> 16) + (double)((double)(ntohl(rtcpheader[i + 4]) & 0xffff) / 1000000.); dlsr = (double)(ntohl(rtcpheader[i + 5])/65536.); rtt = a - dlsr - lsr; + if (rtt>=0) { rtp->rtcp->accumulated_transit += rtt; rtp->rtcp->rtt = rtt; if (rtp->rtcp->maxrttrtcp->minrtt>rtt) rtp->rtcp->minrtt = rtt; } + } rtp->rtcp->reported_jitter = ntohl(rtcpheader[i + 3]); rtp->rtcp->reported_lost = ntohl(rtcpheader[i + 1]) & 0xffffff; if (rtcp_debug_test_addr(&sin)) { @@ -1084,7 +1086,6 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) unsigned int seqno; int version; int payloadtype; - int tseqno; int hdrlen = 12; int padding; int mark; @@ -1197,8 +1198,6 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) rtp->rxcount++; /* Only count reasonably valid packets, this'll make the rtcp stats more accurate */ - tseqno = rtp->lastrxseqno +1; - if (rtp->rxcount==1) { /* This is the first RTP packet successfully received from source */ rtp->seedrxseqno = seqno; @@ -1209,8 +1208,7 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) /* Schedule transmission of Receiver Report */ rtp->rtcp->schedid = ast_sched_add(rtp->sched, ast_rtcp_calc_interval(rtp), ast_rtcp_write, rtp); } - - if (tseqno > RTP_SEQ_MOD) { /* if tseqno is greater than RTP_SEQ_MOD it would indicate that the sender cycled */ + if ( rtp->lastrxseqno - seqno > 100) { /* if so it would indicate that the sender cycled; allow for misordering */ rtp->cycles += RTP_SEQ_MOD; ast_verbose("SEQNO cycled: %u\t%d\n", rtp->cycles, seqno); } @@ -2348,7 +2346,7 @@ static int ast_rtcp_write_sr(void *data) rtcpheader[7] = htonl(rtp->themssrc); rtcpheader[8] = htonl(((fraction & 0xff) << 24) | (lost & 0xffffff)); rtcpheader[9] = htonl((rtp->cycles) | ((rtp->lastrxseqno & 0xffff))); - rtcpheader[10] = htonl((unsigned int)rtp->rxjitter); + rtcpheader[10] = htonl((unsigned int)(rtp->rxjitter * 65536.)); rtcpheader[11] = htonl(rtp->rtcp->themrxlsr); rtcpheader[12] = htonl((((dlsr.tv_sec * 1000) + (dlsr.tv_usec / 1000)) * 65536) / 1000); len += 24; @@ -2450,7 +2448,7 @@ static int ast_rtcp_write_rr(void *data) rtcpheader[2] = htonl(rtp->themssrc); rtcpheader[3] = htonl(((fraction & 0xff) << 24) | (lost & 0xffffff)); rtcpheader[4] = htonl((rtp->cycles) | ((rtp->lastrxseqno & 0xffff))); - rtcpheader[5] = htonl((unsigned int)rtp->rxjitter); + rtcpheader[5] = htonl((unsigned int)(rtp->rxjitter * 65536.)); rtcpheader[6] = htonl(rtp->rtcp->themrxlsr); rtcpheader[7] = htonl((((dlsr.tv_sec * 1000) + (dlsr.tv_usec / 1000)) * 65536) / 1000);