diff options
author | Benny Prijono <bennylp@teluu.com> | 2006-08-02 19:41:37 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2006-08-02 19:41:37 +0000 |
commit | 2a4656699b9fc1bc03ffb5723aa3da0cc1ba88c3 (patch) | |
tree | fe0650e2366e7853437bcae768049ddf335d1338 /pjsip | |
parent | 2c5b8f5dca277dd3fee1ab1298bb0b2308372eae (diff) |
Fix compilation error in MacOS because of recent changes in config.h, also disable AEC by default in pjsua-lib, and added ec-tail option in pjsua
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@643 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
-rw-r--r-- | pjsip/include/pjsua-lib/pjsua.h | 4 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h index 5ca718ce..5e549a34 100644 --- a/pjsip/include/pjsua-lib/pjsua.h +++ b/pjsip/include/pjsua-lib/pjsua.h @@ -2131,7 +2131,7 @@ struct pjsua_media_config /** * Echo canceller tail length, in miliseconds. * - * Default: 256 + * Default: 0 (disabled, for now) */ unsigned ec_tail_len; }; @@ -2152,7 +2152,7 @@ PJ_INLINE(void) pjsua_media_config_default(pjsua_media_config *cfg) cfg->thread_cnt = 1; cfg->quality = 6; cfg->ilbc_mode = 20; - cfg->ec_tail_len = 256; + cfg->ec_tail_len = 0; } diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 284cdb58..ffc228b6 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -969,7 +969,7 @@ PJ_DEF(pj_status_t) pjsua_set_snd_dev( int capture_dev, pj_assert(conf_port != NULL); /* Create AEC if it's not created */ - if (pjsua_var.aec_port == NULL) { + if (pjsua_var.aec_port == NULL && pjsua_var.media_cfg.ec_tail_len) { status = pjmedia_aec_port_create(pjsua_var.pool, conf_port, conf_port->info.clock_rate * pjsua_var.media_cfg.ec_tail_len / @@ -984,7 +984,9 @@ PJ_DEF(pj_status_t) pjsua_set_snd_dev( int capture_dev, } /* Connect to the AEC port */ - status = pjmedia_snd_port_connect(pjsua_var.snd_port, pjsua_var.aec_port); + status = pjmedia_snd_port_connect(pjsua_var.snd_port, + pjsua_var.media_cfg.ec_tail_len ? + pjsua_var.aec_port : conf_port ); if (status != PJ_SUCCESS) { pjsua_perror(THIS_FILE, "Unable to connect conference port to " "sound device", status); |