kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

change zt echo can to default to off and do not engage it when there is no preference and fix regression from OPENZAP-76 

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@1070 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Anthony Minessale 2010-03-19 18:49:29 +00:00
parent df91a7c8bd
commit 28561b8867
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c
View File

@ -546,7 +546,17 @@ static ZIO_CONFIGURE_FUNCTION(zt_configure)
} else { } else {
zt_globals.eclevel = num; zt_globals.eclevel = num;
} }
} else if (!strcasecmp(var, "echo_train_level")) {
if (zt_globals.eclevel < 1) {
zap_log(ZAP_LOG_WARNING, "can't set echo train level without setting echo cancel level first at line %d\n", lineno);
} else {
num = atoi(val);
if (num < 0 || num > 256) {
zap_log(ZAP_LOG_WARNING, "invalid echo can val at line %d\n", lineno);
} else {
zt_globals.etlevel = num;
}
}
} else if (!strcasecmp(var, "rxgain")) { } else if (!strcasecmp(var, "rxgain")) {
fnum = (float)atof(val); fnum = (float)atof(val);
if (fnum < -100.0 || fnum > 100.0) { if (fnum < -100.0 || fnum > 100.0) {
@ -601,24 +611,9 @@ static ZIO_OPEN_FUNCTION(zt_open)
zap_log(ZAP_LOG_ERROR, "%s\n", zchan->last_error); zap_log(ZAP_LOG_ERROR, "%s\n", zchan->last_error);
return ZAP_FAIL; return ZAP_FAIL;
} }
} else if (zchan->type == ZAP_CHAN_TYPE_FXS || zchan->type == ZAP_CHAN_TYPE_FXO || zchan->type == ZAP_CHAN_TYPE_EM) {
int len = zt_globals.eclevel;
if (ioctl(zchan->sockfd, codes.ECHOCANCEL, &len)) {
zap_log(ZAP_LOG_WARNING, "Echo cancel not available for %d:%d\n", zchan->span_id, zchan->chan_id);
//snprintf(zchan->last_error, sizeof(zchan->last_error), "%s", strerror(errno));
//zap_log(ZAP_LOG_ERROR, "%s\n", zchan->last_error);
//return ZAP_FAIL;
} else {
len = zt_globals.etlevel;
if (ioctl(zchan->sockfd, codes.ECHOTRAIN, &len)) {
zap_log(ZAP_LOG_WARNING, "Echo training not available for %d:%d\n", zchan->span_id, zchan->chan_id);
//snprintf(zchan->last_error, sizeof(zchan->last_error), "%s", strerror(errno));
//zap_log(ZAP_LOG_ERROR, "%s\n", zchan->last_error);
//return ZAP_FAIL;
}
}
} }
if(zt_globals.rxgain || zt_globals.txgain) {
if (zt_globals.rxgain || zt_globals.txgain) {
struct zt_gains gains; struct zt_gains gains;
memset(&gains, 0, sizeof(gains)); memset(&gains, 0, sizeof(gains));
@ -636,16 +631,18 @@ static ZIO_OPEN_FUNCTION(zt_open)
} }
} }
int len = zt_globals.eclevel; if (zt_globals.eclevel > 0) {
zap_log(ZAP_LOG_INFO, "Setting echo cancel to %d taps for %d:%d\n", len, zchan->span_id, zchan->chan_id); int len = zt_globals.eclevel;
if (ioctl(zchan->sockfd, codes.ECHOCANCEL, &len)) { zap_log(ZAP_LOG_INFO, "Setting echo cancel to %d taps for %d:%d\n", len, zchan->span_id, zchan->chan_id);
if (ioctl(zchan->sockfd, codes.ECHOCANCEL, &len)) {
zap_log(ZAP_LOG_WARNING, "Echo cancel not available for %d:%d\n", zchan->span_id, zchan->chan_id); zap_log(ZAP_LOG_WARNING, "Echo cancel not available for %d:%d\n", zchan->span_id, zchan->chan_id);
} else { } else if (zt_globals.etlevel > 0) {
len = zt_globals.etlevel; len = zt_globals.etlevel;
if (ioctl(zchan->sockfd, codes.ECHOTRAIN, &len)) { if (ioctl(zchan->sockfd, codes.ECHOTRAIN, &len)) {
zap_log(ZAP_LOG_WARNING, "Echo training not available for %d:%d\n", zchan->span_id, zchan->chan_id); zap_log(ZAP_LOG_WARNING, "Echo training not available for %d:%d\n", zchan->span_id, zchan->chan_id);
} }
} }
}
} }
return ZAP_SUCCESS; return ZAP_SUCCESS;
@ -1195,7 +1192,7 @@ static ZIO_IO_LOAD_FUNCTION(zt_init)
zt_globals.codec_ms = 20; zt_globals.codec_ms = 20;
zt_globals.wink_ms = 150; zt_globals.wink_ms = 150;
zt_globals.flash_ms = 750; zt_globals.flash_ms = 750;
zt_globals.eclevel = 64; zt_globals.eclevel = 0;
zt_globals.etlevel = 0; zt_globals.etlevel = 0;
zt_interface.name = "zt"; zt_interface.name = "zt";