Merge the changes from the /team/group/vldtmf_fixup branch.

The main bug being addressed here is a problem introduced when two SIP
channels using SIP INFO dtmf have their media directly bridged.  So, when a
DTMF END frame comes into Asterisk from an incoming INFO message, Asterisk
would try to emulate a digit of some length by first sending a DTMF BEGIN
frame and sending a DTMF END later timed off of incoming audio.  However,
since there was no audio coming in, the DTMF_END was never generated.  This
caused DTMF based features to no longer work.

To fix this, the core now knows when a channel doesn't care about DTMF BEGIN
frames (such as a SIP channel sending INFO dtmf).  If this is the case, then
Asterisk will not emulate a digit of some length, and will instead just pass
through the single DTMF END event.

Channel drivers also now get passed the length of the digit to their digit_end
callback.  This improves SIP INFO support even further by enabling us to put
the real digit duration in the INFO message instead of a hard coded 250ms.
Also, for an incoming INFO message, the duration is read from the frame and
passed into the core instead of just getting ignored.

(issue #8597, maybe others...)


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@51311 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 3 insertions, 5 deletions

diff --git a/main/frame.c b/main/frame.c
index 83599fff8..0cd0b03fb 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -496,11 +496,9 @@ struct ast_frame *ast_frdup(const struct ast_frame *f)
 		strcpy((char *)out->src, f->src);
 	}
 	out->has_timing_info = f->has_timing_info;
-	if (f->has_timing_info) {
-		out->ts = f->ts;
-		out->len = f->len;
-		out->seqno = f->seqno;
-	}
+	out->ts = f->ts;
+	out->len = f->len;
+	out->seqno = f->seqno;
 	return out;
 }