Changeset 5969 for pjproject/trunk/pjsip/src/pjsua2/media.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/media.cpp (modified) (6 diffs)

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

@@ -158 +158 @@
 }
 
+void AudioMedia::registerMediaPort2(MediaPort port, pj_pool_t *pool)
+     throw(Error)
+{
+    /* Check if media already added to Conf bridge. */
+    pj_assert(!Endpoint::instance().mediaExists(*this));
+
+    if (port != NULL) {
+        pj_assert(id == PJSUA_INVALID_ID);
+        pj_assert(pool);
+
+        PJSUA2_CHECK_EXPR( pjsua_conf_add_port(pool,
+                                               (pjmedia_port *)port,
+                                               &id) );
+    }
+
+    Endpoint::instance().mediaAdd(*this);
+}
+
 void AudioMedia::unregisterMediaPort()
 {
@@ -176 +194 @@
 AudioMedia::~AudioMedia() 
 {
-    unregisterMediaPort();
 }
 
@@ -409 +426 @@
 void AudioMediaRecorder::createRecorder(const string &file_name,
                                         unsigned enc_type,
-                                        pj_ssize_t max_size,
+                                        long max_size,
                                         unsigned options)
                                         throw(Error)
@@ -481 +498 @@
     }
 
-    registerMediaPort(tonegen);
+    registerMediaPort2(tonegen, pool);
 }
 
@@ -746 +763 @@
     pj_leave_critical_section();
     return audioDevList;
+}
+
+AudioDevInfoVector2 AudDevManager::enumDev2() const throw(Error)
+{
+    pjmedia_aud_dev_info pj_info[MAX_DEV_COUNT];
+    unsigned count = MAX_DEV_COUNT;
+    AudioDevInfoVector2 adiv2;
+
+    PJSUA2_CHECK_EXPR( pjsua_enum_aud_devs(pj_info, &count) );
+
+    for (unsigned i = 0; i<count ;++i) {
+        AudioDevInfo di;
+        di.fromPj(pj_info[i]);
+        adiv2.push_back(di);
+    }
+
+    return adiv2;
 }
 
@@ -1427 +1461 @@
 }
 
+VideoDevInfoVector2 VidDevManager::enumDev2() const throw(Error)
+{
+    VideoDevInfoVector2 vdiv2;
+#if PJSUA_HAS_VIDEO
+    pjmedia_vid_dev_info pj_info[MAX_DEV_COUNT];
+    unsigned count = MAX_DEV_COUNT;
+
+    PJSUA2_CHECK_EXPR(pjsua_vid_enum_devs(pj_info, &count));
+
+    for (unsigned i = 0; i<count;++i) {
+        VideoDevInfo vdi;
+        vdi.fromPj(pj_info[i]);
+        vdiv2.push_back(vdi);
+    }
+#endif
+    return vdiv2;
+}
+
 int VidDevManager::lookupDev(const string &drv_name,
                              const string &dev_name) const throw(Error)