FS-7500 FS-7508: shift some hacks around

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;
 	}
 

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);