diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-17 21:55:34 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-17 21:55:34 +0000 |
| commit | 6ee7a0c313e0eaeaf124348a27044db3a047119b (patch) | |
| tree | 4ace076133576d8aa5fa5ffecfa6880682858a24 | |
| parent | c6eec4cd8a63d1b0db721afa7e4a97db418a0812 (diff) | |
Merged revisions 189137 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r189137 | rmudgett | 2009-04-17 16:48:10 -0500 (Fri, 17 Apr 2009) | 17 lines
Merged revisions 188833,189134 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r188833 | rmudgett | 2009-04-16 16:37:58 -0500 (Thu, 16 Apr 2009) | 4 lines
Only disable mISDN DSP if Asterisk DSP is enabled. Leave jitter setting alone.
JIRA ABE-1835
........
r189134 | rmudgett | 2009-04-17 16:27:55 -0500 (Fri, 17 Apr 2009) | 4 lines
Modifed/added some debug messages.
JIRA ABE-1835
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@189139 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_misdn.c | 1 | ||||
| -rw-r--r-- | channels/misdn/isdn_lib.c | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index e77800bb8..df91aa1d3 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -5725,7 +5725,6 @@ static int misdn_set_opt_exec(struct ast_channel *chan, void *data) if (ch->ast_dsp) { chan_misdn_log(1, ch->bc->port, "SETOPT: with AST_DSP we deactivate mISDN_dsp\n"); ch->bc->nodsp = 1; - ch->bc->nojitter = 1; } return 0; diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index e143ae588..2942ecfbb 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -2259,7 +2259,7 @@ void misdn_tx_jitter(struct misdn_bchannel *bc, int len) flip_buf_bits( data, jlen); if (jlen < len) { - cb_log(7,bc->port,"Jitterbuffer Underrun.\n"); + cb_log(1, bc->port, "Jitterbuffer Underrun. Got %d of expected %d\n", jlen, len); } txfrm->prim = DL_DATA|REQUEST; @@ -2295,11 +2295,16 @@ void misdn_tx_jitter(struct misdn_bchannel *bc, int len) txfrm->addr = bc->addr|FLG_MSG_DOWN; /* | IF_DOWN; */ txfrm->len =len; - cb_log(9, bc->port, "Transmitting %d samples 2 misdn\n", txfrm->len); + cb_log(5, bc->port, "Transmitting %d samples of silence to misdn\n", len); r=mISDN_write( glob_mgr->midev, buf, txfrm->len + mISDN_HEADER_LEN, 8000 ); +#else + r = 0; #endif + } + if (r < 0) { + cb_log(1, bc->port, "Error in mISDN_write (%s)\n", strerror(errno)); } } |