Changeset 6112 for pjproject/trunk/third_party/mp3/mp3_writer.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/third_party/mp3/mp3_writer.c (modified) (6 diffs)

pjproject/trunk/third_party/mp3/mp3_writer.c

@@ -62 +62 @@
     pj_size_t       cb_size;
     pj_status_t    (*cb)(pjmedia_port*, void*);
+    pj_bool_t        subscribed;
+    pj_bool_t        cb_called;
+    void           (*cb2)(pjmedia_port*, void*);
 
     unsigned        silence_duration;
@@ -332 +335 @@
 
 
-
+#if !DEPRECATED_FOR_TICKET_2251
 /*
  * Register callback.
@@ -351 +354 @@
     PJ_ASSERT_RETURN(port->info.signature == SIGNATURE, PJ_EINVALIDOP);
 
+    PJ_LOG(1, (THIS_FILE, "pjmedia_mp3_writer_port_set_cb() is deprecated. "
+               "Use pjmedia_mp3_writer_port_set_cb2() instead."));
+
     fport = (struct mp3_file_port*) port;
 
@@ -359 +365 @@
     return PJ_SUCCESS;
 
+}
+#endif
+
+
+/*
+ * Register callback.
+ */
+PJ_DEF(pj_status_t) 
+pjmedia_mp3_writer_port_set_cb2(pjmedia_port *port,
+                                pj_size_t pos,
+                                void *user_data,
+                                void (*cb)(pjmedia_port *port,
+                                           void *usr_data))
+{
+    struct mp3_file_port *fport;
+
+    /* Sanity check */
+    PJ_ASSERT_RETURN(port && cb, PJ_EINVAL);
+
+    /* Check that this is really a writer port */
+    PJ_ASSERT_RETURN(port->info.signature == SIGNATURE, PJ_EINVALIDOP);
+
+    fport = (struct mp3_file_port*) port;
+
+    fport->cb_size = pos;
+    fport->base.port_data.pdata = user_data;
+    fport->cb2 = cb;
+    fport->cb_called = PJ_FALSE;
+
+    return PJ_SUCCESS;
+
+}
+
+
+static pj_status_t file_on_event(pjmedia_event *event,
+                                 void *user_data)
+{
+    struct file_port *fport = (struct file_port*)user_data;
+
+    if (event->type == PJMEDIA_EVENT_CALLBACK) {
+        if (fport->cb2)
+            (*fport->cb2)(&fport->base, fport->base.port_data.pdata);
+    }
+    
+    return PJ_SUCCESS;
 }
 
@@ -499 +550 @@
     }
 
-    /* Increment total written, and check if we need to call callback */
-    
-    if (fport->cb && fport->total >= fport->cb_size) {
-        pj_status_t (*cb)(pjmedia_port*, void*);
-        pj_status_t status;
-
-        cb = fport->cb;
-        fport->cb = NULL;
-
-        status = (*cb)(this_port, this_port->port_data.pdata);
-        return status;
+    /* Check if we need to call callback */
+    if (fport->total >= fport->cb_size) {
+        if (fport->cb2) {
+            if (!fport->subscribed) {
+                pj_status_t status;
+
+                status = pjmedia_event_subscribe(NULL, &file_on_event,
+                                                 fport, fport);
+                fport->subscribed = (status == PJ_SUCCESS)? PJ_TRUE:
+                                    PJ_FALSE;
+            }
+
+            if (fport->subscribed && !fport->cb_called) {
+                pjmedia_event event;
+
+                /* To prevent the callback from being called more than once. */
+                fport->cb_called = PJ_TRUE;
+
+                pjmedia_event_init(&event, PJMEDIA_EVENT_CALLBACK,
+                                   NULL, fport);
+                pjmedia_event_publish(NULL, fport, &event,
+                                      PJMEDIA_EVENT_PUBLISH_POST_EVENT);
+            }
+        } else if (fport->cb) {
+            pj_status_t (*cb)(pjmedia_port*, void*);
+            pj_status_t status;
+
+            cb = fport->cb;
+            fport->cb = NULL;
+
+            status = (*cb)(this_port, this_port->port_data.pdata);
+            return status;
+        }
     }
 
@@ -537 +610 @@
     unsigned long MP3Err;
 
+    if (fport->subscribed) {
+        pjmedia_event_unsubscribe(NULL, &file_on_event, fport, fport);
+        fport->subscribed = PJ_FALSE;
+    }
 
     /* Close encoder */