Changeset 6051

Timestamp:

Aug 15, 2019 5:11:41 AM (5 years ago)

Author:

nanang

Message:

Close #2219: Initialize enum fields in PJSUA2 objects.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua2/account.hpp (modified) (5 diffs)
• include/pjsua2/call.hpp (modified) (2 diffs)
• include/pjsua2/endpoint.hpp (modified) (2 diffs)
• include/pjsua2/media.hpp (modified) (6 diffs)
• include/pjsua2/presence.hpp (modified) (1 diff)
• src/pjsua2/call.cpp (modified) (1 diff)
• src/pjsua2/endpoint.cpp (modified) (1 diff)
• src/pjsua2/siptypes.cpp (modified) (3 diffs)

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

@@ -328 +328 @@
 public:
     /**
+     * Default constructor
+     */
+    AccountCallConfig() : holdType(PJSUA_CALL_HOLD_TYPE_DEFAULT),
+                          prackUse(PJSUA_100REL_NOT_USED),
+                          timerUse(PJSUA_SIP_TIMER_OPTIONAL)
+    {}
+
+    /**
      * Read this object from a container node.
      *
@@ -689 +697 @@
 public:
     /**
+     * Default constructor
+     */
+    AccountNatConfig() : sipStunUse(PJSUA_STUN_USE_DEFAULT),
+                         mediaStunUse(PJSUA_STUN_USE_DEFAULT),
+                         nat64Opt(PJSUA_NAT64_DISABLED),
+                         turnConnType(PJ_TURN_TP_UDP)
+    {}
+
+    /**
      * Read this object from a container node.
      *
@@ -967 +984 @@
 
 public:
+    /**
+     * Default constructor
+     */
+    AccountMediaConfig() : srtpUse(PJSUA_DEFAULT_USE_SRTP),
+                           ipv6Use(PJSUA_IPV6_DISABLED)
+    {}
+
     /**
      * Read this object from a container node.
@@ -1074 +1098 @@
 public:
     /**
+     * Default constructor
+     */
+    AccountVideoConfig() :
+                    rateControlMethod(PJMEDIA_VID_STREAM_RC_SIMPLE_BLOCKING)
+    {}
+
+    /**
      * Read this object from a container node.
      *
@@ -1315 +1346 @@
 
 public:
+    /**
+     * Default constructor
+     */
+    AccountInfo() : regStatus(PJSIP_SC_NULL)
+    {}
+
     /** Import from pjsip data */
     void fromPj(const pjsua_acc_info &pai);

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

@@ -516 +516 @@
 public:
     /**
+     * Default constructor
+     */
+    CallInfo() : id(PJSUA_INVALID_ID),
+                 role(PJSIP_ROLE_UAC),
+                 state(PJSIP_INV_STATE_NULL),
+                 lastStatusCode(PJSIP_SC_NULL)
+    {}
+
+    /**
      * Convert from pjsip
      */
@@ -582 +591 @@
 
 public:
+    /**
+     * Default constructor
+     */
+    StreamInfo() : type(PJMEDIA_TYPE_NONE),
+                   proto(PJMEDIA_TP_PROTO_NONE),
+                   dir(PJMEDIA_DIR_NONE)
+    {}
+
     /**
      * Convert from pjsip

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

@@ -131 +131 @@
     pj_ssl_cert_name_type  type;            /**< Name type              */
     string                 name;            /**< The name               */
+
+public:
+    /**
+     * Default constructor
+     */
+    SslCertName() : type(PJ_SSL_CERT_NAME_UNKNOWN)
+    {}
 };
 
@@ -341 +348 @@
      */
     unsigned        restartLisDelay;
+
 public:
     /**

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

@@ -60 +60 @@
      */
     pjmedia_type        type;
+
+public:
+    /**
+     * Default constructor
+     */
+    MediaFormat() : id(0), type(PJMEDIA_TYPE_NONE)
+    {}
 };
 
@@ -446 +453 @@
      */
     pj_uint32_t         sizeSamples;
+
+public:
+    /**
+     * Default constructor
+     */
+    AudioMediaPlayerInfo() : formatId(PJMEDIA_FORMAT_L16)
+    {}
 };
 
@@ -1984 +1998 @@
     MediaFormatVideoVector fmt;
 
+public:
+    /**
+     * Default constructor
+     */
+    VideoDevInfo() : id(-1), dir(PJMEDIA_DIR_NONE)
+    {}
+
     /**
      * Construct from pjmedia_vid_dev_info.
@@ -2343 +2364 @@
                                              encoder input and decoder
                                              output.                        */
+public:
+    /**
+     * Default constructor
+     */
+    CodecParamInfo() : fmtId(PJMEDIA_FORMAT_L16)
+    {}
 };
 
@@ -2406 +2433 @@
                                              encFmt and decFmt only.        */
 
+public:
+    /**
+     * Default constructor
+     */
+    VidCodecParam() : dir(PJMEDIA_DIR_NONE),
+                      packing(PJMEDIA_VID_PACKING_UNKNOWN)
+    {}
+
     void fromPj(const pjmedia_vid_codec_param &param);
 
@@ -2482 +2517 @@
 public:
     /**
+     * Default constructor
+     */
+    MediaEvent() : type(PJMEDIA_EVENT_NONE)
+    {}
+
+    /**
      * Convert from pjsip
      */

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

@@ -171 +171 @@
 
 public:
+    /**
+     * Default constructor
+     */
+    BuddyInfo() : subState(PJSIP_EVSUB_STATE_UNKNOWN),
+                  subTermCode(PJSIP_SC_NULL)
+    {}
+                    
+
     /** Import from pjsip structure */
     void fromPj(const pjsua_buddy_info &pbi);

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

@@ -246 +246 @@
 
 CallMediaInfo::CallMediaInfo()
-: audioConfSlot(PJSUA_INVALID_ID),
+: type(PJMEDIA_TYPE_NONE),
+  dir(PJMEDIA_DIR_NONE),
+  status(PJSUA_CALL_MEDIA_NONE),
+  audioConfSlot(PJSUA_INVALID_ID),
   videoIncomingWindowId(PJSUA_INVALID_ID),
   videoWindow(PJSUA_INVALID_ID),

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

@@ -45 +45 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-TlsInfo::TlsInfo()
-        : empty(true)
+TlsInfo::TlsInfo() : cipher(PJ_TLS_UNKNOWN_CIPHER),
+                     empty(true)
 {
 }

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

@@ -148 +148 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-TlsConfig::TlsConfig()
+TlsConfig::TlsConfig() : method(PJSIP_SSL_UNSPECIFIED_METHOD),
+                         qosType(PJ_QOS_TYPE_BEST_EFFORT)
 {
     pjsip_tls_setting ts;
@@ -255 +256 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-TransportConfig::TransportConfig()
+TransportConfig::TransportConfig() : qosType(PJ_QOS_TYPE_BEST_EFFORT)
 {
     pjsua_transport_config tc;
@@ -547 +548 @@
 
 SipTransaction::SipTransaction()
-: role(PJSIP_ROLE_UAC), statusCode(PJSIP_SC_NULL), state(PJSIP_TSX_STATE_NULL), pjTransaction(NULL)
+: role(PJSIP_ROLE_UAC), statusCode(PJSIP_SC_NULL),
+  state(PJSIP_TSX_STATE_NULL), pjTransaction(NULL)
 {
 }