Changeset 887 for pjproject/trunk/pjmedia/src/pjmedia/conference.c

Timestamp:

Jan 20, 2007 5:14:24 AM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #70: Frame timestamp not propagated correctly in PJMEDIA

File:

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

pjproject/trunk/pjmedia/src/pjmedia/conference.c

@@ -1312 +1312 @@
  */
 static pj_status_t write_port(pjmedia_conf *conf, struct conf_port *cport,
-                              pj_uint32_t timestamp, 
+                              const pj_timestamp *timestamp, 
                               pjmedia_frame_type *frm_type)
 {
     pj_int16_t *buf;
-    unsigned j;
+    unsigned j, ts;
     pj_status_t status;
 
@@ -1332 +1332 @@
         pjmedia_frame frame;
 
+        /* Adjust the timestamp */
+        frame.timestamp.u64 = timestamp->u64 * cport->clock_rate /
+                                conf->clock_rate;
         frame.type = PJMEDIA_FRAME_TYPE_NONE;
         frame.buf = NULL;
@@ -1458 +1461 @@
             frame.buf = (pj_int16_t*)cport->mix_buf;
             frame.size = conf->samples_per_frame * BYTES_PER_SAMPLE;
-            frame.timestamp.u64 = timestamp;
+            /* No need to adjust timestamp, port has the same
+             * clock rate as conference bridge 
+             */
+            frame.timestamp = *timestamp;
 
             TRACE_((THIS_FILE, "put_frame %.*s, count=%d", 
@@ -1492 +1498 @@
     /* Transmit while we have enough frame in the tx_buf. */
     status = PJ_SUCCESS;
+    ts = 0;
     while (cport->tx_buf_count >= cport->samples_per_frame &&
            status == PJ_SUCCESS) 
@@ -1506 +1513 @@
             frame.buf = cport->tx_buf;
             frame.size = cport->samples_per_frame * BYTES_PER_SAMPLE;
-            frame.timestamp.u64 = timestamp;
+            /* Adjust timestamp as port may have different clock rate
+             * than the bridge.
+             */
+            frame.timestamp.u64 = timestamp->u64 * cport->clock_rate /
+                                  conf->clock_rate;
+
+            /* Add timestamp for individual frame */
+            frame.timestamp.u64 += ts;
+            ts += cport->samples_per_frame;
 
             TRACE_((THIS_FILE, "put_frame %.*s, count=%d", 
@@ -1747 +1762 @@
         ++ci;
 
-        status = write_port( conf, conf_port, frame->timestamp.u32.lo,
+        status = write_port( conf, conf_port, &frame->timestamp,
                              &frm_type);
         if (status != PJ_SUCCESS) {