kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-8130 fix regression causing seg

This commit is contained in:
Anthony Minessale 2015-09-17 21:11:04 -05:00
parent 4a56b7d145
commit d1049e2280
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/switch_jitterbuffer.c
View File

@ -376,7 +376,7 @@ static inline uint32_t jb_find_lowest_ts(switch_jb_t *jb)
return lowest ? lowest->packet.header.ts : 0; return lowest ? lowest->packet.header.ts : 0;
} }
#if 0
static inline switch_jb_node_t *jb_find_highest_node(switch_jb_t *jb) static inline switch_jb_node_t *jb_find_highest_node(switch_jb_t *jb)
{ {
switch_jb_node_t *np, *highest = NULL; switch_jb_node_t *np, *highest = NULL;
@ -400,6 +400,7 @@ static inline uint32_t jb_find_highest_ts(switch_jb_t *jb)
return highest ? highest->packet.header.ts : 0; return highest ? highest->packet.header.ts : 0;
} }
#endif
static inline void jb_hit(switch_jb_t *jb) static inline void jb_hit(switch_jb_t *jb)
{ {
@ -525,6 +526,7 @@ static inline void drop_oldest_frame(switch_jb_t *jb)
jb_debug(jb, 1, "Dropping oldest frame ts:%u\n", ntohl(ts)); jb_debug(jb, 1, "Dropping oldest frame ts:%u\n", ntohl(ts));
} }
#if 0
static inline void drop_newest_frame(switch_jb_t *jb) static inline void drop_newest_frame(switch_jb_t *jb)
{ {
uint32_t ts = jb_find_highest_ts(jb); uint32_t ts = jb_find_highest_ts(jb);
@ -532,6 +534,7 @@ static inline void drop_newest_frame(switch_jb_t *jb)
drop_ts(jb, ts); drop_ts(jb, ts);
jb_debug(jb, 1, "Dropping highest frame ts:%u\n", ntohl(ts)); jb_debug(jb, 1, "Dropping highest frame ts:%u\n", ntohl(ts));
} }
#endif
static inline void add_node(switch_jb_t *jb, switch_rtp_packet_t *packet, switch_size_t len) static inline void add_node(switch_jb_t *jb, switch_rtp_packet_t *packet, switch_size_t len)
{ {

4
src/switch_rtp.c
View File

@ -1902,7 +1902,7 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
int rtcp_ok = 0, rtcp_fb = 0; int rtcp_ok = 0, rtcp_fb = 0;
switch_time_t now = switch_micro_time_now(); switch_time_t now = switch_micro_time_now();
int rate = 0, nack_ttl = 0; int rate = 0, nack_ttl = 0;
uint32_t cur_nack[MAX_NACK - 1]; uint32_t cur_nack[MAX_NACK];
if (rtp_session->flags[SWITCH_RTP_FLAG_AUTO_CNG] && rtp_session->send_msg.header.ts && rtp_session->cng_pt != INVALID_PT && if (rtp_session->flags[SWITCH_RTP_FLAG_AUTO_CNG] && rtp_session->send_msg.header.ts && rtp_session->cng_pt != INVALID_PT &&
(rtp_session->timer.samplecount - rtp_session->last_write_samplecount >= rtp_session->samples_per_interval * 60)) { (rtp_session->timer.samplecount - rtp_session->last_write_samplecount >= rtp_session->samples_per_interval * 60)) {
@ -2064,9 +2064,9 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
ntohs(*nack & 0xFFFF)); ntohs(*nack & 0xFFFF));
rtcp_bytes += sizeof(switch_rtcp_ext_hdr_t) + sizeof(cur_nack[n]); rtcp_bytes += sizeof(switch_rtcp_ext_hdr_t) + sizeof(cur_nack[n]);
cur_nack[n] = 0;
} }
cur_nack[n] = 0;
nack_ttl = 0; nack_ttl = 0;
} }