Changeset 1683 for pjproject

Timestamp:

Jan 12, 2008 2:13:49 PM (17 years ago)

Author:

bennylp

Message:

Ticket #447: WAV player cuts last data from the WAV file

File:

• pjproject/trunk/pjmedia/src/pjmedia/wav_player.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/wav_player.c

@@ -157 +157 @@
                           (int)fport->base.info.name.slen,
                           fport->base.info.name.ptr));
+                /* Zero remaining buffer */
+                pj_bzero(fport->buf+size, size_left);
+                /* Mark port as EOF */
                 fport->eof = PJ_TRUE;
-                return PJ_EEOF;
+                /* Must return PJ_SUCCESS, otherwise this buffer 
+                 * is not read */
+                return PJ_SUCCESS;
             } else {
                 PJ_LOG(5,(THIS_FILE, "File port %.*s EOF, rewinding..",
@@ -511 +516 @@
     pj_assert(fport->base.info.signature == SIGNATURE);
 
+    /* Check EOF */
+    if (fport->eof) {
+        frame->type = PJMEDIA_FRAME_TYPE_NONE;
+        frame->size = 0;
+        return PJ_EEOF;
+    }
+
     //frame_size = fport->base.info.bytes_per_frame;
     //pj_assert(frame->size == frame_size);
@@ -550 +562 @@
         if (status != PJ_SUCCESS) {
             pj_bzero(((char*)frame->buf)+endread, frame_size-endread);
+            fport->readpos = fport->buf + fport->bufsize;
             return status;
         }