Changeset 6112 for pjproject/trunk/pjmedia/src/pjmedia/wav_player.c

Timestamp:

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

Author:

ming

Message:

Fixed #2251: Deadlock between PJSUA LOCK and conference mutex

File:

• pjproject/trunk/pjmedia/src/pjmedia/wav_player.c (modified) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia/wav_player.c

@@ -74 +74 @@
 
     pj_status_t    (*cb)(pjmedia_port*, void*);
+    pj_bool_t        subscribed;
+    void           (*cb2)(pjmedia_port*, void*);
 };
 
@@ -548 +550 @@
 
 
-
+#if !DEPRECATED_FOR_TICKET_2251
 /*
  * Register a callback to be called when the file reading has reached the
@@ -566 +568 @@
     PJ_ASSERT_RETURN(port->info.signature == SIGNATURE, -PJ_EINVALIDOP);
 
+    PJ_LOG(1, (THIS_FILE, "pjmedia_wav_player_set_eof_cb() is deprecated. "
+               "Use pjmedia_wav_player_set_eof_cb2() instead."));
+
     fport = (struct file_reader_port*) port;
 
@@ -571 +576 @@
     fport->cb = cb;
 
+    return PJ_SUCCESS;
+}
+#endif
+
+
+/*
+ * Register a callback to be called when the file reading has reached the
+ * end of file.
+ */
+PJ_DEF(pj_status_t) pjmedia_wav_player_set_eof_cb2(pjmedia_port *port,
+                               void *user_data,
+                               void (*cb)(pjmedia_port *port,
+                                          void *usr_data))
+{
+    struct file_reader_port *fport;
+
+    /* Sanity check */
+    PJ_ASSERT_RETURN(port, -PJ_EINVAL);
+
+    /* Check that this is really a player port */
+    PJ_ASSERT_RETURN(port->info.signature == SIGNATURE, -PJ_EINVALIDOP);
+
+    fport = (struct file_reader_port*) port;
+
+    fport->base.port_data.pdata = user_data;
+    fport->cb2 = cb;
+
+    return PJ_SUCCESS;
+}
+
+
+static pj_status_t file_on_event(pjmedia_event *event,
+                                 void *user_data)
+{
+    struct file_reader_port *fport = (struct file_reader_port*)user_data;
+
+    if (event->type == PJMEDIA_EVENT_CALLBACK) {
+        if (fport->cb2)
+            (*fport->cb2)(&fport->base, fport->base.port_data.pdata);
+    }
+    
     return PJ_SUCCESS;
 }
@@ -595 +641 @@
 
         /* Call callback, if any */
-        if (fport->cb)
+        if (fport->cb2) {
+            pj_bool_t no_loop = (fport->options & PJMEDIA_FILE_NO_LOOP);
+
+            if (!fport->subscribed) {
+                status = pjmedia_event_subscribe(NULL, &file_on_event,
+                                                 fport, fport);
+                fport->subscribed = (status == PJ_SUCCESS)? PJ_TRUE:
+                                    PJ_FALSE;
+            }
+
+            if (fport->subscribed && fport->eof != 2) {
+                pjmedia_event event;
+
+                if (no_loop) {
+                    /* To prevent the callback from being called repeatedly */
+                    fport->eof = 2;
+                } else {
+                    fport->eof = PJ_FALSE;
+                }
+
+                pjmedia_event_init(&event, PJMEDIA_EVENT_CALLBACK,
+                                   NULL, fport);
+                pjmedia_event_publish(NULL, fport, &event,
+                                      PJMEDIA_EVENT_PUBLISH_POST_EVENT);
+            }
+            
+            /* Should not access player port after this since
+             * it might have been destroyed by the callback.
+             */
+            frame->type = PJMEDIA_FRAME_TYPE_NONE;
+            frame->size = 0;
+            
+            return (no_loop? PJ_EEOF: PJ_SUCCESS);
+
+        } else if (fport->cb) {
             status = (*fport->cb)(this_port, fport->base.port_data.pdata);
+        }
 
         /* If callback returns non PJ_SUCCESS or 'no loop' is specified,
@@ -602 +683 @@
          * it might have been destroyed by the callback).
          */
-        if ((status != PJ_SUCCESS) || (fport->options & PJMEDIA_FILE_NO_LOOP)) {
+        if ((status != PJ_SUCCESS) || (fport->options & PJMEDIA_FILE_NO_LOOP))
+        {
             frame->type = PJMEDIA_FRAME_TYPE_NONE;
             frame->size = 0;
             return PJ_EEOF;
         }
-        
+
+        /* Rewind file */
         PJ_LOG(5,(THIS_FILE, "File port %.*s rewinding..",
                   (int)fport->base.info.name.slen,
                   fport->base.info.name.ptr));
-        
         fport->eof = PJ_FALSE;
     }
@@ -725 +807 @@
 
     pj_file_close(fport->fd);
+
+    if (fport->subscribed) {
+        pjmedia_event_unsubscribe(NULL, &file_on_event, fport, fport);
+        fport->subscribed = PJ_FALSE;
+    }
+
     return PJ_SUCCESS;
 }