Changeset 1690

Timestamp:

Jan 14, 2008 4:12:41 PM (17 years ago)

Author:

bennylp

Message:

Related to ticket #447: the WAV player should consistently return non-PJ_SUCCESS after it has returned one

File:

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

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

@@ -53 +53 @@
 #endif
 
-struct file_port
+struct file_reader_port
 {
     pjmedia_port     base;
@@ -75 +75 @@
 static pj_status_t file_on_destroy(pjmedia_port *this_port);
 
-static struct file_port *create_file_port(pj_pool_t *pool)
+static struct file_reader_port *create_file_port(pj_pool_t *pool)
 {
     const pj_str_t name = pj_str("file");
-    struct file_port *port;
-
-    port = PJ_POOL_ZALLOC_T(pool, struct file_port);
+    struct file_reader_port *port;
+
+    port = PJ_POOL_ZALLOC_T(pool, struct file_reader_port);
     if (!port)
         return NULL;
@@ -100 +100 @@
  * Fill buffer.
  */
-static pj_status_t fill_buffer(struct file_port *fport)
+static pj_status_t fill_buffer(struct file_reader_port *fport)
 {
     pj_ssize_t size_left = fport->bufsize;
@@ -193 +193 @@
     pjmedia_wave_hdr wave_hdr;
     pj_ssize_t size_to_read, size_read;
-    struct file_port *fport;
+    struct file_reader_port *fport;
     pj_off_t pos;
     pj_status_t status;
@@ -410 +410 @@
 PJ_DEF(pj_ssize_t) pjmedia_wav_player_get_len(pjmedia_port *port)
 {
-    struct file_port *fport;
+    struct file_reader_port *fport;
     pj_ssize_t size;
 
@@ -419 +419 @@
     PJ_ASSERT_RETURN(port->info.signature == SIGNATURE, -PJ_EINVALIDOP);
 
-    fport = (struct file_port*) port;
+    fport = (struct file_reader_port*) port;
 
     size = (pj_ssize_t) fport->fsize;
@@ -432 +432 @@
                                                     pj_uint32_t bytes )
 {
-    struct file_port *fport;
+    struct file_reader_port *fport;
 
     /* Sanity check */
@@ -441 +441 @@
 
 
-    fport = (struct file_port*) port;
+    fport = (struct file_reader_port*) port;
 
     PJ_ASSERT_RETURN(bytes < fport->fsize - fport->start_data, PJ_EINVAL);
@@ -458 +458 @@
 PJ_DEF(pj_ssize_t) pjmedia_wav_player_port_get_pos( pjmedia_port *port )
 {
-    struct file_port *fport;
+    struct file_reader_port *fport;
     pj_size_t payload_pos;
 
@@ -467 +467 @@
     PJ_ASSERT_RETURN(port->info.signature == SIGNATURE, -PJ_EINVALIDOP);
 
-    fport = (struct file_port*) port;
+    fport = (struct file_reader_port*) port;
 
     payload_pos = (pj_size_t)(fport->fpos - fport->start_data);
@@ -487 +487 @@
                                                  void *usr_data))
 {
-    struct file_port *fport;
+    struct file_reader_port *fport;
 
     /* Sanity check */
@@ -495 +495 @@
     PJ_ASSERT_RETURN(port->info.signature == SIGNATURE, -PJ_EINVALIDOP);
 
-    fport = (struct file_port*) port;
+    fport = (struct file_reader_port*) port;
 
     fport->base.port_data.pdata = user_data;
@@ -510 +510 @@
                                   pjmedia_frame *frame)
 {
-    struct file_port *fport = (struct file_port*)this_port;
+    struct file_reader_port *fport = (struct file_reader_port*)this_port;
     unsigned frame_size;
     pj_status_t status;
@@ -539 +539 @@
                 frame->type = PJMEDIA_FRAME_TYPE_NONE;
                 frame->size = 0;
+                fport->readpos = fport->buf + fport->bufsize;
                 return status;
             }
@@ -563 +564 @@
             }
             fport->readpos = fport->buf + fport->bufsize;
-            return PJ_SUCCESS;
+            return (endread? PJ_SUCCESS : status);
         }
 
@@ -578 +579 @@
 static pj_status_t file_on_destroy(pjmedia_port *this_port)
 {
-    struct file_port *fport = (struct file_port*) this_port;
+    struct file_reader_port *fport = (struct file_reader_port*) this_port;
 
     pj_assert(this_port->info.signature == SIGNATURE);