Changeset 5969 for pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

Timestamp:

Apr 15, 2019 10:52:16 AM (6 years ago)

Author:

nanang

Message:

Close #2189: fixed PJSUA2 thread safety issue in list of objects manipulation.

File:

• pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp (modified) (8 diffs)

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

@@ -978 +978 @@
 void Endpoint::on_buddy_state(pjsua_buddy_id buddy_id)
 {
-    Buddy *buddy = (Buddy*)pjsua_buddy_get_user_data(buddy_id);
+    Buddy b(buddy_id);
+    Buddy *buddy = b.getOriginalInstance();
     if (!buddy || !buddy->isValid()) {
         /* Ignored */
@@ -993 +994 @@
     PJ_UNUSED_ARG(sub);
 
-    Buddy *buddy = (Buddy*)pjsua_buddy_get_user_data(buddy_id);
+    Buddy b(buddy_id);
+    Buddy *buddy = b.getOriginalInstance();
     if (!buddy || !buddy->isValid()) {
         /* Ignored */
@@ -2045 +2047 @@
 }
 
+AudioMediaVector2 Endpoint::mediaEnumPorts2() const throw(Error)
+{
+    AudioMediaVector2 amv2;
+    pjsua_conf_port_id ids[PJSUA_MAX_CONF_PORTS];
+    unsigned i, count = PJSUA_MAX_CONF_PORTS;
+
+    PJSUA2_CHECK_EXPR( pjsua_enum_conf_ports(ids, &count) );
+    for (i = 0; i < count; ++i) {
+        AudioMedia am;
+        am.id = ids[i];
+        amv2.push_back(am);
+    }
+
+    return amv2;
+}
+
 void Endpoint::mediaAdd(AudioMedia &media)
 {
+    /* mediaList serves mediaEnumPorts() only, once mediaEnumPorts()
+     * is removed, this function implementation should be no-op.
+     */
     pj_mutex_lock(mediaListMutex);
 
@@ -2060 +2081 @@
 void Endpoint::mediaRemove(AudioMedia &media)
 {
+    /* mediaList serves mediaEnumPorts() only, once mediaEnumPorts()
+     * is removed, this function implementation should be no-op.
+     */
     pj_mutex_lock(mediaListMutex);
     AudioMediaVector::iterator it = std::find(mediaList.begin(),
@@ -2067 +2091 @@
     if (it != mediaList.end())
         mediaList.erase(it);
-
     pj_mutex_unlock(mediaListMutex);
 }
@@ -2073 +2096 @@
 bool Endpoint::mediaExists(const AudioMedia &media) const
 {
-    bool exists;
-
-    pj_mutex_lock(mediaListMutex);
-    AudioMediaVector::const_iterator it = std::find(mediaList.begin(),
-                                                    mediaList.end(),
-                                                    &media);
-    exists = (it != mediaList.end());
-    pj_mutex_unlock(mediaListMutex);
-    return exists;
+    pjsua_conf_port_id id = media.getPortId();
+    if (id == PJSUA_INVALID_ID || id >= (int)mediaMaxPorts())
+        return false;
+
+    pjsua_conf_port_info pi;
+    return (pjsua_conf_get_port_info(id, &pi) == PJ_SUCCESS);
 }
 
@@ -2108 +2128 @@
 }
 
+CodecInfoVector2 Endpoint::codecEnum2() const throw(Error)
+{
+    CodecInfoVector2 civ2;
+    pjsua_codec_info pj_codec[MAX_CODEC_NUM];
+    unsigned count = MAX_CODEC_NUM;
+
+    PJSUA2_CHECK_EXPR( pjsua_enum_codecs(pj_codec, &count) );
+    for (unsigned i = 0; i<count; ++i) {
+        CodecInfo codec_info;
+        codec_info.fromPj(pj_codec[i]);
+        civ2.push_back(codec_info);
+    }
+    return civ2;
+}
+
 void Endpoint::codecSetPriority(const string &codec_id,
                                 pj_uint8_t priority) throw(Error)
@@ -2169 +2204 @@
 #endif
     return videoCodecInfoList;
+}
+
+CodecInfoVector2 Endpoint::videoCodecEnum2() const throw(Error)
+{
+    CodecInfoVector2 civ2;
+#if PJSUA_HAS_VIDEO
+    pjsua_codec_info pj_codec[MAX_CODEC_NUM];
+    unsigned count = MAX_CODEC_NUM;
+
+    PJSUA2_CHECK_EXPR(pjsua_vid_enum_codecs(pj_codec, &count));
+    for (unsigned i = 0; i<count; ++i) {
+        CodecInfo codec_info;
+        codec_info.fromPj(pj_codec[i]);
+        civ2.push_back(codec_info);
+    }
+#endif
+    return civ2;
 }