Changeset 2145 for pjproject/trunk/pjmedia/src/pjmedia/wsola.c

Timestamp:

Jul 14, 2008 6:55:01 PM (16 years ago)

Author:

nanang

Message:

Ticket #570: Fixed find_pitch() search range iteration; and fixed wsola_generate() in deciding when to just return a frame from existing extra samples and when to expand/generate samples.

File:

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

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

@@ -162 +162 @@
 
         /* Do calculation on 8 samples at once */
-        for (i = 0; i<template_cnt; i+=8) {
+        for (i = 0; i<template_cnt-8; i+=8) {
             corr -= (int)sr[i+0] +
                     (int)sr[i+1] +
@@ -173 +173 @@
         }
 
-        /* Reverse back i if template_cnt is not multiplication of 8,
-         * the remaining samples will be processed below.
-         */
-        if (i != template_cnt)
-            i -= 8;
-
+        /* Process remaining samples */
         for (; i<template_cnt; ++i)
             corr -= (int)sr[i];
@@ -221 +216 @@
 
         /* Do calculation on 8 samples at once */
-        for (i=0; i<template_cnt; i += 8) {
+        for (i=0; i<template_cnt-8; i += 8) {
             corr += ((float)frm[i+0]) * ((float)sr[i+0]) + 
                     ((float)frm[i+1]) * ((float)sr[i+1]) + 
@@ -232 +227 @@
         }
 
-        /* Reverse back i if template_cnt is not multiplication of 8,
-         * the remaining samples will be processed below.
-         */
-        if (i != template_cnt)
-            i -= 8;
-
+        /* Process remaining samples. */
         for (; i<template_cnt; ++i) {
             corr += ((float)frm[i]) * ((float)sr[i]);
@@ -317 +307 @@
 
         /* Do calculation on 8 samples at once */
-        for (i=0; i<template_cnt; i+=8) {
+        for (i=0; i<template_cnt-8; i+=8) {
             corr += ((int)frm[i+0]) * ((int)sr[i+0]) + 
                     ((int)frm[i+1]) * ((int)sr[i+1]) + 
@@ -328 +318 @@
         }
 
-        /* Reverse back i if template_cnt is not multiplication of 8,
-         * the remaining samples will be processed below.
-         */
-        if (i != template_cnt)
-            i -= 8;
-
+        /* Process remaining samples. */
         for (; i<template_cnt; ++i) {
             corr += ((int)frm[i]) * ((int)sr[i]);
@@ -535 +520 @@
     pjmedia_circ_buf_reset(wsola->buf);
     pjmedia_circ_buf_set_len(wsola->buf, wsola->hist_size + wsola->min_extra);
+    pjmedia_zero_samples(wsola->buf->start, wsola->buf->len); 
 
     return PJ_SUCCESS;
@@ -575 +561 @@
                                 templ, start);
         } else {
+            /* Check if pointers are in the valid range */
+            CHECK_(templ >= wsola->buf->buf &&
+                   templ + wsola->hanning_size <= 
+                   wsola->buf->buf + wsola->buf->capacity);
+            CHECK_(start >= wsola->buf->buf &&
+                   start + wsola->hanning_size <= 
+                   wsola->buf->buf + wsola->buf->capacity);
+
             overlapp_add(wsola->merge_buf, wsola->hanning_size, templ, 
                          start, wsola->hanning);
@@ -583 +577 @@
 
         /* Not enough buffer to hold the result */
-        if (reg1_len + dist > wsola->buf_size)
+        if (reg1_len + dist > wsola->buf_size) {
+            pj_assert(!"WSOLA buffer size may be to small!");
             break;
+        }
 
         /* Copy the "tail" (excess frame) to the end */
@@ -672 +668 @@
 
     buf_len = pjmedia_circ_buf_get_len(wsola->buf);
-    CHECK_(buf_len >= (unsigned)(wsola->hist_size + wsola->min_extra));
 
     /* Update vars */
@@ -687 +682 @@
                                           &reg2, &reg2_len);
 
+        CHECK_(pjmedia_circ_buf_get_len(wsola->buf) >= 
+               (unsigned)(wsola->hist_size + (wsola->min_extra<<1)));
+
         if (reg2_len == 0) {
-            ola_left = reg1;
+            ola_left = reg1 + reg1_len - wsola->min_extra;
         } else if (reg2_len >= wsola->min_extra) {
             ola_left = reg2 + reg2_len - wsola->min_extra;
@@ -726 +724 @@
                                             pj_int16_t frm[])
 {
-    unsigned samples_len;
+    unsigned samples_len, samples_req;
+
+
     pj_status_t status = PJ_SUCCESS;
 
+    CHECK_(pjmedia_circ_buf_get_len(wsola->buf) >= wsola->hist_size + 
+           wsola->min_extra);
+
+    /* Calculate how many samples in the buffer */
     samples_len = pjmedia_circ_buf_get_len(wsola->buf) - wsola->hist_size;
+
+    /* Calculate how many samples are required to be available in the buffer */
+    samples_req = wsola->samples_per_frame + (wsola->min_extra << 1);
+    
     wsola->ts.u64 += wsola->samples_per_frame;
 
-    if (samples_len < (unsigned)wsola->samples_per_frame + 
-        (unsigned)wsola->min_extra) 
-    {
-        unsigned new_samples;
-
-        /* Calculate how many samples are needed for a new frame */
-        new_samples = wsola->samples_per_frame + wsola->min_extra - 
-                      samples_len;
-        if (wsola->expand_cnt == 0)
-            new_samples += wsola->min_extra;
-
+    if (samples_len < samples_req) {
         /* Expand buffer */
-        expand(wsola, new_samples);
+        expand(wsola, samples_req - samples_len);
         TRACE_((THIS_FILE, "Buf size after expanded = %d", 
                 pjmedia_circ_buf_get_len(wsola->buf)));