Changeset 4699 for pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/media.cpp

Timestamp:

Dec 19, 2013 3:49:05 AM (9 years ago)

Author:

nanang

Message:

Re #1519: Fixed assertion and crash in Endpoint destruction caused by late destroy (after pjsua destroyed) and double deletes of audio device media.

File:

• pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/media.cpp (modified) (5 diffs)

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/media.cpp

@@ -155 +155 @@
 void AudioMedia::unregisterMediaPort()
 {
-    if (id != PJSUA_INVALID_ID)
+    if (id != PJSUA_INVALID_ID) {
         pjsua_conf_remove_port(id);
+        id = PJSUA_INVALID_ID;
+    }
 
     if (mediaPool) {
@@ -163 +165 @@
         pj_caching_pool_destroy(&mediaCachingPool);
     }
-
-    id = PJSUA_INVALID_ID;
 
     Endpoint::instance().mediaRemove(*this);
@@ -387 +387 @@
 public:
     DevAudioMedia();
+    ~DevAudioMedia();
 };
 
@@ -395 +396 @@
 }
 
+DevAudioMedia::~DevAudioMedia()
+{
+    /* Avoid removing this port (conf port id=0) from conference */
+    this->id = PJSUA_INVALID_ID;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 /* Audio device operations. */
@@ -405 +412 @@
 AudDevManager::~AudDevManager()
 {
-    delete devMedia;
+    // At this point, devMedia should have been cleaned up by Endpoint,
+    // as AudDevManager destructor is called after Endpoint destructor.
+    //delete devMedia;
+    
     clearAudioDevList();
 }