Changeset 3907

Timestamp:

Dec 12, 2011 8:06:58 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1422: Option to configure or disable RTCP RTT normalization (thanks Lars Helgeson for the patch)

Location:

pjproject/branches/1.x/pjmedia

Files:

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

pjproject/branches/1.x/pjmedia/include/pjmedia/config.h

@@ -454 +454 @@
 #endif
 
+/**
+ * Specify the factor with wich RTCP RTT statistics should be normalized 
+ * if exceptionally high. For e.g. mobile networks with potentially large
+ * fluctuations, this might be unwanted.
+ *
+ * Use (0) to disable this feature.
+ *
+ * Default: 3.
+ */
+#ifndef PJMEDIA_RTCP_NORMALIZE_FACTOR
+#   define PJMEDIA_RTCP_NORMALIZE_FACTOR        3
+#endif
+
 
 /**

pjproject/branches/1.x/pjmedia/src/pjmedia/rtcp.c

@@ -616 +616 @@
             }
 
-            /* "Normalize" rtt value that is exceptionally high.
-             * For such values, "normalize" the rtt to be three times
-             * the average value.
+#if defined(PJMEDIA_RTCP_NORMALIZE_FACTOR) && PJMEDIA_RTCP_NORMALIZE_FACTOR!=0
+            /* "Normalize" rtt value that is exceptionally high. For such
+             * values, "normalize" the rtt to be PJMEDIA_RTCP_NORMALIZE_FACTOR
+             * times the average value.
              */
-            if (rtt > ((unsigned)sess->stat.rtt.mean*3) && sess->stat.rtt.n!=0)
+            if (rtt > ((unsigned)sess->stat.rtt.mean *
+                       PJMEDIA_RTCP_NORMALIZE_FACTOR) && sess->stat.rtt.n!=0)
             {
                 unsigned orig_rtt = rtt;
-                rtt = sess->stat.rtt.mean*3;
-                PJ_LOG(5,(sess->name, 
+                rtt = sess->stat.rtt.mean * PJMEDIA_RTCP_NORMALIZE_FACTOR;
+                PJ_LOG(5,(sess->name,
                           "RTT value %d usec is normalized to %d usec",
                           orig_rtt, rtt));
             }
-        
+#endif
             TRACE_((sess->name, "RTCP RTT is set to %d usec", rtt));