Changeset 381

Timestamp:

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

Author:

bennylp

Message:

Changed RTCP timing to use high resolution timestamp

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/rtcp.h (modified) (4 diffs)
• pjmedia/src/pjmedia/rtcp.c (modified) (6 diffs)
• pjmedia/src/pjmedia/stream.c (modified) (1 diff)
• pjsip-apps/src/samples/siprtp.c (modified) (11 diffs)

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

@@ -27 +27 @@
 #include <pjmedia/types.h>
 #include <pjmedia/rtp.h>
+
 
 PJ_BEGIN_DECL
@@ -149 +150 @@
     pjmedia_rtp_seq_session seq_ctrl;   /**< RTCP sequence number control.  */
 
+    unsigned        clock_rate;     /**< Clock rate.                        */
     pj_uint32_t     received;       /**< # pkts received                    */
     pj_uint32_t     expected_prior; /**< # pkts expected at last interval   */
@@ -154 +156 @@
     pj_int32_t      transit;        /**< Relative trans time for prev pkt   */
     pj_uint32_t     jitter;         /**< Estimated jitter                   */
-    
+    pj_timestamp    ts_freq;        /**< System timestamp frequency.        */
+
     pjmedia_rtcp_ntp_rec rtcp_lsr;       /**< NTP ts in last SR received    */
     unsigned             rtcp_lsr_time;  /**< Time when last SR is received.*/
@@ -174 +177 @@
  */
 PJ_DECL(void) pjmedia_rtcp_init( pjmedia_rtcp_session *session, 
+                                 unsigned clock_rate,
                                  pj_uint32_t ssrc );
 

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;
     

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -739 +739 @@
     /* Init RTCP session: */
 
-    pjmedia_rtcp_init(&stream->rtcp, info->ssrc);
+    pjmedia_rtcp_init(&stream->rtcp, info->fmt.sample_rate, info->ssrc);
 
 

pjproject/trunk/pjsip-apps/src/samples/siprtp.c

@@ -29 +29 @@
 
 #include <stdlib.h>
+
+
+#if PJ_HAS_HIGH_RES_TIMER==0
+#   error "High resolution timer is needed for this sample"
+#endif
 
 #define THIS_FILE       "siprtp.c"
@@ -989 +994 @@
 static int media_thread(void *arg)
 {
+    enum { RTCP_INTERVAL = 5 };
     struct media_stream *strm = arg;
     char packet[1500];
-    pj_time_val next_rtp, next_rtcp;
-
-    pj_gettimeofday(&next_rtp);
-    next_rtp.msec += strm->samples_per_frame * 1000 / strm->clock_rate;
-    pj_time_val_normalize(&next_rtp);
+    unsigned msec_interval;
+    pj_timestamp freq, next_rtp, next_rtcp;
+
+    msec_interval = strm->samples_per_frame * 1000 / strm->clock_rate;
+    pj_get_timestamp_freq(&freq);
+
+    pj_get_timestamp(&next_rtp);
+    next_rtp.u64 += (freq.u64 * msec_interval / 1000);
 
     next_rtcp = next_rtp;
-    next_rtcp.sec += 5;
+    next_rtcp.u64 += (freq.u64 * RTCP_INTERVAL);
 
 
     while (!strm->thread_quit_flag) {
         pj_fd_set_t set;
-        pj_time_val now, lesser, timeout;
+        pj_timestamp now, lesser;
+        pj_time_val timeout;
         int rc;
 
         /* Determine how long to sleep */
-        if (PJ_TIME_VAL_LT(next_rtp, next_rtcp))
+        if (next_rtp.u64 < next_rtcp.u64)
             lesser = next_rtp;
         else
             lesser = next_rtcp;
 
-        pj_gettimeofday(&now);
-        if (PJ_TIME_VAL_LTE(lesser, now))
+        pj_get_timestamp(&now);
+        if (lesser.u64 <= now.u64) {
             timeout.sec = timeout.msec = 0;
-        else {
-            timeout = lesser;
-            PJ_TIME_VAL_SUB(timeout, now);
+            //printf("immediate "); fflush(stdout);
+        } else {
+            pj_uint64_t tick_delay;
+            tick_delay = lesser.u64 - now.u64;
+            timeout.sec = 0;
+            timeout.msec = (pj_uint32_t)(tick_delay * 1000 / freq.u64);
+            pj_time_val_normalize(&timeout);
+
+            //printf("%d:%03d ", timeout.sec, timeout.msec); fflush(stdout);
         }
 
@@ -1026 +1042 @@
         rc = pj_sock_select(FD_SETSIZE, &set, NULL, NULL, &timeout);
 
-        if (PJ_FD_ISSET(strm->rtp_sock, &set)) {
+        if (rc > 0 && PJ_FD_ISSET(strm->rtp_sock, &set)) {
 
             /*
@@ -1075 +1091 @@
                                 pj_ntohl(hdr->ts));
 
-        } else if (PJ_FD_ISSET(strm->rtcp_sock, &set)) {
+        } 
+        
+        if (rc > 0 && PJ_FD_ISSET(strm->rtcp_sock, &set)) {
 
             /*
@@ -1115 +1133 @@
 
 
-        pj_gettimeofday(&now);
-
-        if (PJ_TIME_VAL_LTE(next_rtp, now)) {
+        pj_get_timestamp(&now);
+
+        if (next_rtp.u64 <= now.u64) {
             /*
              * Time to send RTP packet.
@@ -1155 +1173 @@
 
             /* Schedule next send */
-            next_rtp.msec += strm->samples_per_frame * 1000 / strm->clock_rate;
-            pj_time_val_normalize(&next_rtp);
+            next_rtp.u64 += (msec_interval * freq.u64 / 1000);
 
             /* Update stats */
@@ -1164 +1181 @@
 
 
-        if (PJ_TIME_VAL_LTE(next_rtcp, now)) {
+        if (next_rtcp.u64 <= now.u64) {
             /*
              * Time to send RTCP packet.
@@ -1209 +1226 @@
             }
 
-            next_rtcp.sec += 5;
+            next_rtcp.u64 += (freq.u64 * RTCP_INTERVAL);
         }
 
@@ -1282 +1299 @@
                              pj_rand());
     pjmedia_rtp_session_init(&audio->in_sess, audio->si.fmt.pt, 0);
-    pjmedia_rtcp_init(&audio->rtcp, 0);
+    pjmedia_rtcp_init(&audio->rtcp, audio->clock_rate, 0);
 
 
@@ -1780 +1797 @@
     }
 
+    /* Start worker threads */
+    for (i=0; i<app.thread_count; ++i) {
+        pj_thread_create( app.pool, "app", &worker_thread, NULL,
+                          0, 0, &app.thread[i]);
+    }
+
     /* If URL is specified, then make call immediately */
     if (app.uri_to_call.slen) {
@@ -1801 +1824 @@
     }
 
-    /* Start worker threads */
-    for (i=0; i<app.thread_count; ++i) {
-        pj_thread_create( app.pool, "app", &worker_thread, NULL,
-                          0, 0, &app.thread[i]);
-    }
-
     /* Start user interface loop */
     console_main();