FS-10417: [freeswitch-core] Reduce flicker in screen sharing -- minor tweak

diff --git a/src/switch_jitterbuffer.c b/src/switch_jitterbuffer.c
index 6a8dba108c4bec1a18c2728c6096f48031478de5..3f1cb8d5e7025666ae6005a984a02088e27d1d9e 100644 (file)
--- a/src/switch_jitterbuffer.c
+++ b/src/switch_jitterbuffer.c
@@ -742,9 +742,9 @@ static inline switch_status_t jb_next_packet_by_seq(switch_jb_t *jb, switch_jb_n
                        jb_debug(jb, 2, "%s", "DROPPED FRAME DETECTED RESYNCING\n");
                        jb->target_seq = 0;
 
-                       //if (jb->session) {
-                       //      switch_core_session_request_video_refresh(jb->session);
-                       //}
+                       if (jb->session) {
+                               switch_core_session_request_video_refresh(jb->session);
+                       }
                }
        }
 
@@ -772,9 +772,9 @@ static inline switch_status_t jb_next_packet_by_seq(switch_jb_t *jb, switch_jb_n
                                jb_frame_inc(jb, 1);
                        }
 
-                       //if (jb->session) {
-                       //      switch_core_session_request_video_refresh(jb->session);
-                       //}
+                       if (jb->session) {
+                               switch_core_session_request_video_refresh(jb->session);
+                       }
 
                        for (x = 0; x < 10; x++) {
                                increment_seq(jb);
@@ -930,9 +930,9 @@ SWITCH_DECLARE(void) switch_jb_reset(switch_jb_t *jb)
                switch_core_inthash_init(&jb->missing_seq_hash);
                switch_mutex_unlock(jb->mutex);
 
-               //if (jb->session) {
-               //      switch_core_session_request_video_refresh(jb->session);
-               //}
+               if (jb->session) {
+                       switch_core_session_request_video_refresh(jb->session);
+               }
        }
 
        jb_debug(jb, 2, "%s", "RESET BUFFER\n");

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 6ce0467fe3197b54d1080b07c1418cb24c86f015..d11bcbd35b63e8d888cebae1810cf980569f6e81 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -1664,9 +1664,9 @@ static void check_jitter(switch_rtp_t *rtp_session)
                                                  (rtp_session->stats.inbound.last_processed_seq + 1), lost);
                rtp_session->stats.inbound.last_loss++;
 
-               //if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO]) {
-                       //switch_core_session_request_video_refresh(rtp_session->session);
-               //}
+               if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO]) {
+                       switch_core_session_request_video_refresh(rtp_session->session);
+               }
 
                if (rtp_session->stats.inbound.last_loss > 0 && rtp_session->stats.inbound.last_loss < LOST_BURST_CAPTURE) {
                        rtp_session->stats.inbound.loss[rtp_session->stats.inbound.last_loss] += lost;
@@ -6187,7 +6187,8 @@ static void handle_nack(switch_rtp_t *rtp_session, uint32_t nack)
                my_host = switch_get_addr(bufc, sizeof(bufc), rtp_session->local_addr);
        }
 
-       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG1, "Got NACK [%u][0x%x] for seq %u\n", nack, nack, ntohs(seq));
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG1, "%s Got NACK [%u][0x%x] for seq %u\n", 
+                                         switch_core_session_get_name(rtp_session->session), nack, nack, ntohs(seq));
 
        if (switch_jb_get_packet_by_seq(rtp_session->vbw, seq, (switch_rtp_packet_t *) send_msg, &bytes) == SWITCH_STATUS_SUCCESS) {
 
@@ -6211,7 +6212,8 @@ static void handle_nack(switch_rtp_t *rtp_session, uint32_t nack)
        blp = ntohs(blp);
        for (i = 0; i < 16; i++) {
                if (blp & (1 << i)) {
-                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG1, "Also Got NACK for seq %u\n", ntohs(seq) + i + 1);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_DEBUG1, "%s Also Got NACK for seq %u\n", 
+                                                         switch_core_session_get_name(rtp_session->session), ntohs(seq) + i + 1);
                        /* If they are missing more than one, may as well gen a key frame for good measure */
                        //switch_core_media_gen_key_frame(rtp_session->session);
                        if (switch_jb_get_packet_by_seq(rtp_session->vbw, htons(ntohs(seq) + i + 1), (switch_rtp_packet_t *) &send_msg, &bytes) == SWITCH_STATUS_SUCCESS) {