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

Timestamp:

May 15, 2018 8:23:44 AM (6 years ago)

Author:

ming

Message:

Closed #2113: Implement conference signal level adjustment for a specific connection

File:

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

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

@@ -118 +118 @@
     unsigned             listener_cnt;  /**< Number of listeners.           */
     SLOT_TYPE           *listener_slots;/**< Array of listeners.            */
+    unsigned            *listener_adj_level;
+                                        /**< Array of listeners' level
+                                             adjustment.                    */
     unsigned             transmitter_cnt;/**<Number of transmitters.        */
 
@@ -134 +137 @@
     unsigned             tx_adj_level;  /**< Adjustment for TX.             */
     unsigned             rx_adj_level;  /**< Adjustment for RX.             */
+    pj_int16_t          *adj_level_buf; /**< The adjustment buffer.         */
 
     /* Resample, for converting clock rate, if they're different. */
@@ -282 +286 @@
 
     /* Create transmit flag array */
-    conf_port->listener_slots = (SLOT_TYPE*)
-                                pj_pool_zalloc(pool, 
-                                          conf->max_ports * sizeof(SLOT_TYPE));
+    conf_port->listener_slots = (SLOT_TYPE*) pj_pool_zalloc(pool, 
+                                          conf->max_ports * sizeof(SLOT_TYPE));
     PJ_ASSERT_RETURN(conf_port->listener_slots, PJ_ENOMEM);
+
+    /* Create adjustment level array */
+    conf_port->listener_adj_level = (unsigned *) pj_pool_zalloc(pool, 
+                                       conf->max_ports * sizeof(unsigned));
+    PJ_ASSERT_RETURN(conf_port->listener_adj_level, PJ_ENOMEM);
 
     /* Save some port's infos, for convenience. */
@@ -302 +310 @@
         conf_port->channel_count = conf->channel_count;
     }
+
+    /* Create adjustment level buffer. */
+    conf_port->adj_level_buf = (pj_int16_t*) pj_pool_zalloc(pool, 
+                               conf->samples_per_frame * sizeof(pj_int16_t));
 
     /* If port's clock rate is different than conference's clock rate,
@@ -949 +961 @@
                                                unsigned src_slot,
                                                unsigned sink_slot,
-                                               int level )
+                                               int adj_level )
 {
     struct conf_port *src_port, *dst_port;
@@ -959 +971 @@
                      sink_slot<conf->max_ports, PJ_EINVAL);
 
-    /* For now, level MUST be zero. */
-    PJ_ASSERT_RETURN(level == 0, PJ_EINVAL);
+    /* Value must be from -128 to +127 */
+    /* Disabled, you can put more than +127, at your own risk:
+     PJ_ASSERT_RETURN(adj_level >= -128 && adj_level <= 127, PJ_EINVAL);
+     */
+    PJ_ASSERT_RETURN(adj_level >= -128, PJ_EINVAL);
 
     pj_mutex_lock(conf->mutex);
@@ -980 +995 @@
     if (i == src_port->listener_cnt) {
         src_port->listener_slots[src_port->listener_cnt] = sink_slot;
+        /* Set normalized adjustment level. */
+        src_port->listener_adj_level[src_port->listener_cnt] = adj_level +
+                                                               NORMAL_LEVEL;
         ++conf->connect_cnt;
         ++src_port->listener_cnt;
@@ -1387 +1405 @@
     pj_mutex_unlock(conf->mutex);
 
+    return PJ_SUCCESS;
+}
+
+/*
+ * Adjust level of individual connection.
+ */
+PJ_DEF(pj_status_t) pjmedia_conf_adjust_conn_level( pjmedia_conf *conf,
+                                                    unsigned src_slot,
+                                                    unsigned sink_slot,
+                                                    int adj_level )
+{
+    struct conf_port *src_port, *dst_port;
+    unsigned i;
+
+    /* Check arguments */
+    PJ_ASSERT_RETURN(conf && src_slot<conf->max_ports &&
+                     sink_slot<conf->max_ports, PJ_EINVAL);
+
+    /* Value must be from -128 to +127 */
+    /* Disabled, you can put more than +127, at your own risk:
+     PJ_ASSERT_RETURN(adj_level >= -128 && adj_level <= 127, PJ_EINVAL);
+     */
+    PJ_ASSERT_RETURN(adj_level >= -128, PJ_EINVAL);
+
+    pj_mutex_lock(conf->mutex);
+
+    /* Ports must be valid. */
+    src_port = conf->ports[src_slot];
+    dst_port = conf->ports[sink_slot];
+    if (!src_port || !dst_port) {
+        pj_mutex_unlock(conf->mutex);
+        return PJ_EINVAL;
+    }
+
+    /* Check if connection has been made */
+    for (i=0; i<src_port->listener_cnt; ++i) {
+        if (src_port->listener_slots[i] == sink_slot)
+            break;
+    }
+
+    if (i == src_port->listener_cnt) {
+        /* connection hasn't been made */
+        pj_mutex_unlock(conf->mutex);
+        return PJ_EINVAL;
+    } 
+    /* Set normalized adjustment level. */
+    src_port->listener_adj_level[i] = adj_level + NORMAL_LEVEL;
+
+    pj_mutex_unlock(conf->mutex);
     return PJ_SUCCESS;
 }
@@ -1953 +2020 @@
         {
             struct conf_port *listener;
-            pj_int32_t *mix_buf;
+            pj_int32_t *mix_buf;            
+            pj_int16_t *p_in_conn_leveled;
 
             listener = conf->ports[conf_port->listener_slots[cj]];
@@ -1962 +2030 @@
 
             mix_buf = listener->mix_buf;
+
+            /* apply connection level, if not normal */
+            if (conf_port->listener_adj_level[cj] != NORMAL_LEVEL) {
+                unsigned k = 0;
+                for (; k < conf->samples_per_frame; ++k) {
+                    /* For the level adjustment, we need to store the sample to
+                     * a temporary 32bit integer value to avoid overflowing the
+                     * 16bit sample storage.
+                     */
+                    pj_int32_t itemp;
+
+                    itemp = p_in[k];
+                    /*itemp = itemp * adj / NORMAL_LEVEL;*/
+                    /* bad code (signed/unsigned badness):
+                     *  itemp = (itemp * conf_port->listsener_adj_level) >> 7;
+                     */
+                    itemp *= conf_port->listener_adj_level[cj];
+                    itemp >>= 7;
+
+                    /* Clip the signal if it's too loud */
+                    if (itemp > MAX_LEVEL) itemp = MAX_LEVEL;
+                    else if (itemp < MIN_LEVEL) itemp = MIN_LEVEL;
+
+                    conf_port->adj_level_buf[k] = (pj_int16_t)itemp;
+                }
+
+                /* take the leveled frame */
+                p_in_conn_leveled = conf_port->adj_level_buf;
+            } else {
+                /* take the frame as-is */
+                p_in_conn_leveled = p_in;
+            }
 
             if (listener->transmitter_cnt > 1) {
@@ -1973 +2073 @@
 
                 for (k = 0; k < samples_per_frame; ++k) {
-                    mix_buf[k] += p_in[k];
+                    mix_buf[k] += p_in_conn_leveled[k];
                     if (mix_buf[k] < mix_buf_min)
                         mix_buf_min = mix_buf[k];
@@ -2000 +2100 @@
 
                 for (k = 0; k < samples_per_frame; ++k) {
-                    mix_buf[k] = p_in[k];
+                    mix_buf[k] = p_in_conn_leveled[k];
                 }
             }