Changeset 6112 for pjproject/trunk/pjmedia/include/pjmedia/wav_port.h

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/include/pjmedia/wav_port.h (modified) (4 diffs)

pjproject/trunk/pjmedia/include/pjmedia/wav_port.h

@@ -152 +152 @@
 
 
+#if !DEPRECATED_FOR_TICKET_2251
 /**
  * Register a callback to be called when the file reading has reached the
@@ -167 +168 @@
  * @return              PJ_SUCCESS on success.
  */
-PJ_DECL(pj_status_t) 
+PJ_DECL(pj_status_t)
 pjmedia_wav_player_set_eof_cb( pjmedia_port *port,
                                void *user_data,
                                pj_status_t (*cb)(pjmedia_port *port,
                                                  void *usr_data));
+#endif
+
+
+/**
+ * Register a callback to be called when the file reading has reached the
+ * end of file. If the file is set to play repeatedly, then the callback
+ * will be called multiple times. Note that only one callback can be 
+ * registered for each file port.
+ *
+ * @param port          The file player port.
+ * @param user_data     User data to be specified in the callback
+ * @param cb            Callback to be called. Note that if
+ *                      application wishes to stop the playback, it
+ *                      can disconnect the port in the callback, and
+ *                      only after all connections have been removed
+ *                      could the application safely destroy the port.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t)
+pjmedia_wav_player_set_eof_cb2(pjmedia_port *port,
+                               void *user_data,
+                               void (*cb)(pjmedia_port *port,
+                                          void *usr_data));
+
 
 /**
@@ -256 +282 @@
 
 
+#if !DEPRECATED_FOR_TICKET_2251
 /**
  * Register the callback to be called when the file writing has reached
@@ -278 +305 @@
                                 pj_status_t (*cb)(pjmedia_port *port,
                                                   void *usr_data));
+#endif
+
+
+/**
+ * Register the callback to be called when the file writing has reached
+ * certain size. Application can use this callback, for example, to limit
+ * the size of the output file.
+ *
+ * @param port          The file writer port.
+ * @param pos           The file position on which the callback will be called.
+ * @param user_data     User data to be specified in the callback, and will be
+ *                      given on the callback.
+ * @param cb            Callback to be called. Note that if
+ *                      application wishes to stop the writing, it
+ *                      can disconnect the port in the callback, and
+ *                      only after all connections have been removed
+ *                      could the application safely destroy the port.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) 
+pjmedia_wav_writer_port_set_cb2(pjmedia_port *port,
+                                pj_size_t pos,
+                                void *user_data,
+                                void (*cb)(pjmedia_port *port,
+                                           void *usr_data));