diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2008-07-10 19:26:03 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2008-07-10 19:26:03 +0000 |
| commit | 110237399dcdb73e45945ab995fff97dc493b81a (patch) | |
| tree | e78421b7e01f99e631083dff1c7fb5681506cba3 /pjmedia | |
| parent | 7c153e1d4bf23fb36b94aa8cafb0c505864cfd93 (diff) | |
Added config settings for search range in WSOLA expand()
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2117 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia/wsola.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/pjmedia/src/pjmedia/wsola.c b/pjmedia/src/pjmedia/wsola.c index 1a07ed61..ef26e1a5 100644 --- a/pjmedia/src/pjmedia/wsola.c +++ b/pjmedia/src/pjmedia/wsola.c @@ -39,7 +39,7 @@ */ /* Buffer size including history, in frames */ -#define FRAME_CNT 5 +#define FRAME_CNT 6 /* Number of history frames in buffer */ #define HIST_CNT 1.5 @@ -53,6 +53,12 @@ /* 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 + #if 0 # define TRACE_(x) PJ_LOG(4,x) @@ -113,6 +119,12 @@ struct pjmedia_wsola 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 float *hanning; /* Hanning window. */ @@ -479,6 +491,10 @@ PJ_DEF(pj_status_t) pjmedia_wsola_create( pj_pool_t *pool, /* Setup with PLC */ 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); } /* Setup with hanning */ @@ -538,16 +554,16 @@ static void expand(pjmedia_wsola *wsola, unsigned needed) 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 * channel #0, in case of stereo? Probably not necessary, as |