Changeset 6119 for pjproject

Timestamp:

Dec 17, 2019 10:06:01 AM (4 years ago)

Author:

riza

Message:

Close #2258: Add PJSUA2 API to get and set OPUS codec setting.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua2/endpoint.hpp (modified) (1 diff)
• include/pjsua2/media.hpp (modified) (1 diff)
• src/pjsua2/endpoint.cpp (modified) (1 diff)
• src/pjsua2/media.cpp (modified) (1 diff)

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

@@ -1554 +1554 @@
      */
     void resetVideoCodecParam(const string &codec_id) PJSUA2_THROW(Error);
+
+#if defined(PJMEDIA_HAS_OPUS_CODEC) && (PJMEDIA_HAS_OPUS_CODEC!=0)
+    /**
+     * Get codec Opus config.
+     *
+     */
+     CodecOpusConfig getCodecOpusConfig() const PJSUA2_THROW(Error);
+
+    /**
+     * Set codec Opus config.
+     *
+     * @param opus_cfg  Codec Opus configuration.
+     *
+     */
+    void setCodecOpusConfig(const CodecOpusConfig &opus_cfg)
+                            PJSUA2_THROW(Error);
+#endif
 
     /**

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

@@ -2442 +2442 @@
 
 /**
+ * Opus codec parameters setting;
+ */
+struct CodecOpusConfig
+{
+    unsigned   sample_rate; /**< Sample rate in Hz.                     */
+    unsigned   channel_cnt; /**< Number of channels.                    */
+    unsigned   frm_ptime;   /**< Frame time in msec.                    */
+    unsigned   bit_rate;    /**< Encoder bit rate in bps.               */
+    unsigned   packet_loss; /**< Encoder's expected packet loss pct.    */
+    unsigned   complexity;  /**< Encoder complexity, 0-10(10 is highest)*/
+    bool       cbr;         /**< Constant bit rate?                     */
+
+    pjmedia_codec_opus_config toPj() const;
+    void fromPj(const pjmedia_codec_opus_config &config);
+};
+
+/**
  * Detailed codec attributes used in configuring a video codec and in querying
  * the capability of video codec factories. 

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

@@ -2221 +2221 @@
 }
 
+#if defined(PJMEDIA_HAS_OPUS_CODEC) && (PJMEDIA_HAS_OPUS_CODEC!=0)
+
+CodecOpusConfig Endpoint::getCodecOpusConfig() const PJSUA2_THROW(Error)
+{
+   pjmedia_codec_opus_config opus_cfg;
+   CodecOpusConfig config;
+
+   PJSUA2_CHECK_EXPR(pjmedia_codec_opus_get_config(&opus_cfg));
+   config.fromPj(opus_cfg);
+
+   return config;
+}
+
+void Endpoint::setCodecOpusConfig(const CodecOpusConfig &opus_cfg)
+                                  PJSUA2_THROW(Error)
+{
+   const pj_str_t codec_id = {"opus", 4};
+   pjmedia_codec_param param;
+   pjmedia_codec_opus_config new_opus_cfg;
+
+   PJSUA2_CHECK_EXPR(pjsua_codec_get_param(&codec_id, &param));
+
+   PJSUA2_CHECK_EXPR(pjmedia_codec_opus_get_config(&new_opus_cfg));
+
+   new_opus_cfg = opus_cfg.toPj();
+
+   PJSUA2_CHECK_EXPR(pjmedia_codec_opus_set_default_param(&new_opus_cfg,
+                                                          &param));
+}
+
+#endif
+
 void Endpoint::clearCodecInfoList(CodecInfoVector &codec_list)
 {

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

@@ -1824 +1824 @@
 }
 
+pjmedia_codec_opus_config CodecOpusConfig::toPj() const
+{
+    pjmedia_codec_opus_config config;
+
+    config.sample_rate = sample_rate;
+    config.channel_cnt = channel_cnt;
+    config.frm_ptime = frm_ptime;
+    config.bit_rate = bit_rate;
+    config.packet_loss = packet_loss;
+    config.complexity = complexity;
+    config.cbr = cbr;
+
+    return config;
+}
+
+void CodecOpusConfig::fromPj(const pjmedia_codec_opus_config &config)
+{
+    sample_rate = config.sample_rate;
+    channel_cnt = config.channel_cnt;
+    frm_ptime = config.frm_ptime;
+    bit_rate = config.bit_rate;
+    packet_loss = config.packet_loss;
+    complexity = config.complexity;
+    cbr = config.cbr;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 void VidCodecParam::fromPj(const pjmedia_vid_codec_param &param)