Changeset 5645 for pjproject/trunk/pjsip/include/pjsua2/media.hpp

Timestamp:

Sep 6, 2017 3:44:35 AM (7 years ago)

Author:

riza

Message:

Close #2040: Implement CodecParam? class as a wrapper for pjmedia_codec_param.

File:

• pjproject/trunk/pjsip/include/pjsua2/media.hpp (modified) (3 diffs)

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

@@ -1955 +1955 @@
 
 /**
- * Codec parameters, corresponds to pjmedia_codec_param.
- */
-typedef void *CodecParam;
-
-/**
  * Structure of codec specific parameters which contains name=value pairs.
  * The codec specific parameters are to be used with SDP according to
@@ -1974 +1969 @@
 
 /**
- * Detailed codec attributes used in configuring a codec and in querying
- * the capability of codec factories. 
+ * Audio codec parameters info.
+ */
+struct CodecParamInfo
+{
+    unsigned    clockRate;              /**< Sampling rate in Hz            */
+    unsigned    channelCnt;             /**< Channel count.                 */
+    unsigned    avgBps;                 /**< Average bandwidth in bits/sec  */
+    unsigned    maxBps;                 /**< Maximum bandwidth in bits/sec  */
+    unsigned    maxRxFrameSize;         /**< Maximum frame size             */
+    unsigned    frameLen;               /**< Decoder frame ptime in msec.   */
+    unsigned    pcmBitsPerSample;       /**< Bits/sample in the PCM side    */
+    unsigned    pt;                     /**< Payload type.                  */
+    pjmedia_format_id fmtId;            /**< Source format, it's format of
+                                             encoder input and decoder
+                                             output.                        */
+};
+
+/**
+ * Audio codec parameters setting.
+ */
+struct CodecParamSetting
+{
+    unsigned    frmPerPkt;          /**< Number of frames per packet.   */
+    bool        vad;                /**< Voice Activity Detector.       */
+    bool        cng;                /**< Comfort Noise Generator.       */
+    bool        penh;               /**< Perceptual Enhancement         */
+    bool        plc;                /**< Packet loss concealment        */
+    bool        reserved;           /**< Reserved, must be zero.        */
+    CodecFmtpVector encFmtp;        /**< Encoder's fmtp params.         */
+    CodecFmtpVector decFmtp;        /**< Decoder's fmtp params.         */
+};
+
+/**
+ * Detailed codec attributes used in configuring an audio codec and in querying
+ * the capability of audio codec factories.
+ *
+ * Please note that codec parameter also contains SDP specific setting,
+ * #setting::decFmtp and #setting::encFmtp, which may need to be set 
+ * appropriately based on the effective setting. 
+ * See each codec documentation for more detail.
+ */
+struct CodecParam
+{
+    struct CodecParamInfo info;
+    struct CodecParamSetting setting;
+
+    void fromPj(const pjmedia_codec_param &param);
+
+    pjmedia_codec_param toPj() const;
+};
+
+/**
+ * Detailed codec attributes used in configuring a video codec and in querying
+ * the capability of video codec factories. 
  *
  * Please note that codec parameter also contains SDP specific setting,
@@ -2003 +2050 @@
 
     pjmedia_vid_codec_param toPj() const;
-
-private:
-    void setCodecFmtp(const pjmedia_codec_fmtp &in_fmtp, 
-                      CodecFmtpVector &out_fmtp);
-
-    void getCodecFmtp(const CodecFmtpVector &in_fmtp,
-                      pjmedia_codec_fmtp &out_fmtp) const;
-
 };