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

Merge pull request #1763 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:FS-11954 to master

Browse Source 
* commit 'f982b2b931cde9d82e8396d5d562cf17a3ee03c5':
  FS-11954: JB: change complete frames marker
This commit is contained in:
Mike Jerris 2019-07-25 12:49:25 -05:00
commit fffc336f40
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/switch_jitterbuffer.c
View File

@ -24,6 +24,7 @@
* Contributor(s): * Contributor(s):
* *
* Anthony Minessale II <anthm@freeswitch.org> * Anthony Minessale II <anthm@freeswitch.org>
* Dragos Oancea <dragos@freeswitch.org>
* *
* switch_jitterbuffer.c -- Audio/Video Jitter Buffer * switch_jitterbuffer.c -- Audio/Video Jitter Buffer
* *
@ -51,6 +52,8 @@ typedef struct switch_jb_node_s {
uint8_t bad_hits; uint8_t bad_hits;
struct switch_jb_node_s *prev; struct switch_jb_node_s *prev;
struct switch_jb_node_s *next; struct switch_jb_node_s *next;
/* used for counting the number of partial or complete frames currently in the JB */
switch_bool_t complete_frame_mark;
} switch_jb_node_t; } switch_jb_node_t;
struct switch_jb_s { struct switch_jb_s {
@ -300,8 +303,9 @@ static inline void hide_node(switch_jb_node_t *node, switch_bool_t pop)
} }
if (switch_core_inthash_delete(jb->node_hash, node->packet.header.seq)) { if (switch_core_inthash_delete(jb->node_hash, node->packet.header.seq)) {
if (node->packet.header.version == 1 && jb->type == SJB_VIDEO) { if (node->complete_frame_mark && jb->type == SJB_VIDEO) {
jb->complete_frames--; jb->complete_frames--;
node->complete_frame_mark = FALSE;
} }
} }
@ -688,7 +692,7 @@ static inline void add_node(switch_jb_t *jb, switch_rtp_packet_t *packet, switch
jb->packet_count = 0; jb->packet_count = 0;
} }
node->packet.header.version = 1; node->complete_frame_mark = TRUE;
} else if (!jb->write_init) { } else if (!jb->write_init) {
jb->highest_wrote_ts = packet->header.ts; jb->highest_wrote_ts = packet->header.ts;
} }