[asterisk-commits] oej: branch oej/rana-dtmf-rtp-duration-1.6.0 r332232 - /team/oej/rana-dtmf-rt...

[SVN commits to the Asterisk project]

Author: oej
Date: Wed Aug 17 04:14:11 2011
New Revision: 332232

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=332232
Log:
Just debugging stuff

Modified:
    team/oej/rana-dtmf-rtp-duration-1.6.0/main/channel.c
    team/oej/rana-dtmf-rtp-duration-1.6.0/main/rtp.c

Modified: team/oej/rana-dtmf-rtp-duration-1.6.0/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/rana-dtmf-rtp-duration-1.6.0/main/channel.c?view=diff&rev=332232&r1=332231&r2=332232
==============================================================================
--- team/oej/rana-dtmf-rtp-duration-1.6.0/main/channel.c (original)
+++ team/oej/rana-dtmf-rtp-duration-1.6.0/main/channel.c Wed Aug 17 04:14:11 2011
@@ -4956,7 +4956,7 @@
 				*fo = f;
 				*rc = who;
 				ast_debug(1, "Got DTMF %s on channel (%s)\n", 
-					f->frametype == AST_FRAME_DTMF_END ? "end" : "begin",	/* BUG for continue. Ignored now. OEJ */
+					f->frametype == AST_FRAME_DTMF_END ? "end" : (AST_FRAME_DTMF_CONTINUE ? "cont" : "begin"),	
 					who->name);
 
 				break;

Modified: team/oej/rana-dtmf-rtp-duration-1.6.0/main/rtp.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/rana-dtmf-rtp-duration-1.6.0/main/rtp.c?view=diff&rev=332232&r1=332231&r2=332232
==============================================================================
--- team/oej/rana-dtmf-rtp-duration-1.6.0/main/rtp.c (original)
+++ team/oej/rana-dtmf-rtp-duration-1.6.0/main/rtp.c Wed Aug 17 04:14:11 2011
@@ -1466,6 +1466,7 @@
 		if (rtp->sending_digit == 1)  {
 			rtp->sending_digit = 2;
 		}
+		ast_debug(2, "---Skipping sending continue frame Sending_digit = %d\n", rtp->sending_digit);
 	}
 
 	len = sizeof(sin);
@@ -2732,6 +2733,7 @@
 
 	/* Since we received a begin, we can safely store the digit and disable any compensation */
 	rtp->sending_digit = 1;
+	ast_debug(3, "OEJ --->>> Sending digit = 1!!!! \n");
 	rtp->send_digit = digit;
 	rtp->send_payload = payload;
 
@@ -2744,6 +2746,9 @@
 int ast_rtp_senddigit_continue(struct ast_rtp *rtp, char digit, unsigned int duration)
 {
 	ast_log(LOG_DEBUG, "DEBUG DTMF CONTINUE - Duration %d Digit %d Send-digit %d\n", duration, digit, rtp->send_digit);
+
+	/* If we missed the BEGIN, we will have to turn on the flag */
+	rtp->sending_digit = 2;
 
 	/* Duration is in ms. Calculate the duration in timestamps */
 	if (duration > 0) {
@@ -2894,6 +2899,7 @@
 	ast_log(LOG_DEBUG, "-- DTMF END: Duration samples sent %d got %d ms (%d samples)\n", rtp->send_duration, duration, dursamples);
 	rtp->lastts += rtp->send_duration;
 	rtp->sending_digit = 0;
+	ast_debug(2, "OEJ ---->>>> Turning off sending_digit\n");
 	rtp->send_digit = 0;
 	rtp->received_duration = 0;