Changeset 5986 for pjproject/trunk/pjsip/src/pjsua2/call.cpp

Timestamp:

May 10, 2019 8:27:22 AM (5 years ago)

Author:

ming

Message:

Re #2189: Fixing various bugs:

• assertion: !Endpoint::instance().mediaExists(*this) in Media::registerMediaPort() when using AudioMedia?

Sound device is already registered in the conference bridge, while AudioMediaPlayer/Recorder? creation function, i.e. pjsua_player_create(), pjsua_playlist_create(), and pjsua_recorder_create() already call pjmedia_conf_add_port(), so mediaExists() will always return TRUE.

• Endpoint.mediaAdd() should check in its own internal list if the media exists, rather than querying pjsua.

• Calling Endpoint::libDestroy() first, then deleting Endpoint will cause crash, since the mutex to remove the medias has been deleted in libDestroy().

The introduction of the mutex is in r5964.

• DevAudioMedia? never removes itself from mediaList, potentially causing infinite loop/crash.

• Call medias, i.e. AudioMediaHelper?, also never gets removed from mediaList.

File:

• pjproject/trunk/pjsip/src/pjsua2/call.cpp (modified) (2 diffs)

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

@@ -861 +861 @@
             /* Clear medias. */
             for (mi = 0; mi < medias.size(); mi++) {
-                if (medias[mi])
+                if (medias[mi]) {
+                    Endpoint::instance().mediaRemove((AudioMedia&)*medias[mi]);
                     delete medias[mi];
+                }
             }
             medias.clear();     
@@ -923 +925 @@
         /* Clear medias. */
         for (mi = 0; mi < medias.size(); mi++) {
-            if (medias[mi])
+            if (medias[mi]) {
+                Endpoint::instance().mediaRemove((AudioMedia &)*medias[mi]);
                 delete medias[mi];
+            }
         }
         medias.clear();