FS-9697 add-on

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index f8fb31dffd7cc18d0818bc52ff4c62b3bdf6c756..98829e2461c36f1eacc6a24e63209b078aaec6da 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -778,6 +778,7 @@ typedef enum {
        SWITCH_RTP_FLAG_GEN_TS_MANUAL,
        SWITCH_RTP_FLAG_DETECT_SSRC,
        SWITCH_RTP_FLAG_TEXT,
+       SWITCH_RTP_FLAG_OLD_FIR,
        SWITCH_RTP_FLAG_INVALID
 } switch_rtp_flag_t;
 

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index af331c7b6990bc9387e34748ac5e272671b84af2..3d42f8d3a35ea8402f57e256f82058839813d75d 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -2174,6 +2174,16 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
                                switch_rtcp_ext_hdr_t *ext_hdr;
                                rtcp_fir_t *fir;
 
+                               if (switch_rtp_test_flag(rtp_session, SWITCH_RTP_FLAG_OLD_FIR)) {
+                                       p = (uint8_t *) (&rtp_session->rtcp_send_msg) + rtcp_bytes;
+                                       ext_hdr = (switch_rtcp_ext_hdr_t *) p;
+                                       
+                                       ext_hdr->version = 2;
+                                       ext_hdr->pt = _RTCP_PT_FIR;
+                                       rtcp_bytes += sizeof(switch_rtcp_ext_hdr_t);
+                               }
+
+
                                p = (uint8_t *) (&rtp_session->rtcp_send_msg) + rtcp_bytes;
                                ext_hdr = (switch_rtcp_ext_hdr_t *) p;
 
@@ -4417,7 +4427,7 @@ SWITCH_DECLARE(void) switch_rtp_video_refresh(switch_rtp_t *rtp_session)
                return;
        }
 
-       if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO] && (rtp_session->ice.ice_user || rtp_session->flags[SWITCH_RTP_FLAG_FIR])) {
+       if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO] && (rtp_session->ice.ice_user || rtp_session->flags[SWITCH_RTP_FLAG_FIR] || rtp_session->flags[SWITCH_RTP_FLAG_OLD_FIR])) {
                rtp_session->fir_count = 1;
        }
 }
@@ -5992,6 +6002,11 @@ static switch_status_t process_rtcp_report(switch_rtp_t *rtp_session, rtcp_msg_t
 
                        if (msg->header.type == _RTCP_PT_FIR) {
                                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_WARNING, "Ancient FIR Received. Hello from 1996!\n");
+
+                               if (!switch_rtp_test_flag(rtp_session, SWITCH_RTP_FLAG_OLD_FIR)) {
+                                       switch_rtp_set_flag(rtp_session, SWITCH_RTP_FLAG_OLD_FIR);
+                                       switch_core_session_request_video_refresh(rtp_session->session);
+                               }
                        }
                        switch_core_media_gen_key_frame(rtp_session->session);
                        if (rtp_session->vbw) {