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

FS-8130 amend last commit

This commit is contained in:
Anthony Minessale 2015-09-19 00:23:56 -05:00
parent 6f0bbeec28
commit 7b914ee69c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/switch_jitterbuffer.c
View File

@ -32,6 +32,8 @@
#include <switch_jitterbuffer.h> #include <switch_jitterbuffer.h>
#include "private/switch_hashtable_private.h" #include "private/switch_hashtable_private.h"
#define NACK_TIME 20000
#define RENACK_TIME 100000
#define PERIOD_LEN 500 #define PERIOD_LEN 500
#define MAX_FRAME_PADDING 2 #define MAX_FRAME_PADDING 2
#define MAX_MISSING_SEQ 20 #define MAX_MISSING_SEQ 20
@ -486,7 +488,7 @@ static inline int verify_oldest_frame(switch_jb_t *jb)
uint32_t val = (uint32_t)htons(ntohs(np->prev->packet.header.seq) + 1); uint32_t val = (uint32_t)htons(ntohs(np->prev->packet.header.seq) + 1);
if (!switch_core_inthash_find(jb->missing_seq_hash, val)) { if (!switch_core_inthash_find(jb->missing_seq_hash, val)) {
switch_core_inthash_insert(jb->missing_seq_hash, val, (void *) (intptr_t) 1); switch_core_inthash_insert(jb->missing_seq_hash, val, (void *)(intptr_t)(switch_time_now() - (RENACK_TIME - NACK_TIME)));
} }
break; break;
} }
@ -977,7 +979,7 @@ SWITCH_DECLARE(uint32_t) switch_jb_pop_nack(switch_jb_t *jb)
seq = ntohs(*((uint16_t *) var)); seq = ntohs(*((uint16_t *) var));
then = (intptr_t) val; then = (intptr_t) val;
if (then != 1 && switch_time_now() - then < 100000) { if (then != 1 && switch_time_now() - then < RENACK_TIME) {
//jb_debug(jb, 3, "NACKABLE seq %u too soon to repeat\n", seq); //jb_debug(jb, 3, "NACKABLE seq %u too soon to repeat\n", seq);
continue; continue;
} }
@ -1068,7 +1070,7 @@ SWITCH_DECLARE(switch_status_t) switch_jb_put_packet(switch_jb_t *jb, switch_rtp
for (i = want; i < got; i++) { for (i = want; i < got; i++) {
jb_debug(jb, 2, "MARK MISSING %u ts:%u\n", i, ntohl(packet->header.ts)); jb_debug(jb, 2, "MARK MISSING %u ts:%u\n", i, ntohl(packet->header.ts));
switch_core_inthash_insert(jb->missing_seq_hash, (uint32_t)htons(i), (void *) (intptr_t) 1); switch_core_inthash_insert(jb->missing_seq_hash, (uint32_t)htons(i), (void *)(intptr_t)(switch_time_now() - (RENACK_TIME - NACK_TIME)));
} }
} }
} }