Changeset 704 for pjproject/trunk

Timestamp:

Sep 11, 2006 7:55:41 PM (18 years ago)

Author:

bennylp

Message:

Added EOF callback in memory playback port.

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/mem_port.h (modified) (1 diff)
• src/pjmedia/mem_player.c (modified) (5 diffs)

pjproject/trunk/pjmedia/include/pjmedia/mem_port.h

@@ -71 +71 @@
 
 /**
+ * Register a callback to be called when the buffer reading has reached the
+ * end of buffer. If the player is set to play repeatedly, then the callback
+ * will be called multiple times. Note that only one callback can be 
+ * registered for each player port.
+ *
+ * @param port          The memory player port.
+ * @param user_data     User data to be specified in the callback
+ * @param cb            Callback to be called. If the callback returns non-
+ *                      PJ_SUCCESS, the playback will stop. Note that if
+ *                      application destroys the player port in the callback,
+ *                      it must return non-PJ_SUCCESS here.
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) 
+pjmedia_mem_player_set_eof_cb( pjmedia_port *port,
+                               void *user_data,
+                               pj_status_t (*cb)(pjmedia_port *port,
+                                                 void *usr_data));
+
+
+/**
  * @}
  */

pjproject/trunk/pjmedia/src/pjmedia/mem_player.c

@@ -38 +38 @@
     pj_size_t        buf_size;
     char            *read_pos;
+
+    pj_bool_t        eof;
+    void            *user_data;
+    pj_status_t    (*cb)(pjmedia_port *port,
+                         void *user_data);
+
 };
 
@@ -95 +101 @@
 
 
+
+/*
+ * Register a callback to be called when the file reading has reached the
+ * end of buffer.
+ */
+PJ_DEF(pj_status_t) 
+pjmedia_mem_player_set_eof_cb( pjmedia_port *port,
+                               void *user_data,
+                               pj_status_t (*cb)(pjmedia_port *port,
+                                                 void *usr_data))
+{
+    struct mem_player *player;
+
+    PJ_ASSERT_RETURN(port->info.signature == SIGNATURE,
+                     PJ_EINVALIDOP);
+
+    player = (struct mem_player*) port;
+    player->user_data = user_data;
+    player->cb = cb;
+
+    return PJ_SUCCESS;
+}
+
+
 static pj_status_t mem_put_frame( pjmedia_port *this_port, 
                                   const pjmedia_frame *frame)
@@ -116 +146 @@
 
     player = (struct mem_player*) this_port;
+
+    if (player->eof) {
+        frame->type = PJMEDIA_FRAME_TYPE_NONE;
+        return PJ_EEOF;
+    }
 
     size_needed = this_port->info.bytes_per_frame;
@@ -135 +170 @@
         pj_assert(player->read_pos <= endpos);
 
-        if (player->read_pos == endpos)
+        if (player->read_pos == endpos) {
             player->read_pos = player->buffer;
+
+            /* Call callback, if any */
+            if (player->cb) {
+                pj_status_t status;
+
+                player->eof = PJ_TRUE;
+                status = (*player->cb)(this_port, player->user_data);
+                if (status != PJ_SUCCESS) {
+                    /* Must not access player from here on. It may be
+                     * destroyed by application.
+                     */
+                    frame->size = size_written;
+                    frame->timestamp.u64 = player->timestamp.u64;
+                    frame->type = PJMEDIA_FRAME_TYPE_AUDIO;
+                    return status;
+                }
+                player->eof = PJ_FALSE;
+            }
+        }
     }
-
-    player->timestamp.u64 += this_port->info.samples_per_frame;
 
     frame->size = this_port->info.bytes_per_frame;
@@ -145 +197 @@
     frame->type = PJMEDIA_FRAME_TYPE_AUDIO;
 
+    player->timestamp.u64 += this_port->info.samples_per_frame;
+
     return PJ_SUCCESS;
 }