kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-27 03:37:50 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anthony Minessale 2017-06-26 12:56:42 -05:00
parent 8aeca1d3df
commit 9fb8a0c79d
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/switch_jitterbuffer.c
View File

@ -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_debug(jb, 2, "%s", "DROPPED FRAME DETECTED RESYNCING\n");
jb->target_seq = 0; jb->target_seq = 0;
//if (jb->session) { if (jb->session) {
// switch_core_session_request_video_refresh(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); jb_frame_inc(jb, 1);
} }
//if (jb->session) { if (jb->session) {
// switch_core_session_request_video_refresh(jb->session); switch_core_session_request_video_refresh(jb->session);
//} }
for (x = 0; x < 10; x++) { for (x = 0; x < 10; x++) {
increment_seq(jb); increment_seq(jb);
@ -919,9 +919,9 @@ SWITCH_DECLARE(void) switch_jb_reset(switch_jb_t *jb)
switch_core_inthash_init(&jb->missing_seq_hash); switch_core_inthash_init(&jb->missing_seq_hash);
switch_mutex_unlock(jb->mutex); switch_mutex_unlock(jb->mutex);
//if (jb->session) { if (jb->session) {
// switch_core_session_request_video_refresh(jb->session); switch_core_session_request_video_refresh(jb->session);
//} }
} }
jb_debug(jb, 2, "%s", "RESET BUFFER\n"); jb_debug(jb, 2, "%s", "RESET BUFFER\n");

12
src/switch_rtp.c
View File

@ -1665,9 +1665,9 @@ static void check_jitter(switch_rtp_t *rtp_session)
(rtp_session->stats.inbound.last_processed_seq + 1), lost); (rtp_session->stats.inbound.last_processed_seq + 1), lost);
rtp_session->stats.inbound.last_loss++; rtp_session->stats.inbound.last_loss++;
//if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO]) { if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO]) {
//switch_core_session_request_video_refresh(rtp_session->session); 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) { 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; rtp_session->stats.inbound.loss[rtp_session->stats.inbound.last_loss] += lost;
@ -6177,7 +6177,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); 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) { if (switch_jb_get_packet_by_seq(rtp_session->vbw, seq, (switch_rtp_packet_t *) send_msg, &bytes) == SWITCH_STATUS_SUCCESS) {
@ -6201,7 +6202,8 @@ static void handle_nack(switch_rtp_t *rtp_session, uint32_t nack)
blp = ntohs(blp); blp = ntohs(blp);
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
if (blp & (1 << 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 */ /* 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); //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) { 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) {