Changeset 1692 for pjproject/trunk

Timestamp:

Jan 14, 2008 6:35:51 PM (17 years ago)

Author:

bennylp

Message:

Related to ticket #449: fixed bug when rx volume adjustment caused static noise (thanks Norman Franke)

File:

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

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

@@ -1413 +1413 @@
     cport->last_mix_adj = cport->mix_adj;
 
-    adj_level = cport->tx_adj_level * cport->mix_adj / NORMAL_LEVEL;
+    /* adj_level = cport->tx_adj_level * cport->mix_adj / NORMAL_LEVEL;*/
+    adj_level = cport->tx_adj_level * cport->mix_adj;
+    adj_level >>= 7;
+
     tx_level = 0;
 
@@ -1677 +1680 @@
                 itemp = p_in[j];
                 /*itemp = itemp * adj / NORMAL_LEVEL;*/
-                itemp = (itemp * conf_port->rx_adj_level) >> 7;
+                /* bad code (signed/unsigned badness):
+                 *  itemp = (itemp * conf_port->rx_adj_level) >> 7;
+                 */
+                itemp *= conf_port->rx_adj_level;
+                itemp >>= 7;
 
                 /* Clip the signal if it's too loud */