mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-01 09:21:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpsource: Refactor seqnum comparison code a bit

Browse source
This commit is contained in:
Sebastian Dröge 2015-05-18 17:19:31 +03:00
parent 1974b24ef4
commit 54e924332e
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/rtpmanager/rtpsource.c
View file

@ -1013,14 +1013,13 @@ update_receiver_stats (RTPSource * src, RTPPacketInfo * pinfo)
src->curr_probation = src->probation; src->curr_probation = src->probation;
} }
delta = gst_rtp_buffer_compare_seqnum (stats->max_seq, seqnr); expected = src->stats.max_seq + 1;
delta = gst_rtp_buffer_compare_seqnum (expected, seqnr);
/* if we are still on probation, check seqnum */ /* if we are still on probation, check seqnum */
if (src->curr_probation) { if (src->curr_probation) {
expected = (src->stats.max_seq + 1) & (RTP_SEQ_MOD - 1);
/* when in probation, we require consecutive seqnums */ /* when in probation, we require consecutive seqnums */
if (seqnr == expected) { if (delta == 0) {
/* expected packet */ /* expected packet */
GST_DEBUG ("probation: seqnr %d == expected %d", seqnr, expected); GST_DEBUG ("probation: seqnr %d == expected %d", seqnr, expected);
src->curr_probation--; src->curr_probation--;
@ -1051,7 +1050,7 @@ update_receiver_stats (RTPSource * src, RTPPacketInfo * pinfo)
/* unexpected seqnum in probation */ /* unexpected seqnum in probation */
goto probation_seqnum; goto probation_seqnum;
} }
} else if (delta > 0 && delta < RTP_MAX_DROPOUT) { } else if (delta >= 0 && delta < RTP_MAX_DROPOUT) {
/* in order, with permissible gap */ /* in order, with permissible gap */
if (seqnr < stats->max_seq) { if (seqnr < stats->max_seq) {
/* sequence number wrapped - count another 64K cycle. */ /* sequence number wrapped - count another 64K cycle. */
@ -1070,10 +1069,10 @@ update_receiver_stats (RTPSource * src, RTPPacketInfo * pinfo)
stats->bad_seq = (seqnr + 1) & (RTP_SEQ_MOD - 1); stats->bad_seq = (seqnr + 1) & (RTP_SEQ_MOD - 1);
goto bad_sequence; goto bad_sequence;
} }
} else { /* delta <= 0 && delta >= -RTP_MAX_MISORDER */ } else { /* delta < 0 && delta >= -RTP_MAX_MISORDER */
/* duplicate or reordered packet, will be filtered by jitterbuffer. */ /* duplicate or reordered packet, will be filtered by jitterbuffer. */
GST_WARNING ("duplicate or reordered packet (seqnr %d, max seq %d)", seqnr, GST_WARNING ("duplicate or reordered packet (seqnr %u, expected %u)", seqnr,
stats->max_seq); expected);
} }
src->stats.octets_received += pinfo->payload_len; src->stats.octets_received += pinfo->payload_len;
@ -1082,7 +1081,7 @@ update_receiver_stats (RTPSource * src, RTPPacketInfo * pinfo)
/* for the bitrate estimation */ /* for the bitrate estimation */
src->bytes_received += pinfo->payload_len; src->bytes_received += pinfo->payload_len;
GST_LOG ("seq %d, PC: %" G_GUINT64_FORMAT ", OC: %" G_GUINT64_FORMAT, GST_LOG ("seq %u, PC: %" G_GUINT64_FORMAT ", OC: %" G_GUINT64_FORMAT,
seqnr, src->stats.packets_received, src->stats.octets_received); seqnr, src->stats.packets_received, src->stats.octets_received);
return TRUE; return TRUE;