Ticket #468: mem_player.patch

pjmedia/include/pjmedia/mem_port.h

@@ -39 +39 @@
  */
 
 /**
+ * Memory player options.
+ */
+enum pjmedia_mem_player_option
+{
+    /**
+     * Tell the memory player to return NULL frame when the whole
+     * buffer has been played.
+     */
+    PJMEDIA_MEM_NO_LOOP = 1
+};
+
+/**
  * Create the buffer based playback to play the media from the specified
  * buffer.
  *

pjmedia/src/pjmedia/mem_player.c

@@ -146 +146 @@
     player = (struct mem_player*) this_port;
 
     if (player->eof) {
-        frame->type = PJMEDIA_FRAME_TYPE_NONE;
-        return PJ_EEOF;
+        pj_status_t status = PJ_SUCCESS;
+
+        /* Call callback, if any */
+        if (player->cb)
+            status = (*player->cb)(this_port, player->user_data);
+
+        /* If callback returns non PJ_SUCCESS or 'no loop' is specified
+         * return immediately.
+         */
+        if ((status != PJ_SUCCESS) || (player->options & PJMEDIA_MEM_NO_LOOP)) {
+            frame->type = PJMEDIA_FRAME_TYPE_NONE;
+            return PJ_EEOF;
+        }
+        
+        player->read_pos = player->buffer;
+        player->eof = PJ_FALSE;
     }
 
     size_needed = this_port->info.bytes_per_frame;
@@ -169 +183 @@
         pj_assert(player->read_pos <= endpos);
 
         if (player->read_pos == endpos) {
-            player->read_pos = player->buffer;
+            pj_size_t null_len;
 
-            /* Call callback, if any */
-            if (player->cb) {
-                pj_status_t status;
+            player->eof = PJ_TRUE;
 
-                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;
-            }
+            null_len = size_needed - size_written;
+            pj_bzero(dst + max, null_len);
+            break;
         }
     }
 
@@ -203 +205 @@
 
 static pj_status_t mem_on_destroy(pjmedia_port *this_port)
 {
-    /* Nothing to do */
-    PJ_UNUSED_ARG(this_port);
+    PJ_ASSERT_RETURN(this_port->info.signature == SIGNATURE,
+                     PJ_EINVALIDOP);
+
+    this_port->info.signature = 0;
+
     return PJ_SUCCESS;
 }