Changeset 5956

Timestamp:

Mar 21, 2019 8:46:13 AM (6 years ago)

Author:

nanang

Message:

Misc (re #2147): Add info and checks about Extra Audio Device supporting mono channel only.

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -7491 +7491 @@
  * application can install Null Sound Device (i.e: using
  * pjsua_set_null_snd_dev()), which will act as a master port, and instantiate
- * the sound device as extra sound device. But note that extra sound device
- * will not have auto-close upon idle feature.
+ * the sound device as extra sound device.
+ *
+ * Note that extra sound device will not have auto-close upon idle feature.
+ * Also note that currently extra sound device only supports mono channel.
  */
 typedef struct pjsua_ext_snd_dev pjsua_ext_snd_dev;
@@ -7500 +7502 @@
  * Create an extra sound device and register it to conference bridge.
  *
- * @param snd_param     Sound device port param.
+ * @param snd_param     Sound device port param. Currently this only supports
+ *                      mono channel, so channel count must be set to 1.
  * @param p_snd         The extra sound device instance.
  *

pjproject/trunk/pjsip/include/pjsua2/media.hpp

@@ -1401 +1401 @@
 /**
  * Extra audio device. This class allows application to have multiple
- * sound device instances active concurrently. Application may also use
- * this class to improve media clock. Normally media clock is driven by
- * sound device in master port, but unfortunately some sound devices may
- * produce jittery clock. To improve media clock, application can install
- * Null Sound Device (i.e: using AudDevManager::setNullDev()), which will
- * act as a master port, and install the sound device as extra sound device.
+ * sound device instances active concurrently.
+ 
+ * Application may also use this class to improve media clock. Normally
+ * media clock is driven by sound device in master port, but unfortunately
+ * some sound devices may produce jittery clock. To improve media clock,
+ * application can install Null Sound Device (i.e: using
+ * AudDevManager::setNullDev()), which will act as a master port, and
+ * install the sound device as extra sound device.
+ *
  * Note that extra sound device will not have auto-close upon idle feature.
+ * Also note that the extra sound device only supports mono channel.
  */
 class ExtraAudioDevice : public AudioMedia
@@ -1426 +1430 @@
 
     /**
-     * Open the audio device using format (e.g.: clock rate, channel count,
-     * samples per frame) matched to the conference bridge's format.
+     * Open the audio device using format (e.g.: clock rate, bit per sample,
+     * samples per frame) matched to the conference bridge's format, except
+     * the channel count, which will be set to one (mono channel).
      */
     void open();

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

@@ -2388 +2388 @@
 
     PJ_ASSERT_RETURN(param && p_snd, PJ_EINVAL);
+    PJ_ASSERT_RETURN(param->base.channel_count == 1, PJMEDIA_ENCCHANNEL);
 
     pool = pjsua_pool_create("extsnd%p", 512, 512);

pjproject/trunk/pjsip/src/pjsua2/media.cpp

@@ -1095 +1095 @@
     param.base.rec_id = recDev;
     param.base.clock_rate = master_info.clock_rate;
-    param.base.channel_count = master_info.channel_count;
-    param.base.samples_per_frame = master_info.samples_per_frame;
+    param.base.channel_count = 1;
+    param.base.samples_per_frame = master_info.samples_per_frame /
+                                   master_info.channel_count;
     param.base.bits_per_sample = master_info.bits_per_sample;