Fixed minor bug in the display of packet loss percentage
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@565 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjsip-apps/src/samples/siprtp_report.c b/pjsip-apps/src/samples/siprtp_report.c
index 6fd7bb7..83c4f11 100644
--- a/pjsip-apps/src/samples/siprtp_report.c
+++ b/pjsip-apps/src/samples/siprtp_report.c
@@ -159,11 +159,11 @@
good_number(ipbytes, audio->rtcp.stat.rx.bytes + audio->rtcp.stat.rx.pkt * 32),
"",
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,
audio->rtcp.stat.rx.loss_period.avg / 1000.0,
@@ -202,11 +202,11 @@
good_number(ipbytes, audio->rtcp.stat.tx.bytes + audio->rtcp.stat.tx.pkt * 32),
"",
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,
audio->rtcp.stat.tx.loss_period.avg / 1000.0,
diff --git a/pjsip-apps/src/samples/streamutil.c b/pjsip-apps/src/samples/streamutil.c
index ca19fb6..2054427 100644
--- a/pjsip-apps/src/samples/streamutil.c
+++ b/pjsip-apps/src/samples/streamutil.c
@@ -604,11 +604,11 @@
good_number(ipbytes, stat.rx.bytes + stat.rx.pkt * 32),
"",
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,
stat.rx.loss_period.avg / 1000.0,
@@ -647,11 +647,11 @@
good_number(ipbytes, stat.tx.bytes + stat.tx.pkt * 32),
"",
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,
stat.tx.loss_period.avg / 1000.0,