kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 233046 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r233046 | mnick | 2009-12-04 09:38:33 -0600 (Fri, 04 Dec 2009) | 17 lines
  
  Merged revisions 233014 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r233014 | mnick | 2009-12-04 09:17:03 -0600 (Fri, 04 Dec 2009) | 11 lines
    
    Warning message gets displayed only once
    
    Added additional field 'int display_inband_dtmf_warning', which when set to '1' displays the warning ('Inband DTMF is not supported on codec %s. Use RFC2833'), and when set to '0' doesn't display the warning. Otherwise you would get hundreds of warnings every second.
    
    (closes issue #15769)
    Reported by: falves11
    Patches:
    	patch_15769_14.txt uploaded by mnick (license 874)
    Tested by: mnick, falves11
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@233047 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthias Nick
2009-12-04 15:46:46 +00:00
parent 6669e921ce
commit 7261fde74b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/dsp.c
View File

@@ -342,6 +342,7 @@ struct ast_dsp {
int digitmode;
int faxmode;
int thinkdigit;
int display_inband_dtmf_warning;
float genergy;
digit_detect_state_t digit_state;
tone_detect_state_t cng_tone_state;
@@ -1233,7 +1234,10 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp,
shortdata[x] = AST_ALAW(odata[x]);
break;
default:
ast_log(LOG_WARNING, "Inband DTMF is not supported on codec %s. Use RFC2833\n", ast_getformatname(af->subclass));
/*Display warning only once. Otherwise you would get hundreds of warnings every second */
if (dsp->display_inband_dtmf_warning)
ast_log(LOG_WARNING, "Inband DTMF is not supported on codec %s. Use RFC2833\n", ast_getformatname(af->subclass));
dsp->display_inband_dtmf_warning = 0;
return af;
}
silence = __ast_dsp_silence(dsp, shortdata, len, NULL);
@@ -1388,6 +1392,7 @@ struct ast_dsp *ast_dsp_new(void)
dsp->faxmode = DSP_FAXMODE_DETECT_CNG;
/* Initialize digit detector */
ast_digit_detect_init(&dsp->digit_state, dsp->digitmode & DSP_DIGITMODE_MF);
dsp->display_inband_dtmf_warning = 1;
/* Initialize initial DSP progress detect parameters */
ast_dsp_prog_reset(dsp);
/* Initialize fax detector */