Changeset 6112 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

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-apps/src/pjsua/pjsua_app.c (modified) (4 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -1002 +1002 @@
 
 /* Playfile done notification, set timer to hangup calls */
-pj_status_t on_playfile_done(pjmedia_port *port, void *usr_data)
+void on_playfile_done(pjmedia_port *port, void *usr_data)
 {
     pj_time_val delay;
@@ -1012 +1012 @@
     if (pjsua_call_get_count() == 0) {
         pjsua_player_set_pos(app_config.wav_id, 0);
-        return PJ_SUCCESS;
     }
 
     /* Timer is already active */
     if (app_config.auto_hangup_timer.id == 1)
-        return PJ_SUCCESS;
+        return;
 
     app_config.auto_hangup_timer.id = 1;
@@ -1025 +1024 @@
                                &app_config.auto_hangup_timer, 
                                &delay);
-
-    return PJ_SUCCESS;
 }
 
@@ -1361 +1358 @@
 
                 pjsua_player_get_port(app_config.wav_id, &port);
-                status = pjmedia_wav_player_set_eof_cb(port, NULL, 
-                                                       &on_playfile_done);
+                status = pjmedia_wav_player_set_eof_cb2(port, NULL, 
+                                                        &on_playfile_done);
                 if (status != PJ_SUCCESS)
                     goto on_error;