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/trunk@189137 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
f4542acb18
commit
7c43851bcf
|
@ -6545,7 +6545,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;
|
||||
|
|
|
@ -2336,7 +2336,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;
|
||||
|
@ -2372,11 +2372,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));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Reference in New Issue