Ignore:
Timestamp:
Nov 29, 2019 4:21:17 AM (3 years ago)
Author:
ming
Message:

Fixed #2251: Deadlock between PJSUA LOCK and conference mutex

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/src/pjsua2/media.cpp

    r6074 r6112  
    303303        PJSUA2_RAISE_ERROR2(status, "AudioMediaPlayer::createPlayer()"); 
    304304    } 
    305     status = pjmedia_wav_player_set_eof_cb(port, this, &eof_cb); 
     305    status = pjmedia_wav_player_set_eof_cb2(port, this, &eof_cb); 
    306306    if (status != PJ_SUCCESS) { 
    307307        pjsua_player_destroy(playerId); 
     
    351351        PJSUA2_RAISE_ERROR2(status, "AudioMediaPlayer::createPlaylist()"); 
    352352    } 
    353     status = pjmedia_wav_playlist_set_eof_cb(port, this, &eof_cb); 
     353    status = pjmedia_wav_playlist_set_eof_cb2(port, this, &eof_cb); 
    354354    if (status != PJ_SUCCESS) { 
    355355        pjsua_player_destroy(playerId); 
     
    399399} 
    400400 
    401 pj_status_t AudioMediaPlayer::eof_cb(pjmedia_port *port, 
    402                                      void *usr_data) 
     401void AudioMediaPlayer::eof_cb(pjmedia_port *port, 
     402                              void *usr_data) 
    403403{ 
    404404    PJ_UNUSED_ARG(port); 
    405405    AudioMediaPlayer *player = (AudioMediaPlayer*)usr_data; 
    406     return player->onEof() ? PJ_SUCCESS : PJ_EEOF; 
     406     
     407    player->onEof2(); 
    407408} 
    408409 
Note: See TracChangeset for help on using the changeset viewer.