Changeset 864

Timestamp:

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

Author:

bennylp

Message:

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

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/conference.c (modified) (6 diffs)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (5 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 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 */

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -76 +76 @@
     pjmedia_snd_port       *snd;
 #endif
+
+    float                   mic_level,
+                            speaker_level;
 
 } app_config;
@@ -210 +213 @@
     cfg->wav_port = PJSUA_INVALID_ID;
     cfg->rec_port = PJSUA_INVALID_ID;
+    cfg->mic_level = cfg->speaker_level = 1.0;
 }
 
@@ -849 +853 @@
             PJ_LOG(1,(THIS_FILE, 
                       "Argument \"%s\" is not valid. Use --help to see help",
-                      argv[pj_optind-1]));
+                      argv[pj_optind]));
             return -1;
         }
@@ -1838 +1842 @@
     puts("| dq  Dump curr. call quality  | cc  Connect port         | dd  Dump detailed |");
     puts("|                              | cd  Disconnect port      | dc  Dump config   |");
-    puts("|  S  Send arbitrary REQUEST   |                          |  f  Save config   |");
+    puts("|  S  Send arbitrary REQUEST   |  V  Adjust audio Volume  |  f  Save config   |");
     puts("+------------------------------+--------------------------+-------------------+");
     puts("|  q  QUIT                                                                    |");
@@ -2714 +2718 @@
             break;
 
+        case 'V':
+            /* Adjust audio volume */
+            sprintf(buf, "Adjust mic level: [%4.1fx] ", app_config.mic_level);
+            if (simple_input(buf,text,sizeof(text))) {
+                char *err;
+                app_config.mic_level = (float)strtod(text, &err);
+                pjsua_conf_adjust_rx_level(0, app_config.mic_level);
+            }
+            sprintf(buf, "Adjust speaker level: [%4.1fx] ", 
+                    app_config.speaker_level);
+            if (simple_input(buf,text,sizeof(text))) {
+                char *err;
+                app_config.speaker_level = (float)strtod(text, &err);
+                pjsua_conf_adjust_tx_level(0, app_config.speaker_level);
+            }
+
+            break;
+
         case 'd':
             if (menuin[1] == 'c') {

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -2624 +2624 @@
 PJ_DECL(pj_status_t) pjsua_conf_disconnect(pjsua_conf_port_id source,
                                            pjsua_conf_port_id sink);
+
+
+/**
+ * Adjust the signal level to be transmitted from the bridge to the 
+ * specified port by making it louder or quieter.
+ *
+ * @param slot          The conference bridge slot number.
+ * @param level         Signal level adjustment. Value 1.0 means no level
+ *                      adjustment, while value 0 means to mute the port.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_conf_adjust_tx_level(pjsua_conf_port_id slot,
+                                                float level);
+
+/**
+ * Adjust the signal level to be received from the specified port (to
+ * the bridge) by making it louder or quieter.
+ *
+ * @param slot          The conference bridge slot number.
+ * @param level         Signal level adjustment. Value 1.0 means no level
+ *                      adjustment, while value 0 means to mute the port.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_conf_adjust_rx_level(pjsua_conf_port_id slot,
+                                                float level);
+
+/**
+ * Get last signal level transmitted to or received from the specified port.
+ * The signal level is an integer value in zero to 255, with zero indicates
+ * no signal, and 255 indicates the loudest signal level.
+ *
+ * @param slot          The conference bridge slot number.
+ * @param tx_level      Optional argument to receive the level of signal
+ *                      transmitted to the specified port (i.e. the direction
+ *                      is from the bridge to the port).
+ * @param rx_level      Optional argument to receive the level of signal
+ *                      received from the port (i.e. the direction is from the
+ *                      port to the bridge).
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsua_conf_get_signal_level(pjsua_conf_port_id slot,
+                                                 unsigned *tx_level,
+                                                 unsigned *rx_level);
+
+/**
+ * 
+ */
+
 
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -674 +674 @@
 
 
+/*
+ * Adjust the signal level to be transmitted from the bridge to the 
+ * specified port by making it louder or quieter.
+ */
+PJ_DEF(pj_status_t) pjsua_conf_adjust_tx_level(pjsua_conf_port_id slot,
+                                               float level)
+{
+    return pjmedia_conf_adjust_tx_level(pjsua_var.mconf, slot,
+                                        (int)((level-1) * 128));
+}
+
+/*
+ * Adjust the signal level to be received from the specified port (to
+ * the bridge) by making it louder or quieter.
+ */
+PJ_DEF(pj_status_t) pjsua_conf_adjust_rx_level(pjsua_conf_port_id slot,
+                                               float level)
+{
+    return pjmedia_conf_adjust_rx_level(pjsua_var.mconf, slot,
+                                        (int)((level-1) * 128));
+}
+
+
+/*
+ * Get last signal level transmitted to or received from the specified port.
+ */
+PJ_DEF(pj_status_t) pjsua_conf_get_signal_level(pjsua_conf_port_id slot,
+                                                unsigned *tx_level,
+                                                unsigned *rx_level)
+{
+    return pjmedia_conf_get_signal_level(pjsua_var.mconf, slot, 
+                                         tx_level, rx_level);
+}
+
 /*****************************************************************************
  * File player.
@@ -1009 +1043 @@
 {
     pjmedia_port *conf_port;
-    const pjmedia_snd_dev_info *cap_info, *play_info;
+    const pjmedia_snd_dev_info *play_info;
     unsigned clock_rates[] = { 0, 22050, 44100, 48000, 11025, 32000, 8000};
     unsigned selected_clock_rate = 0;