kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 12:40:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1137 in FS/freeswitch from ~KIDPLUG/freeswitch-kp:bugfix/FS-9917-switch_rtp-loses-the-current-packet to master

Browse Source 
* commit '879c04b339fb4f0553e5d54d7f2b88a36e84695a':
  FS-9917 [switch_rtp/core] Fix in do_flush to handle the current packet (if RFC2833) rather than discard it. only print flushed if we flushed something
This commit is contained in:
Mike Jerris 2017-01-04 12:58:57 -06:00
commit 54483bde7e
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/switch_rtp.c
View File

@ -5123,6 +5123,15 @@ static switch_size_t do_flush(switch_rtp_t *rtp_session, int force, switch_size_
switch_socket_opt_set(rtp_session->sock_input, SWITCH_SO_NONBLOCK, TRUE);
}
// before processing/flushing packets, if current packet is rfc2833, handle it (else it would be lost)
if (bytes_in > rtp_header_len && rtp_session->last_rtp_hdr.version == 2 && rtp_session->last_rtp_hdr.pt == rtp_session->recv_te) {
int do_cng = 0;
#ifdef DEBUG_2833
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "*** Handling current RTP packet before flushing. seq=%u ***\n", ntohs(rtp_session->last_rtp_hdr.seq));
#endif
handle_rfc2833(rtp_session, bytes_in, &do_cng);
}
do {
if (switch_rtp_ready(rtp_session)) {
bytes = sizeof(rtp_msg_t);
@ -5151,6 +5160,13 @@ static switch_size_t do_flush(switch_rtp_t *rtp_session, int force, switch_size_
}
} while (bytes > 0);
#ifdef DEBUG_2833
if (flushed) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "*** do_flush: total flushed packets: %ld ***\n",(long)flushed);
}
#endif
if (was_blocking && switch_rtp_ready(rtp_session)) {
switch_rtp_clear_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK);
switch_socket_opt_set(rtp_session->sock_input, SWITCH_SO_NONBLOCK, FALSE);