[asterisk-commits] russell: trunk r61764 - in /trunk: ./ main/channel.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Apr 23 12:58:15 2007
New Revision: 61764

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61764
Log:
Merged revisions 61763 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61763 | russell | 2007-04-23 12:57:32 -0500 (Mon, 23 Apr 2007) | 4 lines

Ensure that digits passing through Asterisk have a reasonable minimum length.
It is currently 100 ms.  If someone thinks this should be different, feel free
to speak up.  (related to issues #8944, #9250, and #9348)

........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=61764&r1=61763&r2=61764
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Apr 23 12:58:15 2007
@@ -2226,7 +2226,7 @@
 				ast_set_flag(chan, AST_FLAG_EMULATE_DTMF);
 				chan->emulate_dtmf_digit = f->subclass;
 				chan->dtmf_begin_tv = ast_tvnow();
-				if (f->len)
+				if (f->len && f->len > AST_DEFAULT_EMULATE_DTMF_DURATION)
 					chan->emulate_dtmf_duration = f->len;
 				else
 					chan->emulate_dtmf_duration = AST_DEFAULT_EMULATE_DTMF_DURATION;
@@ -2234,6 +2234,12 @@
 				ast_clear_flag(chan, AST_FLAG_IN_DTMF);
 				if (!f->len)
 					f->len = ast_tvdiff_ms(ast_tvnow(), chan->dtmf_begin_tv);
+				if (f->len < AST_DEFAULT_EMULATE_DTMF_DURATION) {
+					ast_set_flag(chan, AST_FLAG_EMULATE_DTMF);
+					chan->emulate_dtmf_digit = f->subclass;
+					chan->emulate_dtmf_duration = AST_DEFAULT_EMULATE_DTMF_DURATION - f->len;
+					f = &ast_null_frame;
+				}
 			}
 			break;
 		case AST_FRAME_DTMF_BEGIN: