From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 16 Jan 2015 16:29:30 +0000 (-0600)
Subject: FS-7501: tweak some settings on jb
X-Git-Tag: v1.6.2~614^2~492
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac2e1b692e01c2c5c115dfbf4dc38a66c1400a82;p=thirdparty%2Ffreeswitch.git

FS-7501: tweak some settings on jb
---

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 05db7298dd..ba6ad1df53 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -5693,7 +5693,6 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 		
 		if (!rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER] && rtp_session->read_pollfd) {
 			int pt = poll_sec * 1000000;
-			int force = 0;
 
 			do_2833(rtp_session);
 
@@ -5711,15 +5710,14 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 				pt = 200000;
 			}
 
-			//if (rtp_session->vb && switch_vb_poll(rtp_session->vb)) {
-			//	pt = 1000;
-			//	force = 1;
-			//}
-
-			poll_status = switch_poll(rtp_session->read_pollfd, 1, &fdr, pt);
+			if (rtp_session->vb && switch_vb_poll(rtp_session->vb)) {
+				pt = 1000;
+			}
 
-			if (rtp_session->vb && force) {
-				poll_status = SWITCH_STATUS_SUCCESS;
+			if ((poll_status = switch_poll(rtp_session->read_pollfd, 1, &fdr, pt)) != SWITCH_STATUS_SUCCESS) {
+				if (rtp_session->vb && switch_vb_poll(rtp_session->vb)) {
+					poll_status = SWITCH_STATUS_SUCCESS;
+				}
 			}
 
 			if (!rtp_session->flags[SWITCH_RTP_FLAG_VIDEO] && rtp_session->dtmf_data.out_digit_dur > 0) {