Changeset 1829

Timestamp:

Feb 28, 2008 11:39:38 PM (17 years ago)

Author:

bennylp

Message:

Fixed bug in wsola when discarding frame in non-contiguous buffer

File:

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

pjproject/trunk/pjmedia/src/pjmedia/wsola.c

@@ -590 +590 @@
         } else {
             unsigned buf_cnt = buf1_cnt + buf2_cnt;
-            unsigned max;
-
-            if (buf_cnt > ERASE_CNT * wsola->samples_per_frame)
+            short *rem; /* remainder */
+            unsigned rem_cnt;
+
+            if (buf_cnt > ERASE_CNT * wsola->samples_per_frame) {
                 buf_cnt = ERASE_CNT * wsola->samples_per_frame;
+                
+                rem_cnt = buf1_cnt + buf2_cnt - buf_cnt;
+                rem = buf2 + buf2_cnt - rem_cnt;
+                
+            } else {
+                rem = NULL;
+                rem_cnt = 0;
+            }
 
             pjmedia_copy_samples(wsola->erasebuf, buf1, buf1_cnt);
@@ -603 +612 @@
             buf_cnt -= (*del_cnt);
 
-            max = buf_cnt;
-            if (max > buf1_cnt)
-                max = buf1_cnt;
-            pjmedia_copy_samples(buf1, wsola->erasebuf, max);
-
-            if (max < buf_cnt) {
-                pjmedia_copy_samples(buf2, wsola->erasebuf+max, buf_cnt-max);
+            /* Copy back to buffers */
+            if (buf_cnt == buf1_cnt) {
+                pjmedia_copy_samples(buf1, wsola->erasebuf, buf_cnt);
+                if (rem_cnt) {
+                    pjmedia_move_samples(buf2, rem, rem_cnt);
+                }
+            } else if (buf_cnt < buf1_cnt) {
+                pjmedia_copy_samples(buf1, wsola->erasebuf, buf_cnt);
+                if (rem_cnt) {
+                    unsigned c = rem_cnt;
+                    if (c > buf1_cnt-buf_cnt) {
+                        c = buf1_cnt-buf_cnt;
+                    }
+                    pjmedia_copy_samples(buf1+buf_cnt, rem, c);
+                    rem += c;
+                    rem_cnt -= c;
+                    if (rem_cnt)
+                        pjmedia_move_samples(buf2, rem, rem_cnt);
+                }
+            } else {
+                pjmedia_copy_samples(buf1, wsola->erasebuf, buf1_cnt);
+                pjmedia_copy_samples(buf2, wsola->erasebuf+buf1_cnt, 
+                                     buf_cnt-buf1_cnt);
+                if (rem_cnt) {
+                    pjmedia_move_samples(buf2+buf_cnt-buf1_cnt, rem,
+                                         rem_cnt);
+                }
             }
+
         }
     }