[svn-commits] oej: branch oej/pinefrog-1.4 r294348 - in /team/oej/pinefrog-1.4: channels/ m...

[SVN commits to the Digium repositories]

Author: oej
Date: Tue Nov  9 08:56:00 2010
New Revision: 294348

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=294348
Log:
Various updates from testing... testing... testing...

Modified:
    team/oej/pinefrog-1.4/channels/chan_sip.c
    team/oej/pinefrog-1.4/main/rtp.c

Modified: team/oej/pinefrog-1.4/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-1.4/channels/chan_sip.c?view=diff&rev=294348&r1=294347&r2=294348
==============================================================================
--- team/oej/pinefrog-1.4/channels/chan_sip.c (original)
+++ team/oej/pinefrog-1.4/channels/chan_sip.c Tue Nov  9 08:56:00 2010
@@ -13939,12 +13939,11 @@
 		if (type == SDP_AUDIO) {  /* Audio */
 			p->audioqual = ast_calloc(sizeof(struct ast_rtp_quality), 1);
 			(* p->audioqual) = qual;
-			p->audioqual->end = ast_tvnow();
 		} else if (type == SDP_VIDEO) {  /* Video */
 			p->videoqual = ast_calloc(sizeof(struct ast_rtp_quality), 1);
 			(* p->videoqual) = qual;
-			p->videoqual->end = ast_tvnow();
-		}
+		}
+		p->audioqual->end = ast_tvnow();
 	}
 }
 
@@ -13966,7 +13965,11 @@
 	   the RTP stream duration which may include early media (ringing and
 	   provider messages). Only useful for measurements.
 	 */
-	duration = (unsigned int)(ast_tvdiff_ms(qual->end, qual->start) / 1000);
+	if (qual->end) {
+		duration = (unsigned int)(ast_tvdiff_ms(qual->end, qual->start) / 1000);
+	} else {
+		duration = 0;
+	}
 
 	/* Realtime is based on strings, so let's make strings */
 	sprintf(localjitter, "%f", qual->local_jitter);

Modified: team/oej/pinefrog-1.4/main/rtp.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-1.4/main/rtp.c?view=diff&rev=294348&r1=294347&r2=294348
==============================================================================
--- team/oej/pinefrog-1.4/main/rtp.c (original)
+++ team/oej/pinefrog-1.4/main/rtp.c Tue Nov  9 08:56:00 2010
@@ -1204,7 +1204,9 @@
 			
 			j = i * 4;
 			sdes = (char *) &rtcpheader[i];
-			ast_verbose("   Received an SDES from %s:%d - Total length %d (%d bytes)\n", ast_inet_ntoa(rtp->rtcp->them.sin_addr), ntohs(rtp->rtcp->them.sin_port), length-i, ((length-i)*4) - 6);
+			if (rtcp_debug_test_addr(&sin)) {
+				ast_verbose("   Received an SDES from %s:%d - Total length %d (%d bytes)\n", ast_inet_ntoa(rtp->rtcp->them.sin_addr), ntohs(rtp->rtcp->them.sin_port), length-i, ((length-i)*4) - 6);
+			}
 			while (j < length * 4) {
 				sdestype = (int) *sdes;
 				sdes++;