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

Merged revisions 263949 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r263949 | tilghman | 2010-05-19 01:32:27 -0500 (Wed, 19 May 2010) | 8 lines
  
  Because progress is called multiple times, across several frames, we must persist states when detecting multitone sequences.
  
  (closes issue #16749)
   Reported by: dant
   Patches: 
         dsp.c-bug16749-1.patch uploaded by dant (license 670)
   Tested by: dant
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@263950 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-05-19 06:41:04 +00:00
parent 19f4ca6176
commit f55aff74ed
1 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
main/dsp.c
View File

@@ -990,10 +990,13 @@ static int __ast_dsp_call_progress(struct ast_dsp *dsp, short *s, int len)
} else if (hz[HZ_950] > TONE_MIN_THRESH * TONE_THRESH) { } else if (hz[HZ_950] > TONE_MIN_THRESH * TONE_THRESH) {
newstate = DSP_TONE_STATE_SPECIAL1; newstate = DSP_TONE_STATE_SPECIAL1;
} else if (hz[HZ_1400] > TONE_MIN_THRESH * TONE_THRESH) { } else if (hz[HZ_1400] > TONE_MIN_THRESH * TONE_THRESH) {
if (dsp->tstate == DSP_TONE_STATE_SPECIAL1) /* End of SPECIAL1 or middle of SPECIAL2 */
if (dsp->tstate == DSP_TONE_STATE_SPECIAL1 || dsp->tstate == DSP_TONE_STATE_SPECIAL2) {
newstate = DSP_TONE_STATE_SPECIAL2; newstate = DSP_TONE_STATE_SPECIAL2;
}
} else if (hz[HZ_1800] > TONE_MIN_THRESH * TONE_THRESH) { } else if (hz[HZ_1800] > TONE_MIN_THRESH * TONE_THRESH) {
if (dsp->tstate == DSP_TONE_STATE_SPECIAL2) { /* End of SPECIAL2 or middle of SPECIAL3 */
if (dsp->tstate == DSP_TONE_STATE_SPECIAL2 || dsp->tstate == DSP_TONE_STATE_SPECIAL3) {
newstate = DSP_TONE_STATE_SPECIAL3; newstate = DSP_TONE_STATE_SPECIAL3;
} }
} else if (dsp->genergy > TONE_MIN_THRESH * TONE_THRESH) { } else if (dsp->genergy > TONE_MIN_THRESH * TONE_THRESH) {
@@ -1027,43 +1030,43 @@ static int __ast_dsp_call_progress(struct ast_dsp *dsp, short *s, int len)
dsp->ringtimeout++; dsp->ringtimeout++;
} }
switch (dsp->tstate) { switch (dsp->tstate) {
case DSP_TONE_STATE_RINGING: case DSP_TONE_STATE_RINGING:
if ((dsp->features & DSP_PROGRESS_RINGING) && if ((dsp->features & DSP_PROGRESS_RINGING) &&
(dsp->tcount==THRESH_RING)) { (dsp->tcount == THRESH_RING)) {
res = AST_CONTROL_RINGING; res = AST_CONTROL_RINGING;
dsp->ringtimeout= 1; dsp->ringtimeout = 1;
} }
break; break;
case DSP_TONE_STATE_BUSY: case DSP_TONE_STATE_BUSY:
if ((dsp->features & DSP_PROGRESS_BUSY) && if ((dsp->features & DSP_PROGRESS_BUSY) &&
(dsp->tcount==THRESH_BUSY)) { (dsp->tcount == THRESH_BUSY)) {
res = AST_CONTROL_BUSY; res = AST_CONTROL_BUSY;
dsp->features &= ~DSP_FEATURE_CALL_PROGRESS; dsp->features &= ~DSP_FEATURE_CALL_PROGRESS;
} }
break; break;
case DSP_TONE_STATE_TALKING: case DSP_TONE_STATE_TALKING:
if ((dsp->features & DSP_PROGRESS_TALK) && if ((dsp->features & DSP_PROGRESS_TALK) &&
(dsp->tcount==THRESH_TALK)) { (dsp->tcount == THRESH_TALK)) {
res = AST_CONTROL_ANSWER; res = AST_CONTROL_ANSWER;
dsp->features &= ~DSP_FEATURE_CALL_PROGRESS; dsp->features &= ~DSP_FEATURE_CALL_PROGRESS;
} }
break; break;
case DSP_TONE_STATE_SPECIAL3: case DSP_TONE_STATE_SPECIAL3:
if ((dsp->features & DSP_PROGRESS_CONGESTION) && if ((dsp->features & DSP_PROGRESS_CONGESTION) &&
(dsp->tcount==THRESH_CONGESTION)) { (dsp->tcount == THRESH_CONGESTION)) {
res = AST_CONTROL_CONGESTION; res = AST_CONTROL_CONGESTION;
dsp->features &= ~DSP_FEATURE_CALL_PROGRESS; dsp->features &= ~DSP_FEATURE_CALL_PROGRESS;
} }
break; break;
case DSP_TONE_STATE_HUNGUP: case DSP_TONE_STATE_HUNGUP:
if ((dsp->features & DSP_FEATURE_CALL_PROGRESS) && if ((dsp->features & DSP_FEATURE_CALL_PROGRESS) &&
(dsp->tcount==THRESH_HANGUP)) { (dsp->tcount == THRESH_HANGUP)) {
res = AST_CONTROL_HANGUP; res = AST_CONTROL_HANGUP;
dsp->features &= ~DSP_FEATURE_CALL_PROGRESS; dsp->features &= ~DSP_FEATURE_CALL_PROGRESS;
} }
break; break;
} }
if (dsp->ringtimeout==THRESH_RING2ANSWER) { if (dsp->ringtimeout == THRESH_RING2ANSWER) {
ast_debug(1, "Consider call as answered because of timeout after last ring\n"); ast_debug(1, "Consider call as answered because of timeout after last ring\n");
res = AST_CONTROL_ANSWER; res = AST_CONTROL_ANSWER;
dsp->features &= ~DSP_FEATURE_CALL_PROGRESS; dsp->features &= ~DSP_FEATURE_CALL_PROGRESS;
@@ -1074,8 +1077,8 @@ static int __ast_dsp_call_progress(struct ast_dsp *dsp, short *s, int len)
dsp->tstate = newstate; dsp->tstate = newstate;
dsp->tcount = 1; dsp->tcount = 1;
} }
/* Reset goertzel */ /* Reset goertzel */
for (x = 0; x < 7; x++) { for (x = 0; x < 7; x++) {
dsp->freqs[x].v2 = dsp->freqs[x].v3 = 0.0; dsp->freqs[x].v2 = dsp->freqs[x].v3 = 0.0;
} }