Changeset 4680 for pjproject

Timestamp:

Dec 5, 2013 4:15:24 AM (11 years ago)

Author:

bennylp

Message:

Re #1519: added Tx/Rx? level adjustment in conf port info in pjsua-lib and pjsua2, and format in conf_port_info

Location:

pjproject/branches/projects/pjsua2/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (2 diffs)
• include/pjsua2/media.hpp (modified) (4 diffs)
• src/pjsua-lib/pjsua_aud.c (modified) (1 diff)
• src/pjsua2/media.cpp (modified) (2 diffs)

pjproject/branches/projects/pjsua2/pjsip/include/pjsua-lib/pjsua.h

@@ -5800 +5800 @@
     pj_str_t            name;
 
+    /** Format. */
+    pjmedia_format      format;
+
     /** Clock rate. */
     unsigned            clock_rate;
@@ -5811 +5814 @@
     /** Bits per sample */
     unsigned            bits_per_sample;
+
+    /** Tx level adjustment. */
+    float               tx_level_adj;
+
+    /** Rx level adjustment. */
+    float               rx_level_adj;
 
     /** Number of listeners in the array. */

pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/media.hpp

@@ -123 +123 @@
 
     /**
+     * Tx level adjustment. Value 1.0 means no adjustment, value 0 means
+     * the port is muted, value 2.0 means the level is amplified two times.
+     */
+    float               txLevelAdj;
+
+    /**
+     * Rx level adjustment. Value 1.0 means no adjustment, value 0 means
+     * the port is muted, value 2.0 means the level is amplified two times.
+     */
+    float               rxLevelAdj;
+
+    /**
      * Array of listeners (in other words, ports where this port is
      * transmitting to.
@@ -133 +145 @@
      */
     void fromPj(const pjsua_conf_port_info &port_info);
-
 };
 
@@ -238 +249 @@
     /**
      * Get the last received signal level.
+     *
+     * @return                  Signal level in percent.
      */
     unsigned getRxLevel() const throw(Error);
@@ -243 +256 @@
     /**
      * Get the last transmitted signal level.
+     *
+     * @return                  Signal level in percent.
      */
     unsigned getTxLevel() const throw(Error);

pjproject/branches/projects/pjsua2/pjsip/src/pjsua-lib/pjsua_aud.c

@@ -742 +742 @@
     info->slot_id = id;
     info->name = cinfo.name;
+    info->format = cinfo.format;
     info->clock_rate = cinfo.clock_rate;
     info->channel_count = cinfo.channel_count;
     info->samples_per_frame = cinfo.samples_per_frame;
     info->bits_per_sample = cinfo.bits_per_sample;
+    info->tx_level_adj = ((float)cinfo.tx_adj_level) / 128 + 1;
+    info->rx_level_adj = ((float)cinfo.rx_adj_level) / 128 + 1;
 
     /* Build array of listeners */

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/media.cpp

@@ -76 +76 @@
     portId = port_info.slot_id;
     name = pj2Str(port_info.name);
-
+    format.fromPj(port_info.format);
+    txLevelAdj = port_info.tx_level_adj;
+    rxLevelAdj = port_info.rx_level_adj;
+
+    /*
     format.id = PJMEDIA_FORMAT_PCM;
     format.type = PJMEDIA_TYPE_AUDIO;
@@ -90 +94 @@
                                     port_info.channel_count *
                                     port_info.bits_per_sample;
-
+    */
     listeners.clear();
     for (unsigned i=0; i<port_info.listener_cnt; ++i) {