Revision

16207

Author

anthm

Date

2010-01-07 18:45:09 -0600 (Thu, 07 Jan 2010)

Log Message

FSCORE-523

Modified Paths

• freeswitch/trunk/libs/stfu/stfu.c
• freeswitch/trunk/libs/stfu/stfu.h
• freeswitch/trunk/src/switch_ivr.c
• freeswitch/trunk/src/switch_rtp.c

Diff

--- freeswitch/trunk/libs/stfu/stfu.c	2010-01-08 00:41:10 UTC (rev 16206)
+++ freeswitch/trunk/libs/stfu/stfu.c	2010-01-08 00:45:09 UTC (rev 16207)
@@ -178,7 +178,7 @@
 	return 0;
 }
 
-stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, void *data, size_t datalen, int last)
+stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void *data, size_t datalen, int last)
 {
 	uint32_t index;
 	stfu_frame_t *frame;
@@ -203,10 +203,7 @@
 		if (stfu_n_process(i, i->out_queue) < 0) {
             if (i->in_queue->array_len == i->in_queue->array_size && i->out_queue->array_len == i->out_queue->array_size) {
                 stfu_n_resize(i, i->out_queue->array_size * 2);
-                printf("DOH RESIZE\n");
             }
-
-
 			//return STFU_IT_FAILED;
 		}
 		for(index = 0; index < i->out_queue->array_len; index++) {
@@ -226,6 +223,7 @@
 	}
 
 	memcpy(frame->data, data, cplen);
+    frame->pt = pt;
 	frame->ts = ts;
 	frame->dlen = cplen;
 	frame->was_read = 0;	

--- freeswitch/trunk/libs/stfu/stfu.h	2010-01-08 00:41:10 UTC (rev 16206)
+++ freeswitch/trunk/libs/stfu/stfu.h	2010-01-08 00:45:09 UTC (rev 16207)
@@ -74,6 +74,7 @@
 
 struct stfu_frame {
 	uint32_t ts;
+	uint32_t pt;
 	uint8_t data[STFU_DATALEN];
 	size_t dlen;
 	uint8_t was_read;
@@ -97,12 +98,12 @@
 void stfu_n_destroy(stfu_instance_t **i);
 stfu_instance_t *stfu_n_init(uint32_t qlen);
 stfu_status_t stfu_n_resize(stfu_instance_t *i, uint32_t qlen);
-stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, void *data, size_t datalen, int last);
+stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint32_t pt, void *data, size_t datalen, int last);
 stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i);
 void stfu_n_reset(stfu_instance_t *i);
 
 #define stfu_im_done(i) stfu_n_add_data(i, 0, NULL, 0, 1)
-#define stfu_n_eat(i,t,d,l) stfu_n_add_data(i, t, d, l, 0)
+#define stfu_n_eat(i,t,p,d,l) stfu_n_add_data(i, t, p, d, l, 0)
 
 #ifdef __cplusplus
 }

--- freeswitch/trunk/src/switch_ivr.c	2010-01-08 00:41:10 UTC (rev 16206)
+++ freeswitch/trunk/src/switch_ivr.c	2010-01-08 00:45:09 UTC (rev 16207)
@@ -2046,7 +2046,7 @@
 			break;
 		}
 
-		stfu_n_eat(jb, ts, read_frame->data, read_frame->datalen);
+		stfu_n_eat(jb, ts, read_frame->payload, read_frame->data, read_frame->datalen);
 		ts += interval;
 
 		if ((jb_frame = stfu_n_read_a_frame(jb))) {

--- freeswitch/trunk/src/switch_rtp.c	2010-01-08 00:41:10 UTC (rev 16206)
+++ freeswitch/trunk/src/switch_rtp.c	2010-01-08 00:45:09 UTC (rev 16207)
@@ -1763,12 +1763,18 @@
 		rtp_session->stats.inbound.packet_count++;
 	}
 
+	if (rtp_session->te && rtp_session->recv_msg.header.pt == rtp_session->te) {
+		return SWITCH_STATUS_SUCCESS;
+	}
+
+
 	if (rtp_session->jb && rtp_session->recv_msg.header.version == 2 && *bytes) {
 		if (rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->te) {
 			stfu_n_reset(rtp_session->jb);
 		}
 		
-		stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, *bytes - rtp_header_len);				
+		stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.header.pt, 
+				   rtp_session->recv_msg.body, *bytes - rtp_header_len);				
 		*bytes = 0;
 		status = SWITCH_STATUS_FALSE;
 	}
@@ -1783,7 +1789,8 @@
 			}
 			*bytes = jb_frame->dlen + rtp_header_len;
 			rtp_session->recv_msg.header.ts = htonl(jb_frame->ts);
-			rtp_session->recv_msg.header.pt = rtp_session->payload;
+			rtp_session->recv_msg.header.pt = jb_frame->pt;
+
 			status = SWITCH_STATUS_SUCCESS;
 		}
 	}