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

Timestamp:

Feb 23, 2006 1:49:28 PM (18 years ago)

Author:

bennylp

Message:

Added support for NULL frame in rtp stream, fixed bugs here and there in INVITE (e.g. dont send SDP on 180), and set version to 0.5.1.2

File:

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

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

@@ -54 +54 @@
     pjmedia_port_op      rx_setting;    /**< Can we receive from this port  */
     pjmedia_port_op      tx_setting;    /**< Can we transmit to this port   */
+    int                  listener_cnt;  /**< Number of listeners.           */
     pj_bool_t           *listeners;     /**< Array of listeners.            */
     pjmedia_vad         *vad;           /**< VAD for this port.             */
@@ -468 +469 @@
         src_port->listeners[sink_slot] = 1;
         ++conf->connect_cnt;
+        ++src_port->listener_cnt;
 
         if (conf->connect_cnt == 1)
@@ -506 +508 @@
         src_port->listeners[sink_slot] = 0;
         --conf->connect_cnt;
+        --src_port->listener_cnt;
 
         PJ_LOG(4,(THIS_FILE,"Port %.*s stop transmitting to port %.*s",
@@ -557 +560 @@
         if (conf_port->listeners[port] != 0) {
             --conf->connect_cnt;
+            --conf_port->listener_cnt;
             conf_port->listeners[port] = 0;
         }
@@ -564 +568 @@
     conf_port = conf->ports[port];
     for (i=0; i<conf->max_ports; ++i) {
-        if (conf_port->listeners[i])
+        if (conf_port->listeners[i]) {
             --conf->connect_cnt;
+            --conf_port->listener_cnt;
+        }
     }
 
@@ -694 +700 @@
 
         /* Get frame from this port. 
-         * If port has rx_buffer, then get the frame from the rx_buffer
-         * instead.
+         * If port has rx_buffer (e.g. sound port), then get the frame 
+         * from the rx_buffer instead.
          */
-        if (i==0/*conf_port->cur_rx_buf*/) {
+        if (i==0) {
             pj_int16_t *rx_buf;
 
-            if (conf_port->rx_read == conf_port->rx_write)
-                conf_port->rx_read = (conf_port->rx_write+RX_BUF_COUNT-RX_BUF_COUNT/2) % RX_BUF_COUNT;
+            if (conf_port->rx_read == conf_port->rx_write) {
+                conf_port->rx_read = 
+                    (conf_port->rx_write+RX_BUF_COUNT-RX_BUF_COUNT/2) % 
+                        RX_BUF_COUNT;
+            }
 
             rx_buf = conf_port->rx_buf[conf_port->rx_read];
@@ -708 +717 @@
             }
             conf_port->rx_read = (conf_port->rx_read+1) % RX_BUF_COUNT;
+
         } else {
             pjmedia_frame frame;
@@ -715 +725 @@
             frame.size = size;
             pjmedia_port_get_frame(conf_port->port, &frame);
+
+            if (frame.type == PJMEDIA_FRAME_TYPE_NONE)
+                continue;
         }
 
         /* Skip (after receiving the frame) if this port is muted. */
         if (conf_port->rx_setting == PJMEDIA_PORT_MUTE)
+            continue;
+
+        /* Also skip if this port doesn't have listeners. */
+        if (conf_port->listener_cnt == 0)
             continue;
 
@@ -728 +745 @@
 
         /* Skip if we don't have signal. */
-        if (silence) {
-            TRACE_(("sil:%d ", i));
-            continue;
-        }
+        //if (silence) {
+        //    TRACE_(("sil:%d ", i));
+        //    continue;
+        //}
 
         /* Convert the buffer to unsigned value */
@@ -743 +760 @@
             unsigned k;
 
-            if (conf_port->listeners[j] == 0)
+            if (listener == 0)
                 continue;
 
@@ -768 +785 @@
         if (!conf_port)
             continue;
+
+        if (conf_port->tx_setting == PJMEDIA_PORT_MUTE) {
+            frame.type = PJMEDIA_FRAME_TYPE_NONE;
+            frame.buf = NULL;
+            frame.size = 0;
+            
+            if (conf_port->port)
+                pjmedia_port_put_frame(conf_port->port, &frame);
+
+            continue;
+
+        } else if (conf_port->tx_setting != PJMEDIA_PORT_ENABLE) {
+            continue;
+        }
 
         //
@@ -780 +811 @@
                         conf_port->tx_buf2 : conf_port->tx_buf1);
 
-        if (!conf_port->sources) {
-            for (j=0; j<conf->samples_per_frame; ++j)
-                target_buf[j] = 0;
-        } else {
+        if (conf_port->sources) {
             for (j=0; j<conf->samples_per_frame; ++j) {
                 target_buf[j] = unsigned2pcm(conf_port->sum_buf[j] / conf_port->sources);
@@ -792 +820 @@
         conf_port->cur_tx_buf = target_buf;
 
-        if (conf_port->tx_setting != PJMEDIA_PORT_ENABLE)
-            continue;
-
         pj_memset(&frame, 0, sizeof(frame));
-        frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
+        if (conf_port->sources)
+            frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
+        else
+            frame.type = PJMEDIA_FRAME_TYPE_NONE;
+
         frame.buf = conf_port->cur_tx_buf;
         frame.size = conf->samples_per_frame * conf->bits_per_sample / 8;