kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 11:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inband DTMF regression

Browse Source 
The functionality of inband DTMF in chan_sip relied upon
ast_rtp_instance_dtmf_mode_get/set not working properly to avoid calling
ast_rtp_instance_dtmf_begin/end on RTP streams with inband DTMF. According to
documentation, ast_rtp_instance_dtmf_begin/end is meant only for RFC2833 DTMF,
never inband.  This fixes the regression introduced in revision 328823.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@328935 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2011-07-20 19:00:23 +00:00
parent c7afb0eaf1
commit 58548d6eb9
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
channels/chan_sip.c
View File

@@ -6486,11 +6486,7 @@ static int sip_senddigit_begin(struct ast_channel *ast, char digit)
sip_pvt_lock(p); sip_pvt_lock(p);
switch (ast_test_flag(&p->flags[0], SIP_DTMF)) { switch (ast_test_flag(&p->flags[0], SIP_DTMF)) {
case SIP_DTMF_INBAND: case SIP_DTMF_INBAND:
if (p->rtp && ast_rtp_instance_dtmf_mode_get(p->rtp) == AST_RTP_DTMF_MODE_INBAND) { res = -1; /* Tell Asterisk to generate inband indications */
ast_rtp_instance_dtmf_begin(p->rtp, digit);
} else {
res = -1; /* Tell Asterisk to generate inband indications */
}
break; break;
case SIP_DTMF_RFC2833: case SIP_DTMF_RFC2833:
if (p->rtp) if (p->rtp)
@@ -6522,11 +6518,7 @@ static int sip_senddigit_end(struct ast_channel *ast, char digit, unsigned int d
ast_rtp_instance_dtmf_end_with_duration(p->rtp, digit, duration); ast_rtp_instance_dtmf_end_with_duration(p->rtp, digit, duration);
break; break;
case SIP_DTMF_INBAND: case SIP_DTMF_INBAND:
if (p->rtp && ast_rtp_instance_dtmf_mode_get(p->rtp) == AST_RTP_DTMF_MODE_INBAND) { res = -1; /* Tell Asterisk to stop inband indications */
ast_rtp_instance_dtmf_end(p->rtp, digit);
} else {
res = -1; /* Tell Asterisk to stop inband indications */
}
break; break;
} }
sip_pvt_unlock(p); sip_pvt_unlock(p);