Browse Source

Merge branch 'jb_new' of https://github.com/balajeesv/rtpengine into jb_new

pull/926/head
Balajee SV 6 years ago
parent
commit
220c96aea4
3 changed files with 7 additions and 7 deletions
  1. +1
    -1
      daemon/call.c
  2. +2
    -2
      daemon/jitter_buffer.c
  3. +4
    -4
      include/jitter_buffer.h

+ 1
- 1
daemon/call.c View File

@ -2261,7 +2261,7 @@ no_stats_output:
ps = l->data;
send_timer_put(&ps->send_timer);
jb_put(&ps->jb);
jb_put(&ps->jb);
__unkernelize(ps);
dtls_shutdown(ps);
ps->selected_sfd = NULL;


+ 2
- 2
daemon/jitter_buffer.c View File

@ -258,8 +258,8 @@ static void decrement_buffer(struct jitter_buffer *jb) {
static void set_jitter_values(struct media_packet *mp) {
struct jitter_buffer *jb = mp->stream->jb;
if(!jb || !mp->rtp)
return;
if(!jb || !mp->rtp)
return;
int curr_seq = ntohs(mp->rtp->seq_num);
if(jb->next_exp_seq) {
mutex_lock(&jb->lock);


+ 4
- 4
include/jitter_buffer.h View File

@ -50,10 +50,10 @@ void jb_packet_free(struct jb_packet **jbp);
void jitter_buffer_loop(void *p);
INLINE void jb_put(struct jitter_buffer **jb) {
if (!*jb)
return;
obj_put(&(*jb)->ttq.tt_obj);
*jb = NULL;
if (!*jb)
return;
obj_put(&(*jb)->ttq.tt_obj);
*jb = NULL;
}
#endif

Loading…
Cancel
Save