[asterisk-commits] oej: branch oej/sipchanstats r215888 - in /team/oej/sipchanstats: channels/ m...

[SVN commits to the Asterisk project]

Author: oej
Date: Thu Sep  3 07:35:09 2009
New Revision: 215888

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=215888
Log:
Klaus Darillons patch in bug tracker

Modified:
    team/oej/sipchanstats/channels/chan_sip.c
    team/oej/sipchanstats/main/rtp.c
    team/oej/sipchanstats/utils/Makefile

Modified: team/oej/sipchanstats/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/sipchanstats/channels/chan_sip.c?view=diff&rev=215888&r1=215887&r2=215888
==============================================================================
--- team/oej/sipchanstats/channels/chan_sip.c (original)
+++ team/oej/sipchanstats/channels/chan_sip.c Thu Sep  3 07:35:09 2009
@@ -11531,12 +11531,12 @@
 			rxcount > (unsigned int) 100000 ? (unsigned int) (rxcount)/(unsigned int) 1000 : rxcount,
 			rxcount > (unsigned int) 100000 ? "K":" ",
 			ast_rtp_get_qosvalue(cur->rtp, AST_RTP_RXPLOSS),
-			rxcount > ast_rtp_get_qosvalue(cur->rtp, AST_RTP_RXPLOSS) ? (unsigned int) (ast_rtp_get_qosvalue(cur->rtp, AST_RTP_RXPLOSS) / rxcount * 100) : 0,
+			rxcount > ast_rtp_get_qosvalue(cur->rtp, AST_RTP_RXPLOSS) ? (unsigned int) ((double) ast_rtp_get_qosvalue(cur->rtp, AST_RTP_RXPLOSS) / (ast_rtp_get_qosvalue(cur->rtp, AST_RTP_RXPLOSS) + rxcount) * 100) : 0,
 			ast_rtp_get_qosvalue(cur->rtp, AST_RTP_RXJITTER),
 			txcount > (unsigned int) 100000 ? (unsigned int) (txcount)/(unsigned int) 1000 : txcount,
 			txcount > (unsigned int) 100000 ? "K":" ",
 			ast_rtp_get_qosvalue(cur->rtp, AST_RTP_TXPLOSS),
-			txcount > ast_rtp_get_qosvalue(cur->rtp, AST_RTP_TXPLOSS) ? (unsigned int) (ast_rtp_get_qosvalue(cur->rtp, AST_RTP_TXPLOSS)/ txcount * 100) : 0,
+			txcount > ast_rtp_get_qosvalue(cur->rtp, AST_RTP_TXPLOSS) ? (unsigned int) ((double) ast_rtp_get_qosvalue(cur->rtp, AST_RTP_TXPLOSS)/ txcount * 100) : 0,
 			ast_rtp_get_qosvalue(cur->rtp, AST_RTP_TXJITTER)
 		);
 		numchans++;

Modified: team/oej/sipchanstats/main/rtp.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/sipchanstats/main/rtp.c?view=diff&rev=215888&r1=215887&r2=215888
==============================================================================
--- team/oej/sipchanstats/main/rtp.c (original)
+++ team/oej/sipchanstats/main/rtp.c Thu Sep  3 07:35:09 2009
@@ -2165,7 +2165,7 @@
 	case AST_RTP_RXCOUNT:
 		return (unsigned int) rtp->rxcount;
 	case AST_RTP_TXJITTER:
-		return (unsigned int) (rtp->rxjitter * 100.0);
+		return (unsigned int) (rtp->rxjitter * 1000.0);
 	case AST_RTP_RXJITTER:
 		return (unsigned int) (rtp->rtcp ? (rtp->rtcp->reported_jitter / (unsigned int) 65536.0) : 0);
 	case AST_RTP_RXPLOSS:

Modified: team/oej/sipchanstats/utils/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/sipchanstats/utils/Makefile?view=diff&rev=215888&r1=215887&r2=215888
==============================================================================
--- team/oej/sipchanstats/utils/Makefile (original)
+++ team/oej/sipchanstats/utils/Makefile Thu Sep  3 07:35:09 2009
@@ -26,7 +26,7 @@
 #     changes are made to ast_expr2.y or ast_expr2.fl (or the corresponding .c files),
 #     as a regression test. Others (mere mortals?) need not bother, but they are
 #     more than welcome to play! The regression test itself is in expr2.testinput.
-ALL_UTILS:=astman smsq stereorize streamplayer aelparse muted
+ALL_UTILS:=astman smsq stereorize streamplayer aelparse 
 UTILS:=$(ALL_UTILS)
 
 include $(ASTTOPDIR)/Makefile.rules