Changeset 1320

Timestamp:

May 30, 2007 7:24:19 AM (17 years ago)

Author:

bennylp

Message:

Workaround for ticket #290: Bug in WAV player when frame size is larger than file buffer size (thanks Samuel Vinson)

File:

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

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

@@ -205 +205 @@
         ptime = 20;
 
+    /* Normalize buff_size */
+    if (buff_size < 1) buff_size = PJMEDIA_FILE_PORT_BUFSIZE;
+
+
     /* Create fport instance. */
     fport = create_file_port(pool);
@@ -345 +349 @@
     /* Create file buffer.
      */
-    if (buff_size < 1) buff_size = PJMEDIA_FILE_PORT_BUFSIZE;
     fport->bufsize = buff_size;
 
+
+    /* samples_per_frame must be smaller than bufsize (because get_frame()
+     * doesn't handle this case).
+     */
+    if (fport->base.info.samples_per_frame*fport->base.info.bits_per_sample >=
+        fport->bufsize)
+    {
+        pj_file_close(fport->fd);
+        return PJ_EINVAL;
+    }
 
     /* Create buffer. */
@@ -539 +552 @@
     return PJ_SUCCESS;
 }
+