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

Timestamp:

Apr 27, 2006 10:36:40 PM (18 years ago)

Author:

bennylp

Message:

Initial support for stereo codecs, and added L16 codecs. Also better handling for case remote media is restarted

File:

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

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

@@ -238 +238 @@
     if (port) {
         conf_port->port = port;
-        conf_port->clock_rate = port->info.sample_rate;
+        conf_port->clock_rate = port->info.clock_rate;
         conf_port->samples_per_frame = port->info.samples_per_frame;
     } else {
@@ -443 +443 @@
     conf->master_port->info.need_info = 0;
     conf->master_port->info.pt = 0xFF;
-    conf->master_port->info.sample_rate = clock_rate;
+    conf->master_port->info.clock_rate = clock_rate;
     conf->master_port->info.samples_per_frame = samples_per_frame;
     conf->master_port->info.signature = 0;
@@ -1091 +1091 @@
     pj_int16_t *buf;
     unsigned j;
+    pj_status_t status;
 
     /* If port is muted or nobody is transmitting to this port, 
@@ -1181 +1182 @@
     }
 
-    /* If port has the same clock_date and samples_per_frame settings as
+    /* If port has the same clock_rate and samples_per_frame settings as
      * the conference bridge, transmit the frame as is.
      */
@@ -1225 +1226 @@
     }
 
-    /* Transmit once we have enough frame in the tx_buf. */
-    if (cport->tx_buf_count >= cport->samples_per_frame) {
+    /* Transmit while we have enough frame in the tx_buf. */
+    status = PJ_SUCCESS;
+    while (cport->tx_buf_count >= cport->samples_per_frame &&
+           status == PJ_SUCCESS) 
+    {
         
-        pj_status_t status;
-
         TRACE_((THIS_FILE, "write_port %.*s: count=%d", 
                            (int)cport->name.slen, cport->name.ptr,
@@ -1260 +1262 @@
         TRACE_((THIS_FILE, " tx_buf count now is %d", 
                            cport->tx_buf_count));
-
-        return status;
-    }
-
-    return PJ_SUCCESS;
+    }
+
+    return status;
 }