From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 20 Nov 2014 18:07:05 +0000 (-0600)
Subject: FS-7500 FS-7508: shift some hacks around
X-Git-Tag: v1.6.2~614^2~569
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=140a1c966160a54c9f5bf8e70c9dd68e91b9a638;p=thirdparty%2Ffreeswitch.git

FS-7500 FS-7508: shift some hacks around
---

diff --git a/src/mod/codecs/mod_vpx/mod_vpx.c b/src/mod/codecs/mod_vpx/mod_vpx.c
index 13d2382f84..70ee6b4123 100644
--- a/src/mod/codecs/mod_vpx/mod_vpx.c
+++ b/src/mod/codecs/mod_vpx/mod_vpx.c
@@ -581,9 +581,9 @@ end:
 		switch_buffer_zero(context->vpx_packet_buffer);
 	}
 
-	if (frame->img) {
-		switch_set_flag(frame, SFF_USE_VIDEO_TIMESTAMP);
-	} else {
+	if (!frame->img) {
+		//switch_set_flag(frame, SFF_USE_VIDEO_TIMESTAMP);
+		//} else {
 		status = SWITCH_STATUS_MORE_DATA;
 	}
 
diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index db0f487384..924a083dea 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -5189,7 +5189,7 @@ static switch_status_t process_rtcp_packet(switch_rtp_t *rtp_session, switch_siz
 
 
 		//DFF
-		if (0 && rtp_session->flags[SWITCH_RTP_FLAG_VIDEO] && *bytes > 94) {
+		if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO] && *bytes > 94) {
 			//(rtp_session->rtcp_recv_msg_p->header.type == 205 || //RTPFB
 			//rtp_session->rtcp_recv_msg_p->header.type == 206)) {//PSFB
 			
@@ -6518,7 +6518,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
 	}
 
 	/* TMP DISABLE DFF  */
-	if (0 && switch_rtp_test_flag(rtp_session, SWITCH_RTP_FLAG_VIDEO)) {
+	if (switch_rtp_test_flag(rtp_session, SWITCH_RTP_FLAG_VIDEO)) {
 		/* Normalize the timestamps to our own base by generating a made up starting point then adding the measured deltas to that base 
 		   so if the timestamps and ssrc of the source change, it will not break the other end's jitter bufffer / decoder etc *cough* CHROME *cough*
 		 */
@@ -6538,11 +6538,14 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
 			rtp_session->ts_norm.last_ssrc = send_msg->header.ssrc;
 			rtp_session->ts_norm.last_frame = ntohl(send_msg->header.ts);
 		}
-
+		
 
 		if (ntohl(send_msg->header.ts) != rtp_session->ts_norm.last_frame) {
 			rtp_session->ts_norm.delta = ntohl(send_msg->header.ts) - rtp_session->ts_norm.last_frame;
 			rtp_session->ts_norm.ts += rtp_session->ts_norm.delta;
+			//switch_core_timer_sync(&rtp_session->timer);
+			//printf("W00t %d\n", rtp_session->timer.samplecount);
+			//rtp_session->ts_norm.ts = rtp_session->timer.samplecount;
 		}
 		
 		rtp_session->ts_norm.last_frame = ntohl(send_msg->header.ts);