Changeset 3999 for pjproject/trunk/pjmedia/src/pjmedia/conf_switch.c

Timestamp:

Mar 30, 2012 7:10:13 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/conf_switch.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/conf_switch.c

@@ -1087 +1087 @@
             unsigned nsamples_to_copy, nsamples_req;
 
-            /* Copy frame to listener's TX buffer. */
+            /* Copy frame to listener's TX buffer.
+             * Note that if the destination is port 0, just copy the whole
+             * available samples.
+             */
             nsamples_to_copy = f_end - f_start;
             nsamples_req = cport_dst->samples_per_frame -
                           (frm_dst->size>>1);
-            if (nsamples_to_copy > nsamples_req)
+            if (cport_dst->slot && nsamples_to_copy > nsamples_req)
                 nsamples_to_copy = nsamples_req;
 
@@ -1124 +1127 @@
             /* Check if it's time to deliver the TX buffer to listener, 
              * i.e: samples count in TX buffer equal to listener's
-             * samples per frame.
+             * samples per frame. Note that for destination port 0 this
+             * function will just populate all samples in the TX buffer.
              */
-            if ((frm_dst->size >> 1) == cport_dst->samples_per_frame)
+            if (cport_dst->slot == 0) {
+                /* Update TX timestamp. */
+                pj_add_timestamp32(&cport_dst->ts_tx, nsamples_to_copy);
+            } else if ((frm_dst->size >> 1) == 
+                       cport_dst->samples_per_frame)
             {
-                if (cport_dst->slot) {
-                    pjmedia_port_put_frame(cport_dst->port, frm_dst);
-
-                    /* Reset TX buffer. */
-                    frm_dst->size = 0;
-                }
+                pjmedia_port_put_frame(cport_dst->port, frm_dst);
+
+                /* Reset TX buffer. */
+                frm_dst->size = 0;
 
                 /* Update TX timestamp. */