Changeset 333

Timestamp:

Mar 19, 2006 12:47:02 AM (19 years ago)

Author:

bennylp

Message:

Fixed no audio bug in new conference, and add level adjustment in port info

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/conference.h (modified) (2 diffs)
• src/pjmedia/conference.c (modified) (15 diffs)

pjproject/trunk/pjmedia/include/pjmedia/conference.h

@@ -48 +48 @@
     unsigned            clock_rate;         /**< Clock rate of the port.    */
     unsigned            samples_per_frame;  /**< Samples per frame          */
+    int                 tx_adj_level;       /**< Tx level adjustment.       */
+    int                 rx_adj_level;       /**< Rx level adjustment.       */
 } pjmedia_conf_port_info;
 
@@ -169 +171 @@
  * @param pool          Pool to allocate buffers for this port.
  * @param strm_port     Stream port interface.
- * @param name          Port name.
+ * @param name          Optional name for the port. If this value is NULL,
+ *                      the name will be taken from the name in the port 
+ *                      info.
  * @param p_slot        Pointer to receive the slot index of the port in
  *                      the conference bridge.

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

@@ -43 +43 @@
 #define BYTES_PER_SAMPLE    2
 
-/*
- * DON'T GET CONFUSED!!
+#define NORMAL_LEVEL        128
+
+
+/*
+ * DON'T GET CONFUSED WITH TX/RX!!
  *
  * TX and RX directions are always viewed from the conference bridge's point
@@ -76 +79 @@
 
     /* The normalized signal level adjustment.
-     * A value of 128 means there's no adjustment.
+     * A value of 128 (NORMAL_LEVEL) means there's no adjustment.
      */
     unsigned             tx_adj_level;  /**< Adjustment for TX.             */
@@ -203 +206 @@
 
     /* Default level adjustment is 128 (which means no adjustment) */
-    conf_port->tx_adj_level = 128;
-    conf_port->rx_adj_level = 128;
+    conf_port->tx_adj_level = NORMAL_LEVEL;
+    conf_port->rx_adj_level = NORMAL_LEVEL;
 
     /* Create transmit flag array */
@@ -561 +564 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(conf && pool && strm_port && port_name, PJ_EINVAL);
+    PJ_ASSERT_RETURN(conf && pool && strm_port, PJ_EINVAL);
+
+    /* If port_name is not specified, use the port's name */
+    if (!port_name)
+        port_name = &strm_port->info.name;
 
     /* For this version of PJMEDIA, port MUST have the same number of
@@ -825 +832 @@
     info->clock_rate = conf_port->clock_rate;
     info->samples_per_frame = conf_port->samples_per_frame;
+    info->tx_adj_level = conf_port->tx_adj_level - NORMAL_LEVEL;
+    info->rx_adj_level = conf_port->rx_adj_level - NORMAL_LEVEL;
 
     return PJ_SUCCESS;
@@ -902 +911 @@
 
     /* Set normalized adjustment level. */
-    conf_port->rx_adj_level = adj_level + 128;
+    conf_port->rx_adj_level = adj_level + NORMAL_LEVEL;
 
     return PJ_SUCCESS;
@@ -929 +938 @@
 
     /* Set normalized adjustment level. */
-    conf_port->tx_adj_level = adj_level + 128;
+    conf_port->tx_adj_level = adj_level + NORMAL_LEVEL;
 
     return PJ_SUCCESS;
@@ -1077 +1086 @@
         frame.size = 0;
 
-        if (cport->port)
+        if (cport->port && cport->port->put_frame)
             pjmedia_port_put_frame(cport->port, &frame);
 
@@ -1097 +1106 @@
     buf = (pj_int16_t*)cport->mix_buf;
 
-    if (cport->tx_adj_level != 128) {
+    if (cport->tx_adj_level != NORMAL_LEVEL) {
 
         unsigned adj_level = cport->tx_adj_level;
@@ -1111 +1120 @@
 
             /* Adjust the level */
-            itemp = itemp * adj_level / 128;
+            itemp = itemp * adj_level / NORMAL_LEVEL;
 
             /* Clip the signal if it's too loud */
@@ -1156 +1165 @@
         cport->samples_per_frame == conf->samples_per_frame)
     {
-        pjmedia_frame frame;
-
-        frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
-        frame.buf = (pj_int16_t*)cport->mix_buf;
-        frame.size = conf->samples_per_frame * BYTES_PER_SAMPLE;
-        frame.timestamp.u64 = timestamp;
-
-        if (cport->port != NULL)
+        if (cport->port != NULL) {
+            pjmedia_frame frame;
+
+            frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
+            frame.buf = (pj_int16_t*)cport->mix_buf;
+            frame.size = conf->samples_per_frame * BYTES_PER_SAMPLE;
+            frame.timestamp.u64 = timestamp;
+
             return pjmedia_port_put_frame(cport->port, &frame);
-        else
+        } else
             return PJ_SUCCESS;
     }
@@ -1193 +1202 @@
     if (cport->tx_buf_count >= cport->samples_per_frame) {
         
-        pjmedia_frame frame;
         pj_status_t status;
 
-        frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
-        frame.buf = cport->tx_buf;
-        frame.size = cport->samples_per_frame * BYTES_PER_SAMPLE;
-        frame.timestamp.u64 = timestamp;
-
-        if (cport->port)
+        if (cport->port) {
+            pjmedia_frame frame;
+
+            frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
+            frame.buf = cport->tx_buf;
+            frame.size = cport->samples_per_frame * BYTES_PER_SAMPLE;
+            frame.timestamp.u64 = timestamp;
+
             status = pjmedia_port_put_frame(cport->port, &frame);
-        else
+
+        } else
             status = PJ_SUCCESS;
 
@@ -1330 +1341 @@
          * Otherwise just calculate the averate level.
          */
-        if (conf_port->rx_adj_level != 128) {
+        if (conf_port->rx_adj_level != NORMAL_LEVEL) {
             pj_int16_t *input = frame->buf;
             pj_int32_t adj = conf_port->rx_adj_level;
@@ -1343 +1354 @@
                  */
                 itemp = input[j];
-                itemp = itemp * adj / 128;
+                itemp = itemp * adj / NORMAL_LEVEL;
 
                 /* Clip the signal if it's too loud */
@@ -1435 +1446 @@
     }
 
+    /* MUST set frame type */
+    frame->type = PJMEDIA_FRAME_TYPE_AUDIO;
+
     pj_mutex_unlock(conf->mutex);