Changeset 537 for pjproject/trunk

Timestamp:

Jun 22, 2006 6:44:11 PM (18 years ago)

Author:

bennylp

Message:

Fixed RTCP statistic returning fraction lost instead of total lost

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/rtcp.h (modified) (1 diff)
• src/pjmedia/rtcp.c (modified) (3 diffs)

pjproject/trunk/pjmedia/include/pjmedia/rtcp.h

@@ -157 +157 @@
     pj_uint32_t     pkt;        /**< Total number of packets                */
     pj_uint32_t     bytes;      /**< Total number of payload/bytes          */
-    unsigned        discard;    /**< Number of discarded packets.           */
-    unsigned        loss;       /**< Number of packets lost                 */
-    unsigned        reorder;    /**< Number of out of order packets         */
-    unsigned        dup;        /**< Number of duplicates packets           */
+    unsigned        discard;    /**< Total number of discarded packets.     */
+    unsigned        loss;       /**< Total number of packets lost           */
+    unsigned        reorder;    /**< Total number of out of order packets   */
+    unsigned        dup;        /**< Total number of duplicates packets     */
 
     struct {

pjproject/trunk/pjmedia/src/pjmedia/rtcp.c

@@ -208 +208 @@
     }
     
-    if (seq_st.status.flag.dup)
+    if (seq_st.status.flag.dup) {
         sess->stat.rx.dup++;
-    if (seq_st.status.flag.outorder)
+        TRACE_((sess->name, "Duplicate packet detected"));
+    }
+
+    if (seq_st.status.flag.outorder) {
         sess->stat.rx.reorder++;
+        TRACE_((sess->name, "Out-of-order packet detected"));
+    }
 
     if (seq_st.status.flag.bad) {
         sess->stat.rx.discard++;
+        TRACE_((sess->name, "Bad packet discarded"));
         return;
     }
@@ -234 +240 @@
          */
         sess->stat.rx.loss += (seq_st.diff - 1);
+        TRACE_((sess->name, "%d packet(s) lost", seq_st.diff - 1));
 
         /* Update loss period stat */
@@ -542 +549 @@
     /* Total lost. */
     expected = pj_ntohl(rtcp_pkt->rr.last_seq) - sess->seq_ctrl.base_seq;
+
+    /* This is bug: total lost already calculated on each incoming RTP!
     if (expected >= sess->received)
         sess->stat.rx.loss = expected - sess->received;
     else
         sess->stat.rx.loss = 0;
+    */
 
     rtcp_pkt->rr.total_lost_2 = (sess->stat.rx.loss >> 16) & 0xFF;