Ticket #587: ticket587.patch

pjmedia/src/pjmedia/conference.c

@@ -1691 +1691 @@
     pjmedia_frame_type speaker_frame_type = PJMEDIA_FRAME_TYPE_NONE;
     unsigned ci, cj, i, j;
     pj_int16_t *p_in;
+    pj_status_t status;
     
     TRACE_((THIS_FILE, "- clock -"));
 
@@ -1724 +1725 @@
     /* 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) {
+    for (i=1, ci=0; i<conf->max_ports && ci<conf->port_cnt-1; ++i) {
         struct conf_port *conf_port = conf->ports[i];
         pj_int32_t level = 0;
 
@@ -1870 +1871 @@
         } /* loop the listeners of conf port */
     } /* loop of all conf ports */
 
-    /* Time for all ports to transmit whetever they have in their
-     * buffer. 
-     */
-    for (i=0, ci=0; i<conf->max_ports && ci<conf->port_cnt; ++i) {
-        struct conf_port *conf_port = conf->ports[i];
-        pjmedia_frame_type frm_type;
-        pj_status_t status;
-
-        if (!conf_port)
-            continue;
-
-        /* Var "ci" is to count how many ports have been visited. */
-        ++ci;
-
-        status = write_port( conf, conf_port, &frame->timestamp,
-                             &frm_type);
-        if (status != PJ_SUCCESS) {
-            /* bennylp: why do we need this????
-               One thing for sure, put_frame()/write_port() may return
-               non-successfull status on Win32 if there's temporary glitch
-               on network interface, so disabling the port here does not
-               sound like a good idea.
-
-            PJ_LOG(4,(THIS_FILE, "Port %.*s put_frame() returned %d. "
-                                 "Port is now disabled",
-                                 (int)conf_port->name.slen,
-                                 conf_port->name.ptr,
-                                 status));
-            conf_port->tx_setting = PJMEDIA_PORT_DISABLE;
-            */
-            continue;
-        }
-
-        /* Set the type of frame to be returned to sound playback
-         * device.
-         */
-        if (i == 0)
-            speaker_frame_type = frm_type;
-    }
-
-    /* Return sound playback frame. */
-    if (conf->ports[0]->tx_level) {
+    /* Get speaker frame */
+    status = write_port(conf, conf->ports[0], &frame->timestamp,
+                        &speaker_frame_type);
+    if (status != PJ_SUCCESS || conf->ports[0]->tx_level == 0) {
+        /* Force frame type NONE */
+        speaker_frame_type = PJMEDIA_FRAME_TYPE_NONE;
+    } else {
         TRACE_((THIS_FILE, "write to audio, count=%d", 
                            conf->samples_per_frame));
         pjmedia_copy_samples( (pj_int16_t*)frame->buf, 
                               (const pj_int16_t*)conf->ports[0]->mix_buf, 
                               conf->samples_per_frame);
-    } else {
-        /* Force frame type NONE */
-        speaker_frame_type = PJMEDIA_FRAME_TYPE_NONE;
     }
 
     /* MUST set frame type */
@@ -1960 +1923 @@
     pjmedia_conf *conf = (pjmedia_conf*) this_port->port_data.pdata;
     struct conf_port *port = conf->ports[this_port->port_data.ldata];
     pj_status_t status;
+    unsigned i, ci;
+    pj_int16_t *p_in = (pj_int16_t*)frame->buf;
 
     /* Check for correct size. */
     PJ_ASSERT_RETURN( frame->size == conf->samples_per_frame *
@@ -1974 +1939 @@
         return PJ_SUCCESS;
     }
 
+    /* Add mic signal to all listeners. */
+    for (i=0; i < conf->ports[0]->listener_cnt; ++i) {
+        struct conf_port *listener;
+        pj_int32_t *mix_buf;
+        unsigned k;
+
+        listener = conf->ports[conf->ports[0]->listener_slots[i]];
+
+        /* Skip if this listener doesn't want to receive audio */
+        if (listener->tx_setting != PJMEDIA_PORT_ENABLE)
+            continue;
+
+        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;
+
+            }
+        }
+    }
+
+    /* Time for all ports to transmit whetever they have in their
+     * buffer. 
+     */
+    for (i=1, ci=0; i<conf->max_ports && ci<conf->port_cnt-1; ++i) {
+        struct conf_port *conf_port = conf->ports[i];
+        pjmedia_frame_type frm_type;
+        pj_status_t status;
+
+        /* Skip empty port. */
+        if (!conf_port)
+            continue;
+
+        status = write_port( conf, conf_port, &frame->timestamp,
+                             &frm_type);
+
+        pj_bzero(conf_port->mix_buf, 
+                 conf->samples_per_frame * sizeof(conf_port->mix_buf[0]));
+
+
+        if (status != PJ_SUCCESS) {
+            /* bennylp: why do we need this????
+               One thing for sure, put_frame()/write_port() may return
+               non-successfull status on Win32 if there's temporary glitch
+               on network interface, so disabling the port here does not
+               sound like a good idea.
+
+            PJ_LOG(4,(THIS_FILE, "Port %.*s put_frame() returned %d. "
+                                 "Port is now disabled",
+                                 (int)conf_port->name.slen,
+                                 conf_port->name.ptr,
+                                 status));
+            conf_port->tx_setting = PJMEDIA_PORT_DISABLE;
+            */
+            continue;
+        }
+    }
+
     /* Skip if no port is listening to the microphone */
+    /*
     if (port->listener_cnt == 0) {
+        status = pjmedia_delay_buf_put(port->delay_buf, (pj_int16_t*)frame->buf);
+
         return PJ_SUCCESS;
     }
+    */
 
-    status = pjmedia_delay_buf_put(port->delay_buf, (pj_int16_t*)frame->buf);
-
-    return status;
+    return PJ_SUCCESS;
 }