Changeset 565

Timestamp:

Jun 29, 2006 9:41:34 AM (18 years ago)

Author:

bennylp

Message:

Fixed minor bug in the display of packet loss percentage

Location:

pjproject/trunk

Files:

• pjsip-apps/src/samples/siprtp_report.c (modified) (2 diffs)
• pjsip-apps/src/samples/streamutil.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/samples/siprtp_report.c

@@ -160 +160 @@
            "",
            audio->rtcp.stat.rx.loss,
-           audio->rtcp.stat.rx.loss * 100.0 / audio->rtcp.stat.rx.pkt,
+           audio->rtcp.stat.rx.loss * 100.0 / (audio->rtcp.stat.rx.pkt + audio->rtcp.stat.rx.loss),
            audio->rtcp.stat.rx.dup, 
-           audio->rtcp.stat.rx.dup * 100.0 / audio->rtcp.stat.rx.pkt,
+           audio->rtcp.stat.rx.dup * 100.0 / (audio->rtcp.stat.rx.pkt + audio->rtcp.stat.rx.dup),
            audio->rtcp.stat.rx.reorder, 
-           audio->rtcp.stat.rx.reorder * 100.0 / audio->rtcp.stat.rx.pkt,
+           audio->rtcp.stat.rx.reorder * 100.0 / (audio->rtcp.stat.rx.pkt + audio->rtcp.stat.rx.reorder),
            "",
            audio->rtcp.stat.rx.loss_period.min / 1000.0, 
@@ -203 +203 @@
            "",
            audio->rtcp.stat.tx.loss,
-           audio->rtcp.stat.tx.loss * 100.0 / audio->rtcp.stat.tx.pkt,
+           audio->rtcp.stat.tx.loss * 100.0 / (audio->rtcp.stat.tx.pkt + audio->rtcp.stat.tx.loss),
            audio->rtcp.stat.tx.dup, 
-           audio->rtcp.stat.tx.dup * 100.0 / audio->rtcp.stat.tx.pkt,
+           audio->rtcp.stat.tx.dup * 100.0 / (audio->rtcp.stat.tx.pkt + audio->rtcp.stat.tx.dup),
            audio->rtcp.stat.tx.reorder, 
-           audio->rtcp.stat.tx.reorder * 100.0 / audio->rtcp.stat.tx.pkt,
+           audio->rtcp.stat.tx.reorder * 100.0 / (audio->rtcp.stat.tx.pkt + audio->rtcp.stat.tx.reorder),
            "",
            audio->rtcp.stat.tx.loss_period.min / 1000.0, 

pjproject/trunk/pjsip-apps/src/samples/streamutil.c

@@ -605 +605 @@
            "",
            stat.rx.loss,
-           stat.rx.loss * 100.0 / stat.rx.pkt,
+           stat.rx.loss * 100.0 / (stat.rx.pkt + stat.rx.loss),
            stat.rx.dup, 
-           stat.rx.dup * 100.0 / stat.rx.pkt,
+           stat.rx.dup * 100.0 / (stat.rx.pkt + stat.rx.dup),
            stat.rx.reorder, 
-           stat.rx.reorder * 100.0 / stat.rx.pkt,
+           stat.rx.reorder * 100.0 / (stat.rx.pkt + stat.rx.reorder),
            "",
            stat.rx.loss_period.min / 1000.0, 
@@ -648 +648 @@
            "",
            stat.tx.loss,
-           stat.tx.loss * 100.0 / stat.tx.pkt,
+           stat.tx.loss * 100.0 / (stat.tx.pkt + stat.tx.loss),
            stat.tx.dup, 
-           stat.tx.dup * 100.0 / stat.tx.pkt,
+           stat.tx.dup * 100.0 / (stat.tx.pkt + stat.tx.dup),
            stat.tx.reorder, 
-           stat.tx.reorder * 100.0 / stat.tx.pkt,
+           stat.tx.reorder * 100.0 / (stat.tx.pkt + stat.tx.reorder),
            "",
            stat.tx.loss_period.min / 1000.0, 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -1303 +1303 @@
                indent,
                stat.rx.loss,
-               stat.rx.loss * 100.0 / stat.rx.pkt,
+               stat.rx.loss * 100.0 / (stat.rx.pkt + stat.rx.loss),
                stat.rx.dup, 
-               stat.rx.dup * 100.0 / stat.rx.pkt,
+               stat.rx.dup * 100.0 / (stat.rx.pkt + stat.rx.dup),
                stat.rx.reorder, 
-               stat.rx.reorder * 100.0 / stat.rx.pkt,
+               stat.rx.reorder * 100.0 / (stat.rx.pkt + stat.rx.reorder),
                indent, indent,
                stat.rx.loss_period.min / 1000.0, 
@@ -1362 +1362 @@
                indent,
                stat.tx.loss,
-               stat.tx.loss * 100.0 / stat.tx.pkt,
+               stat.tx.loss * 100.0 / (stat.tx.pkt + stat.tx.loss),
                stat.tx.dup, 
-               stat.tx.dup * 100.0 / stat.tx.pkt,
+               stat.tx.dup * 100.0 / (stat.tx.pkt + stat.tx.dup),
                stat.tx.reorder, 
-               stat.tx.reorder * 100.0 / stat.tx.pkt,
+               stat.tx.reorder * 100.0 / (stat.tx.pkt + stat.tx.reorder),
 
                indent, indent,