Changeset 5711

Timestamp:

Dec 7, 2017 3:03:50 AM (7 years ago)

Author:

riza

Message:

Close #2073: Enable wav playlist to play WAV files with extra chunks after DATA chunk.

File:

• pjproject/trunk/pjmedia/src/pjmedia/wav_playlist.c (modified) (8 diffs)

pjproject/trunk/pjmedia/src/pjmedia/wav_playlist.c

@@ -67 +67 @@
     pj_off_t        *fsize_list;
     unsigned        *start_data_list;
+    unsigned        *data_len_list;
+    unsigned        *data_left_list;
     pj_off_t        *fpos_list;
     pj_oshandle_t   *fd_list;       /* list of file descriptors */
@@ -133 +135 @@
             return PJ_ECANCELLED;
         }
+
+        if (size > (pj_ssize_t)fport->data_left_list[current_file]) {
+            /* We passed the end of the data chunk,
+             * only count the portion read from the data chunk.
+             */
+            size = (pj_ssize_t)fport->data_left_list[current_file];
+        }
         
         size_left -= (pj_uint32_t)size;
-        fport->fpos_list[current_file] += size;
+        fport->data_left_list[current_file] -= (pj_uint32_t)size;
+        fport->fpos_list[current_file] += size; 
         
         /* If size is less than size_to_read, it indicates that we've
@@ -147 +157 @@
             pj_file_setpos(fport->fd_list[current_file], 
                            fport->fpos_list[current_file], PJ_SEEK_SET);
+            fport->data_left_list[current_file] = 
+                                            fport->data_len_list[current_file];
 
             /* Move to next file */
@@ -209 +221 @@
                     pj_file_setpos(fport->fd_list[0], fport->fpos_list[0],
                                    PJ_SEEK_SET);
+                    fport->data_left_list[0] = fport->data_len_list[0];
                 }               
                 
@@ -306 +319 @@
                              pj_pool_alloc(pool, sizeof(unsigned)*file_count);
     if (!fport->start_data_list) {
+        return PJ_ENOMEM;
+    }
+
+    /* Create data len list */
+    fport->data_len_list = (unsigned*)
+                             pj_pool_alloc(pool, sizeof(unsigned)*file_count);
+    if (!fport->data_len_list) {
+        return PJ_ENOMEM;
+    }
+
+    /* Create data left list */
+    fport->data_left_list = (unsigned*)
+                             pj_pool_alloc(pool, sizeof(unsigned)*file_count);
+    if (!fport->data_left_list) {
         return PJ_ENOMEM;
     }
@@ -451 +478 @@
         status = pj_file_getpos(fport->fd_list[index], &pos);
         fport->start_data_list[index] = (unsigned)pos;
+        fport->data_len_list[index] = wavehdr.data_hdr.len;
+        fport->data_left_list[index] = wavehdr.data_hdr.len;
         
         /* Validate length. */
-        if (wavehdr.data_hdr.len != fport->fsize_list[index] - 
+        if (wavehdr.data_hdr.len > fport->fsize_list[index] - 
                                        fport->start_data_list[index]) 
         {
@@ -459 +488 @@
             goto on_error;
         }
-        if (wavehdr.data_hdr.len < 400) {
+        if (wavehdr.data_hdr.len < ptime * wavehdr.fmt_hdr.sample_rate *
+                                    wavehdr.fmt_hdr.nchan / 1000)
+        {
             status = PJMEDIA_EWAVETOOSHORT;
             goto on_error;
@@ -501 +532 @@
 
         }
-        
+
+        /* If file is shorter than buffer size, adjust buffer size to file
+         * size. Otherwise EOF callback will be called multiple times when
+         * file_fill_buffer() is called.
+         */
+        if (wavehdr.data_hdr.len < (unsigned)buff_size)
+            buff_size = wavehdr.data_hdr.len;
+
+        /* Create file buffer.
+         */
+        fport->bufsize = (pj_uint32_t)buff_size;        
         
         /* Set initial position of the file. */