Changeset 1808

Timestamp:

Feb 21, 2008 8:51:37 AM (16 years ago)

Author:

bennylp

Message:

Ticket #468: Added support for non looping playback in memory player

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/mem_port.h (modified) (2 diffs)
• src/pjmedia/mem_player.c (modified) (3 diffs)

pjproject/trunk/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 instead of rewinding the buffer back
+     * to start position.
+     */
+    PJMEDIA_MEM_NO_LOOP = 1
+};
+
+
 /**
  * Create the buffer based playback to play the media from the specified
@@ -53 +68 @@
  * @param samples_per_frame Number of samples per frame.
  * @param bits_per_sample   Number of bits per sample.
- * @param options           Option flags.
+ * @param options           Option flags, see #pjmedia_mem_player_option
  * @param p_port            Pointer to receive the port instance.
  *

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

@@ -147 +147 @@
 
     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 (and don't try to access player port since
+         * it might have been destroyed by the callback).
+         */
+        if ((status != PJ_SUCCESS) || (player->options & PJMEDIA_MEM_NO_LOOP)) {
+            frame->type = PJMEDIA_FRAME_TYPE_NONE;
+            return PJ_EEOF;
+        }
+        
+        player->eof = PJ_FALSE;
     }
 
@@ -170 +184 @@
 
         if (player->read_pos == endpos) {
+            /* Set EOF flag */
+            player->eof = PJ_TRUE;
+            /* Reset read pointer */
             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;
+            /* Pad with zeroes then return for no looped play */
+            if (player->options & PJMEDIA_MEM_NO_LOOP) {
+                pj_size_t null_len;
+
+                null_len = size_needed - size_written;
+                pj_bzero(dst + max, null_len);
+                break;
             }
         }
@@ -204 +212 @@
 static pj_status_t mem_on_destroy(pjmedia_port *this_port)
 {
-    /* Nothing to do */
-    PJ_UNUSED_ARG(this_port);
-    return PJ_SUCCESS;
-}
-
-
+    PJ_ASSERT_RETURN(this_port->info.signature == SIGNATURE,
+                     PJ_EINVALIDOP);
+
+    /* Destroy signature */
+    this_port->info.signature = 0;
+
+    return PJ_SUCCESS;
+}
+
+