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

Timestamp:

Dec 26, 2006 2:27:14 AM (17 years ago)

Author:

bennylp

Message:

Ticket #51: Added audio level adjustment to PJSUA-API

File:

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

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

@@ -62 +62 @@
 #define SIGNATURE           PJMEDIA_PORT_SIGNATURE('C', 'O', 'N', 'F')
 #define SIGNATURE_PORT      PJMEDIA_PORT_SIGNATURE('C', 'O', 'N', 'P')
+/* Normal level is hardcodec to 128 in all over places */
 #define NORMAL_LEVEL        128
 #define SLOT_TYPE           unsigned
@@ -1138 +1139 @@
 
     /* Value must be from -128 to +127 */
-    PJ_ASSERT_RETURN(adj_level >= -128 && adj_level <= 127, PJ_EINVAL);
+    /* 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);
 
     conf_port = conf->ports[slot];
@@ -1165 +1169 @@
 
     /* Value must be from -128 to +127 */
-    PJ_ASSERT_RETURN(adj_level >= -128 && adj_level <= 127, PJ_EINVAL);
+    /* 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);
 
     conf_port = conf->ports[slot];
@@ -1365 +1372 @@
                  */
                 itemp = input[j];
-                itemp = itemp * adj / NORMAL_LEVEL;
+                /*itemp = itemp * adj / NORMAL_LEVEL; */
+                itemp = (itemp * adj) >> 7;
 
                 /* Clip the signal if it's too loud */
@@ -1397 +1405 @@
 
             /* Adjust the level */
-            itemp = itemp * adj_level / NORMAL_LEVEL;
+            /*itemp = itemp * adj_level / NORMAL_LEVEL;*/
+            itemp = (itemp * adj_level) >> 7;
 
             /* Clip the signal if it's too loud */
@@ -1651 +1660 @@
                  */
                 itemp = input[j];
-                itemp = itemp * adj / NORMAL_LEVEL;
+                /*itemp = itemp * adj / NORMAL_LEVEL;*/
+                itemp = (itemp * adj) >> 7;
 
                 /* Clip the signal if it's too loud */