Changeset 4378

Timestamp:

Feb 27, 2013 9:50:59 AM (12 years ago)

Author:

nanang

Message:

Re #1532: backported to 1.x

Location:

pjproject/branches/1.x

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/conference.c (modified) (3 diffs)

pjproject/branches/1.x/pjmedia/src/pjmedia/conference.c

@@ -1801 +1801 @@
         struct conf_port *conf_port = conf->ports[i];
 
-        /* Skip empty slot. */
+        /* Skip empty port. */
         if (!conf_port)
             continue;
 
+        /* Var "ci" is to count how many ports have been visited so far. */
         ++ci;
 
-        /* Reset buffer & 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) {
+        if (conf_port->transmitter_cnt > 1) {
             pj_bzero(conf_port->mix_buf,
                      conf->samples_per_frame*sizeof(conf_port->mix_buf[0]));
@@ -1818 +1821 @@
      * to mix_buf of all listeners of the port.
      */
-    for (i=0, ci=0; i<conf->max_ports && ci<conf->port_cnt; ++i) {
+    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;
@@ -1946 +1949 @@
             mix_buf = listener->mix_buf;
 
-            /* Mixing signals,
-             * and calculate appropriate level adjustment if there is
-             * any overflowed level in the mixed signal.
-             */
-            for (k=0; k<conf->samples_per_frame; ++k) {
-                mix_buf[k] += p_in[k];
-                /* Check if normalization adjustment needed. */
-                if (IS_OVERFLOW(mix_buf[k])) {
-                    /* NORMAL_LEVEL * MAX_LEVEL / mix_buf[k]; */
-                    int tmp_adj = (MAX_LEVEL<<7) / mix_buf[k];
-                    if (tmp_adj<0) tmp_adj = -tmp_adj;
-
-                    if (tmp_adj<listener->mix_adj)
-                        listener->mix_adj = tmp_adj;
-
-                } /* if any overflow in the mixed signals */
-            } /* loop mixing signals */
+            if (listener->transmitter_cnt > 1) {
+                /* Mixing signals,
+                 * and calculate appropriate level adjustment if there is
+                 * any overflowed level in the mixed signal.
+                 */
+                for (k=0; k < conf->samples_per_frame; ++k) {
+                    mix_buf[k] += p_in[k];
+                    /* Check if normalization adjustment needed. */
+                    if (IS_OVERFLOW(mix_buf[k])) {
+                        /* NORMAL_LEVEL * MAX_LEVEL / mix_buf[k]; */
+                        int tmp_adj = (MAX_LEVEL<<7) / mix_buf[k];
+                        if (tmp_adj<0) tmp_adj = -tmp_adj;
+
+                        if (tmp_adj<listener->mix_adj)
+                            listener->mix_adj = tmp_adj;
+
+                    } /* if any overflow in the mixed signals */
+                } /* loop mixing signals */
+            } else {
+                /* Only 1 transmitter:
+                 * just copy the samples to the mix buffer
+                 * no mixing and level adjustment needed
+                 */
+                for (k=0; k<conf->samples_per_frame; ++k) {
+                    mix_buf[k] = p_in[k];
+                }
+            }
         } /* loop the listeners of conf port */
     } /* loop of all conf ports */