Changeset 2117

Timestamp:

Jul 10, 2008 7:26:03 PM (16 years ago)

Author:

nanang

Message:

Added config settings for search range in WSOLA expand()

File:

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

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

@@ -40 +40 @@
 
 /* Buffer size including history, in frames */
-#define FRAME_CNT       5
+#define FRAME_CNT       6
 
 /* Number of history frames in buffer */
@@ -53 +53 @@
 /* Number of frames in erase buffer */
 #define ERASE_CNT       ((unsigned)3)
+
+/* Minimum distance from template for find_pitch() of expansion, in frames */
+#define EXP_MIN_DIST    0.5
+
+/* Maximum distance from template for find_pitch() of expansion, in frames */
+#define EXP_MAX_DIST    HIST_CNT
 
 
@@ -114 +120 @@
     pj_uint16_t          min_extra;         /* Minimum extra (const)        */
     pj_uint16_t          expand_cnt;        /* Consecutive expansion count  */
+    pj_uint16_t          expand_sr_min_dist;/* Minimum distance from template 
+                                               for find_pitch() on expansion
+                                               (const)                      */
+    pj_uint16_t          expand_sr_max_dist;/* Maximum distance from template 
+                                               for find_pitch() on expansion
+                                               (const)                      */
 
 #if defined(PJ_HAS_FLOATING_POINT) && PJ_HAS_FLOATING_POINT!=0
@@ -480 +492 @@
     if ((options & PJMEDIA_WSOLA_NO_PLC) == 0) {
         wsola->min_extra = wsola->hanning_size;
+        wsola->expand_sr_min_dist = (pj_uint16_t)
+                                    (EXP_MIN_DIST * wsola->samples_per_frame);
+        wsola->expand_sr_max_dist = (pj_uint16_t)
+                                    (EXP_MAX_DIST * wsola->samples_per_frame);
     }
 
@@ -539 +555 @@
     for (rep=1;; ++rep) {
         pj_int16_t *start, *templ;
-        unsigned min_dist, max_dist, dist;
+        unsigned dist;
 
         templ = reg1 + reg1_len - wsola->hanning_size;
         CHECK_(templ - reg1 >= wsola->hist_size);
 
-        max_dist = wsola->hist_size;
-        min_dist = wsola->hanning_size >> 1;
-
-        start = find_pitch(templ, templ - max_dist, templ - min_dist,
-                           wsola->templ_size, 1);
+        start = find_pitch(templ, 
+                           templ - wsola->expand_sr_max_dist, 
+                           templ - wsola->expand_sr_min_dist,
+                           wsola->templ_size, 
+                           1);
 
         /* Should we make sure that "start" is really aligned to