Changeset 6112 for pjproject/trunk/pjsip/src/pjsua2/media.cpp

Timestamp:

Nov 29, 2019 4:21:17 AM (5 years ago)

Author:

ming

Message:

Fixed #2251: Deadlock between PJSUA LOCK and conference mutex

File:

• pjproject/trunk/pjsip/src/pjsua2/media.cpp (modified) (3 diffs)

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

@@ -303 +303 @@
         PJSUA2_RAISE_ERROR2(status, "AudioMediaPlayer::createPlayer()");
     }
-    status = pjmedia_wav_player_set_eof_cb(port, this, &eof_cb);
+    status = pjmedia_wav_player_set_eof_cb2(port, this, &eof_cb);
     if (status != PJ_SUCCESS) {
         pjsua_player_destroy(playerId);
@@ -351 +351 @@
         PJSUA2_RAISE_ERROR2(status, "AudioMediaPlayer::createPlaylist()");
     }
-    status = pjmedia_wav_playlist_set_eof_cb(port, this, &eof_cb);
+    status = pjmedia_wav_playlist_set_eof_cb2(port, this, &eof_cb);
     if (status != PJ_SUCCESS) {
         pjsua_player_destroy(playerId);
@@ -399 +399 @@
 }
 
-pj_status_t AudioMediaPlayer::eof_cb(pjmedia_port *port,
-                                     void *usr_data)
+void AudioMediaPlayer::eof_cb(pjmedia_port *port,
+                              void *usr_data)
 {
     PJ_UNUSED_ARG(port);
     AudioMediaPlayer *player = (AudioMediaPlayer*)usr_data;
-    return player->onEof() ? PJ_SUCCESS : PJ_EEOF;
+    
+    player->onEof2();
 }