Skip to content

V
vlc-1.1
Commit da52c957 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix inverted RTP dropout and misordering, and some simplifications.

parent 2cdda809
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
modules/access/rtp/session.c
View file @ da52c957
...@@ -144,7 +144,7 @@ struct rtp_source_t ...@@ -144,7 +144,7 @@ struct rtp_source_t
uint16_t bad_seq; /* tentatively next expected sequence for resync */ uint16_t bad_seq; /* tentatively next expected sequence for resync */
uint16_t max_seq; /* next expected sequence */ uint16_t max_seq; /* next expected sequence */
uint16_t last_seq; /* sequence of the last dequeued packet */ uint16_t last_seq; /* sequence of the next dequeued packet */
block_t *blocks; /* re-ordered blocks queue */ block_t *blocks; /* re-ordered blocks queue */
void *opaque[0]; /* Per-source private payload data */ void *opaque[0]; /* Per-source private payload data */
}; };
...@@ -319,35 +319,36 @@ rtp_queue (demux_t *demux, rtp_session_t *session, block_t *block) ...@@ -319,35 +319,36 @@ rtp_queue (demux_t *demux, rtp_session_t *session, block_t *block)
/* Check sequence number */ /* Check sequence number */
/* NOTE: the sequence number is per-source, /* NOTE: the sequence number is per-source,
* but is independent from the payload type. */ * but is independent from the payload type. */
uint16_t delta_seq = seq - (src->max_seq + 1); int delta_seq = seq - src->max_seq;
if ((delta_seq < 0x8000) ? (delta_seq > p_sys->max_dropout) if ((delta_seq > 0) ? (delta_seq > p_sys->max_dropout)
: ((65535 - delta_seq) > p_sys->max_misorder)) : (-delta_seq > p_sys->max_misorder))
{ {
msg_Dbg (demux, "sequence discontinuity (got: %u, expected: %u)", msg_Dbg (demux, "sequence discontinuity"
seq, (src->max_seq + 1) & 0xffff); " (got: %"PRIu16", expected: %"PRIu16")", seq, src->max_seq);
if (seq == ((src->bad_seq + 1) & 0xffff)) if (seq == src->bad_seq)
{ {
src->max_seq = src->bad_seq = seq; src->max_seq = src->bad_seq = seq + 1;
src->last_seq = seq - 0x7fffe; /* hack for rtp_decode() */
msg_Warn (demux, "sequence resynchronized"); msg_Warn (demux, "sequence resynchronized");
block_ChainRelease (src->blocks); block_ChainRelease (src->blocks);
src->blocks = NULL; src->blocks = NULL;
} }
else else
{ {
src->bad_seq = seq; src->bad_seq = seq + 1;
goto drop; goto drop;
} }
} }
else else
if (delta_seq < 0x8000) if (delta_seq >= 0)
src->max_seq = seq; src->max_seq = seq + 1;
/* Queues the block in sequence order, /* Queues the block in sequence order,
* hence there is a single queue for all payload types. */ * hence there is a single queue for all payload types. */
block_t **pp = &src->blocks; block_t **pp = &src->blocks;
for (block_t *prev = *pp; prev != NULL; prev = *pp) for (block_t *prev = *pp; prev != NULL; prev = *pp)
{ {
int16_t delta_seq = seq - rtp_seq (prev); int delta_seq = seq - rtp_seq (prev);
if (delta_seq < 0) if (delta_seq < 0)
break; break;
if (delta_seq == 0) if (delta_seq == 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment