More on ticket #535: updated files using and related to math.h

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1961 74dad513-b988-da41-8d7b-12977e46ad98

3 files changed, 15 insertions, 52 deletions

diff --git a/pjmedia/include/pjmedia/jbuf.h b/pjmedia/include/pjmedia/jbuf.h
index a527d57b..229f3f05 100644
--- a/pjmedia/include/pjmedia/jbuf.h
+++ b/pjmedia/include/pjmedia/jbuf.h
@@ -76,7 +76,10 @@ struct pjmedia_jb_state
     unsigned	min_prefetch;	    /**< Minimum allowed prefetch, in frms. */
     unsigned	max_prefetch;	    /**< Maximum allowed prefetch, in frms. */
     unsigned	size;		    /**< Current buffer size, in frames.    */
-    unsigned	max_size;	    /**< Maximum size ever.		    */
+    unsigned	avg_delay;	    /**< Average delay, in ms.		    */
+    unsigned	min_delay;	    /**< Minimum delay, in ms.		    */
+    unsigned	max_delay;	    /**< Maximum delay, in ms.		    */
+    unsigned	dev_delay;	    /**< Standard deviation of delay, in ms. */
 };
 
 
diff --git a/pjmedia/include/pjmedia/rtcp.h b/pjmedia/include/pjmedia/rtcp.h
index 2633224e..bffb5f83 100644
--- a/pjmedia/include/pjmedia/rtcp.h
+++ b/pjmedia/include/pjmedia/rtcp.h
@@ -28,7 +28,6 @@
 #include <pjmedia/rtcp_xr.h>
 #include <pjmedia/rtp.h>
 
-
 PJ_BEGIN_DECL
 
 
@@ -180,26 +179,14 @@ struct pjmedia_rtcp_stream_stat
     unsigned	    reorder;	/**< Total number of out of order packets   */
     unsigned	    dup;	/**< Total number of duplicates packets	    */
 
-    struct {
-	unsigned    count;	/**< Number of period samples(to calc avg)  */
-	unsigned    min;	/**< Minimum loss period (in usec)	    */
-	unsigned    avg;	/**< Average loss period (in usec)	    */
-	unsigned    max;	/**< Maximum loss period (in usec)	    */
-	unsigned    last;	/**< Last loss period (in usec)		    */
-    } loss_period;		/**< Lost period history.		    */
+    pj_math_stat    loss_period;/**< Loss period statistics (in usec)	    */
 
     struct {
 	unsigned    burst:1;	/**< Burst/sequential packet lost detected  */
     	unsigned    random:1;	/**< Random packet lost detected.	    */
     } loss_type;		/**< Types of loss detected.		    */
 
-    struct {
-	unsigned    count;	/**< Number of updates.			    */
-	unsigned    min;	/**< Minimum jitter (in usec)		    */
-	unsigned    avg;	/**< Average jitter (in usec)		    */
-	unsigned    max;	/**< Maximum jitter (in usec)		    */
-	unsigned    last;	/**< Last jitter (in usec)		    */
-    } jitter;			/**< Jitter history.			    */
+    pj_math_stat    jitter;	/**< Jitter statistics (in usec)	    */
 };
 
 
@@ -220,14 +207,7 @@ struct pjmedia_rtcp_stat
     pjmedia_rtcp_stream_stat tx;    /**< Encoder stream statistics.	    */
     pjmedia_rtcp_stream_stat rx;    /**< Decoder stream statistics.	    */
     
-    struct {
-	unsigned    min;	    /**< Minimum round-trip delay (in usec) */
-	unsigned    avg;	    /**< Average round-trip delay (in usec) */
-	unsigned    max;	    /**< Maximum round-trip delay (in usec) */
-	unsigned    last;	    /**< Last round-trip delay (in usec)    */
-    } rtt;			    /**< Round trip delay history.	    */
-
-    unsigned	    rtt_update_cnt; /**< Nb of times rtt is updated.	    */
+    pj_math_stat	     rtt;   /**< Round trip delay statistic(in usec)*/
 };
 
 
diff --git a/pjmedia/include/pjmedia/rtcp_xr.h b/pjmedia/include/pjmedia/rtcp_xr.h
index cdedc1dd..c1eafa97 100644
--- a/pjmedia/include/pjmedia/rtcp_xr.h
+++ b/pjmedia/include/pjmedia/rtcp_xr.h
@@ -25,6 +25,7 @@
  */
 
 #include <pjmedia/types.h>
+#include <pj/math.h>
 
 
 PJ_BEGIN_DECL
@@ -246,22 +247,8 @@ typedef struct pjmedia_rtcp_xr_stream_stat
 
 	unsigned	    lost;	/**< Number of packets lost	    */
 	unsigned	    dup;	/**< Number of duplicated packets   */
-	
-	struct {
-	    unsigned	    min;	/**< Minimum jitter (in usec)	    */
-	    unsigned	    max;	/**< Maximum jitter (in usec)	    */
-	    unsigned	    dev;	/**< Jitter deviation (in usec)	    */
-	    unsigned	    mean;	/**< Average jitter (in usec)	    */
-	    unsigned	    count;	/**< Update count		    */
-	} jitter;			/**< Jitter history.		    */
-
-	struct {
-	    unsigned	    min;	/**< Minimum ToH		    */
-	    unsigned	    max;	/**< Maximum ToH		    */
-	    unsigned	    dev;	/**< ToH deviation		    */
-	    unsigned	    mean;	/**< Average ToH		    */
-	    unsigned	    count;	/**< Update count		    */
-	} toh;				/**< TTL of hop limit history.	    */
+	pj_math_stat	    jitter;	/**< Jitter statistics (in usec)    */
+	pj_math_stat	    toh;	/**< TTL of hop limit statistics.   */
     } stat_sum;
 
     struct {
@@ -300,18 +287,11 @@ typedef struct pjmedia_rtcp_xr_stream_stat
 
 typedef struct pjmedia_rtcp_xr_stat
 {
-    pjmedia_rtcp_xr_stream_stat	 rx;
-    pjmedia_rtcp_xr_stream_stat	 tx;
-
-    /* RTT calculated from receiver side */
-    struct {
-	unsigned    min;	    /**< Minimum round-trip delay (in usec) */
-	unsigned    avg;	    /**< Average round-trip delay (in usec) */
-	unsigned    max;	    /**< Maximum round-trip delay (in usec) */
-	unsigned    last;	    /**< Last round-trip delay (in usec)    */
-	unsigned    update_cnt;	    /**< Nb of times rtt is updated.	    */
-    } rtt;			    /**< Round trip delay history.	    */
-
+    pjmedia_rtcp_xr_stream_stat	 rx;  /**< Decoding direction statistics.   */
+    pjmedia_rtcp_xr_stream_stat	 tx;  /**< Encoding direction statistics.   */
+    pj_math_stat		 rtt; /**< Round-trip delay stat (in usec) 
+					   the value is calculated from 
+					   receiver side.		    */
 } pjmedia_rtcp_xr_stat;
 
 /**