Changeset 4162 for pjproject/trunk

Timestamp:

Jun 11, 2012 4:17:54 AM (12 years ago)

Author:

nanang

Message:

Re #1532: put back the 'redundant' loop at the beginning.

File:

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

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

@@ -1798 +1798 @@
     pj_mutex_lock(conf->mutex);
 
-    /* Get frames from all ports, and "mix" the signal 
-     * to mix_buf of all listeners of the port.
-     */
-    for (i=0, ci=0; i < conf->max_ports && ci < conf->port_cnt; ++i) {
+    /* Reset port source count. We will only reset port's mix
+     * buffer when we have someone transmitting to it.
+     */
+    for (i=0, ci=0; i<conf->max_ports && ci < conf->port_cnt; ++i) {
         struct conf_port *conf_port = conf->ports[i];
-        pj_int32_t level = 0;
 
         /* Skip empty port. */
@@ -1812 +1811 @@
         ++ci;
 
-        /* Reset buffer (only necessary if more than one transmitter) &
-         * reset auto adjustment level for mixed signal */
+        /* Reset buffer (only necessary if more than one transmitter) and
+         * reset auto adjustment level for mixed signal.
+         */
         conf_port->mix_adj = NORMAL_LEVEL;
         if (conf_port->transmitter_cnt > 1) {
@@ -1819 +1819 @@
                      conf->samples_per_frame*sizeof(conf_port->mix_buf[0]));
         }
+    }
+
+    /* Get frames from all ports, and "mix" the signal 
+     * to mix_buf of all listeners of the port.
+     */
+    for (i=0, ci=0; i < conf->max_ports && ci < conf->port_cnt; ++i) {
+        struct conf_port *conf_port = conf->ports[i];
+        pj_int32_t level = 0;
+
+        /* Skip empty port. */
+        if (!conf_port)
+            continue;
+
+        /* Var "ci" is to count how many ports have been visited so far. */
+        ++ci;
 
         /* Skip if we're not allowed to receive from this port. */