diff options
| author | Olle Johansson <oej@edvina.net> | 2007-04-18 20:48:13 +0000 |
|---|---|---|
| committer | Olle Johansson <oej@edvina.net> | 2007-04-18 20:48:13 +0000 |
| commit | 16a080781de5d8a1b2e7e37c8d6f271dfda4071f (patch) | |
| tree | 65377dd93a17975e9fd71cd4d657196b7bce935f /main | |
| parent | c4cd1b67615c7d0c2edf4c054a579de2d1dd32b8 (diff) | |
Merged revisions 61676 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r61676 | oej | 2007-04-18 22:46:23 +0200 (Wed, 18 Apr 2007) | 2 lines
Clean upp formatting, add some doxygen stuff while we're in cleaning mode... Thanks Kevin!
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61677 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/rtp.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/main/rtp.c b/main/rtp.c index d316ae7a1..00bb42855 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -145,8 +145,8 @@ struct ast_rtp { unsigned int dtmfsamples; /* DTMF Transmission Variables */ unsigned int lastdigitts; - char sending_digit; /* boolean - are we sending digits */ - char send_digit; /* digit we are sending */ + char sending_digit; /*!< boolean - are we sending digits */ + char send_digit; /*!< digit we are sending */ int send_payload; int send_duration; int nat; @@ -995,27 +995,27 @@ 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->maxrtt<rtt) - rtp->rtcp->maxrtt = rtt; - if (rtp->rtcp->minrtt>rtt) - rtp->rtcp->minrtt = rtt; - } + if (rtt >= 0) { + rtp->rtcp->accumulated_transit += rtt; + rtp->rtcp->rtt = rtt; + if (rtp->rtcp->maxrtt < rtt) + rtp->rtcp->maxrtt = rtt; + if (rtp->rtcp->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)) { - ast_verbose("Fraction lost: %ld\n", (((long) ntohl(rtcpheader[i + 1]) & 0xff000000) >> 24)); - ast_verbose("Packets lost so far: %d\n", rtp->rtcp->reported_lost); - ast_verbose("Highest sequence number: %ld\n", (long) (ntohl(rtcpheader[i + 2]) & 0xffff)); - ast_verbose("Sequence number cycles: %ld\n", (long) (ntohl(rtcpheader[i + 2]) & 0xffff) >> 16); - ast_verbose("Interarrival jitter: %u\n", rtp->rtcp->reported_jitter); - ast_verbose("Last SR(our NTP): %lu.%010lu\n",(unsigned long) ntohl(rtcpheader[i + 4]) >> 16,((unsigned long) ntohl(rtcpheader[i + 4]) << 16) * 4096); - ast_verbose("DLSR: %4.4f (sec)\n",ntohl(rtcpheader[i + 5])/65536.0); + ast_verbose(" Fraction lost: %ld\n", (((long) ntohl(rtcpheader[i + 1]) & 0xff000000) >> 24)); + ast_verbose(" Packets lost so far: %d\n", rtp->rtcp->reported_lost); + ast_verbose(" Highest sequence number: %ld\n", (long) (ntohl(rtcpheader[i + 2]) & 0xffff)); + ast_verbose(" Sequence number cycles: %ld\n", (long) (ntohl(rtcpheader[i + 2]) & 0xffff) >> 16); + ast_verbose(" Interarrival jitter: %u\n", rtp->rtcp->reported_jitter); + ast_verbose(" Last SR(our NTP): %lu.%010lu\n",(unsigned long) ntohl(rtcpheader[i + 4]) >> 16,((unsigned long) ntohl(rtcpheader[i + 4]) << 16) * 4096); + ast_verbose(" DLSR: %4.4f (sec)\n",ntohl(rtcpheader[i + 5])/65536.0); if (rtt) - ast_verbose("RTT: %f(sec)\n", rtt); + ast_verbose(" RTT: %f(sec)\n", rtt); } break; case RTCP_PT_FUR: |