Changeset 1685 for pjproject

Timestamp:

Jan 12, 2008 3:30:15 PM (17 years ago)

Author:

bennylp

Message:

Another fix for ticket #447: WAV player cuts last data from the WAV file

File:

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

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

@@ -516 +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);
@@ -561 +554 @@
         status = fill_buffer(fport);
         if (status != PJ_SUCCESS) {
-            pj_bzero(((char*)frame->buf)+endread, frame_size-endread);
+            /* If we don't get anything, return NONE frame. Otherwise
+             * return AUDIO frame since we have partial audio.
+             */
+            if (endread == 0) {
+                frame->type = PJMEDIA_FRAME_TYPE_NONE;
+            } else {
+                pj_bzero(((char*)frame->buf)+endread, frame_size-endread);
+            }
             fport->readpos = fport->buf + fport->bufsize;
-            return status;
+            return PJ_SUCCESS;
         }