]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-9624 slight change from last commit
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 11 Oct 2016 15:56:08 +0000 (10:56 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Tue, 11 Oct 2016 15:56:15 +0000 (10:56 -0500)
src/switch_jitterbuffer.c

index 0c7336346c146c31c4120bc0c3a1cb7042be3fb9..826fa00011655afe24e76b893d2f79001b03f4c0 100644 (file)
@@ -616,9 +616,8 @@ static inline void add_node(switch_jb_t *jb, switch_rtp_packet_t *packet, switch
        if (jb->type == SJB_VIDEO) {
                if (jb->write_init && ((htons(packet->header.seq) >= htons(jb->highest_wrote_seq) && (ntohl(node->packet.header.ts) > ntohl(jb->highest_wrote_ts))) ||
                                                           (ntohl(jb->highest_wrote_ts) > (UINT_MAX - 1000) && ntohl(node->packet.header.ts) < 1000))) {
-
-                       jb_debug(jb, 2, "WRITE frame ts: %u complete=%u/%u n:%u\n", ntohl(node->packet.header.ts), jb->complete_frames , jb->frame_len, jb->visible_nodes);
                        jb->complete_frames++;
+                       jb_debug(jb, 2, "WRITE frame ts: %u complete=%u/%u n:%u\n", ntohl(node->packet.header.ts), jb->complete_frames , jb->frame_len, jb->visible_nodes);
                        jb->highest_wrote_ts = packet->header.ts;
                        //verify_oldest_frame(jb);
                } else if (!jb->write_init) {
@@ -1222,9 +1221,9 @@ SWITCH_DECLARE(switch_status_t) switch_jb_get_packet(switch_jb_t *jb, switch_rtp
        }
 
        if (jb->complete_frames < jb->frame_len) {
-               
+
                switch_jb_poll(jb);
-               
+
                if (!jb->flush) {
                        jb_debug(jb, 2, "BUFFERING %u/%u\n", jb->complete_frames , jb->frame_len);
                        switch_goto_status(SWITCH_STATUS_MORE_DATA, end);
@@ -1293,7 +1292,7 @@ SWITCH_DECLARE(switch_status_t) switch_jb_get_packet(switch_jb_t *jb, switch_rtp
                }
                
                if (jb->type == SJB_TEXT || jb->type == SJB_AUDIO ||
-                       (jb->read_init && htons(node->packet.header.seq) >= htons(jb->highest_read_seq) && (ntohl(node->packet.header.ts) >= ntohl(jb->highest_read_ts)))) {
+                       (jb->read_init && htons(node->packet.header.seq) >= htons(jb->highest_read_seq) && (ntohl(node->packet.header.ts) > ntohl(jb->highest_read_ts)))) {
                        jb->complete_frames--;
                        jb_debug(jb, 2, "READ frame ts: %u complete=%u/%u n:%u\n", ntohl(node->packet.header.ts), jb->complete_frames , jb->frame_len, jb->visible_nodes);
                        jb->highest_read_ts = node->packet.header.ts;