Changeset 5986

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.

Location:

pjproject/trunk

Files:

• pjsip-apps/src/samples/pjsua2_demo.cpp (modified) (5 diffs)
• pjsip/src/pjsua2/call.cpp (modified) (2 diffs)
• pjsip/src/pjsua2/endpoint.cpp (modified) (3 diffs)
• pjsip/src/pjsua2/media.cpp (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/samples/pjsua2_demo.cpp

@@ -31 +31 @@
 private:
     MyAccount *myAcc;
+    AudioMediaPlayer *wav_player;
 
 public:
@@ -36 +37 @@
     : Call(acc, call_id)
     {
+        wav_player = NULL;
         myAcc = (MyAccount *)&acc;
+    }
+    
+    ~MyCall()
+    {
+        if (wav_player)
+            delete wav_player;
     }
     
@@ -42 +50 @@
     virtual void onCallTransferRequest(OnCallTransferRequestParam &prm);
     virtual void onCallReplaced(OnCallReplacedParam &prm);
+    virtual void onCallMediaState(OnCallMediaStateParam &prm);
 };
 
@@ -115 +124 @@
 }
 
+void MyCall::onCallMediaState(OnCallMediaStateParam &prm)
+{
+    PJ_UNUSED_ARG(prm);
+
+    unsigned i;
+    CallInfo ci = getInfo();
+    AudioMedia aud_med;
+    AudioMedia& play_dev_med =
+        Endpoint::instance().audDevManager().getPlaybackDevMedia();
+
+    try {
+        // Get the first audio media
+        aud_med = getAudioMedia(-1);
+    } catch(...) {
+        std::cout << "Failed to get audio media" << std::endl;
+        return;
+    }
+
+    if (!wav_player) {
+        wav_player = new AudioMediaPlayer();
+        try {
+            wav_player->createPlayer(
+                "../../../../tests/pjsua/wavs/input.16.wav", 0);
+        } catch (...) {
+            std::cout << "Failed opening wav file" << std::endl;
+            delete wav_player;
+            wav_player = NULL;
+        }
+    }
+
+    // This will connect the wav file to the call audio media
+    if (wav_player)
+        wav_player->startTransmit(aud_med);
+
+    // And this will connect the call audio media to the sound device/speaker
+    aud_med.startTransmit(play_dev_med);
+}
+
 void MyCall::onCallTransferRequest(OnCallTransferRequestParam &prm)
 {
@@ -164 +211 @@
     
     // Hangup all calls
-    pj_thread_sleep(8000);
+    pj_thread_sleep(4000);
     ep.hangupAllCalls();
     pj_thread_sleep(4000);

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();

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

@@ -503 +503 @@
         delete pendingJobs.front();
         pendingJobs.pop_front();
-    }
-
-    while(mediaList.size() > 0) {
-        AudioMedia *cur_media = mediaList[0];
-        delete cur_media; /* this will remove itself from the list */
     }
 
@@ -1788 +1783 @@
     }
 
+    while(mediaList.size() > 0) {
+        AudioMedia *cur_media = mediaList[0];
+        delete cur_media; /* this will remove itself from the list */
+    }
+
     if (mediaListMutex) {
         pj_mutex_destroy(mediaListMutex);
@@ -2089 +2089 @@
     pj_mutex_lock(mediaListMutex);
 
-    if (mediaExists(media)) {
-        pj_mutex_unlock(mediaListMutex);
-        return;
-    }
-
-    mediaList.push_back(&media);
+    AudioMediaVector::iterator it = std::find(mediaList.begin(),
+                                              mediaList.end(),
+                                              &media);
+
+    if (it == mediaList.end())
+        mediaList.push_back(&media);
     pj_mutex_unlock(mediaListMutex);
 }

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

@@ -132 +132 @@
 {
     /* Check if media already added to Conf bridge. */
-    pj_assert(!Endpoint::instance().mediaExists(*this));
-
-    if (port != NULL) {
+    if (!Endpoint::instance().mediaExists(*this) && port != NULL) {
         pj_assert(id == PJSUA_INVALID_ID);
 
@@ -664 +662 @@
     /* Avoid removing this port (conf port id=0) from conference */
     this->id = PJSUA_INVALID_ID;
+    unregisterMediaPort();
 }