Changeset 381 for pjproject/trunk/pjmedia/src/pjmedia/rtcp.c

Timestamp:

Apr 4, 2006 7:43:24 PM (18 years ago)

Author:

bennylp

Message:

Changed RTCP timing to use high resolution timestamp

File:

• pjproject/trunk/pjmedia/src/pjmedia/rtcp.c (modified) (6 diffs)

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

@@ -28 +28 @@
 
 
+#define USE_TIMESTAMP   PJ_HAS_HIGH_RES_TIMER
+
 
 /*
@@ -46 +48 @@
 
 PJ_DEF(void) pjmedia_rtcp_init(pjmedia_rtcp_session *s, 
+                               unsigned clock_rate,
                                pj_uint32_t ssrc)
 {
@@ -52 +55 @@
     pj_memset(rtcp_pkt, 0, sizeof(pjmedia_rtcp_pkt));
     
+    /* Set clock rate */
+    s->clock_rate = clock_rate;
+
     /* Init time */
     s->rtcp_lsr.hi = s->rtcp_lsr.lo = 0;
@@ -65 +71 @@
     rtcp_pkt->sr.ssrc = pj_htonl(ssrc);
     
+    /* Get timestamp frequency */
+#if USE_TIMESTAMP
+    pj_get_timestamp_freq(&s->ts_freq);
+#endif
+
     /* RR will be initialized on receipt of the first RTP packet. */
 }
@@ -91 +102 @@
     pj_uint32_t arrival;
     pj_int32_t transit;
-    unsigned long timer_tick;
-    pj_time_val tv;
     int status;
 
@@ -107 +116 @@
     ++s->received;
 
-    pj_gettimeofday(&tv);
-    timer_tick = tv.sec * 1000 + tv.msec;
-    
     /*
      * Calculate jitter (s->jitter is in timer tick unit)
      */
-    PJ_TODO(SUPPORT_JITTER_CALCULATION_FOR_NON_8KHZ_SAMPLE_RATE)
-
-    arrival = timer_tick << 3;  // 8 samples per ms.
+#if USE_TIMESTAMP
+    {
+        pj_timestamp ts;
+
+        pj_get_timestamp(&ts);
+
+        /* Convert timestamp to samples */
+        ts.u64 = ts.u64 * s->clock_rate / s->ts_freq.u64;
+        arrival = (pj_uint32_t)ts.u64;
+    }
+#else
+    {
+        pj_time_val tv;
+        unsigned long timer_tick;
+
+        pj_gettimeofday(&tv);
+        timer_tick = tv.sec * 1000 + tv.msec;
+
+        /* Convert timer tick to samples */
+        arrival = timer_tick * s->clock_rate / 1000;
+    }
+#endif
+
     transit = arrival - rtp_ts;