Changeset 1d135a804f2d2fafddc12567f066fb866c9ccd07

Timestamp:

18/10/05 23:03:34 (3 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1129669414 +0000

git-parent:

[52932184a4d386ea98ef71ba504222026da46a5d]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1129669414 +0000

Message:

RTP reordering fixes.

Files:

• modules/access/udp.c (modified) (19 diffs)

modules/access/udp.c

@@ -112 +112 @@
-    block_t *p_list;     /* list of packets to rearrange */
-    block_t *p_end;      /* last packet in p_list */
-    block_t *p_next;     /* p_next ?? */
-};
-
@@ -253 +252 @@
-    p_sys->p_list = NULL;
-    p_sys->p_end = NULL;
-    p_sys->p_next = NULL;
-
-    return VLC_SUCCESS;
@@ -337 +335 @@
-    }
-
-p_block->i_buffer >= p_sys->i_mtu
+(p_block->i_buffer >= p_sys->i_mtu)
-        p_sys->i_mtu < 32767 )
-    {
@@ -352 +350 @@
- * look at the sequence numbers.
- */
-
-
-
+
+
+
+
+
-    block_t *p = NULL;
-    uint16_t i_new = 0;
@@ -362 +362 @@
-
-    if( !p_block ) return;
-*pp_list == NULL
-
-*p
-*p
+!p_list
+
+p_sys->
+p_sys->
-        return;
-    }
+
-    /* Appending packets at the end of the chain is the normal case */
-    i_pcr_new = ( (p_block->p_buffer[4] << 24) +
@@ -374 +375 @@
-                   p_block->p_buffer[7] );
-    i_new = ( (p_block->p_buffer[2] << 8 ) + p_block->p_buffer[3] );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    i_cur = ( (p->p_buffer[2] << 8 ) + p->p_buffer[3] );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        p_block->p_next = p;
-*p
+p_sys->
-        return;
-    }
@@ -401 +401 @@
-    {
-        i_cur = (p->p_buffer[2] << 8 ) + p->p_buffer[3];
-
-
-
-
+
+
+
-        {
-            uint32_t i_pcr_cur = ( (p->p_buffer[4] << 24) +
@@ -421 +420 @@
-            break;
-        }
-i_expected >= i_new
+(i_expected - i_new) >= 0
-        {
+            block_t *p_tmp = NULL;
+
-            p_tmp = p->p_next;
->> insert between %p(%u)==%p(%u)", p, i_cur, p_tmp, i_new
+RTP: insert %u after  %u", i_new, i_cur
-            p->p_next = p_block;
-            p_block->p_next = p_tmp;
@@ -432 +433 @@
-        p = p->p_next;
-    }
+    msg_Dbg(p_access, "RTP: trashing duplicate %d", i_new );
+    block_Release( p_block );
-}
-
@@ -459 +462 @@
-        while( p )
-        {
-
-
-
+
+
-            {
+                msg_Dbg( p_access, "rtp_ChainSend: sequence number %u", i_seq );
+
-                i_seq++; /* sent all packets that are received in order */
-
@@ -490 +494 @@
-                p->p_buffer += i_skip;
-            }
-i_cur > i_seq
+(i_cur - i_seq) > 0
-            {
-                if( p_prev )
-                {
-*p
+p_sys->
-                    p_prev->p_next = NULL;
-                    p_sys->i_last_pcr = i_pcr_prev;
@@ -500 +504 @@
-                    return p_send;
-                }
-
-
+
-            }
-            p_prev = p;
@@ -507 +510 @@
-            p = p->p_next;
-        }
+
+out:
-        /* We have walked through the complete chain and all packets are
-         * in sequence - so send the whole chain
@@ -521 +526 @@
-
-        /* Update the list pointers */
-
-
+
-        p_sys->p_end = NULL;
-        p_sys->i_sequence_number = ( (p->p_buffer[2] << 8 ) +
@@ -603 +607 @@
-    if( p_sys->b_first_seqno )
-    {
- - 1
+
-        p_sys->i_last_pcr = i_pcr;
-        p_sys->b_first_seqno = VLC_FALSE;
-
+
+
+
+
+
-#if 0
-    /* Emulate packet loss */
@@ -616 +624 @@
-    }
-#endif
-
-i_sequence_expected != i_sequence_number
+
+(i_sequence_expected - i_sequence_number) != 0
-    {
-        /* Handle out of order packets */
-        if( p_sys->i_rtp_late > 0 )
-        {
-i_sequence_number > i_sequence_expected
+(i_sequence_number - i_sequence_expected) > 0
-            {
-                msg_Warn( p_access,
-                    "RTP packet out of order (too early) expected %u, current %u",
-                    i_sequence_expected, i_sequence_number );
-
+=
-                {
-                    block_t *p_start = p_sys->p_list;
@@ -639 +647 @@
-                        "Gap too big resyncing: delta %u, held for %d ms",
-                        (i_pcr - p_sys->i_last_pcr), p_sys->i_rtp_late );
-&p_sys->p_list, &p_sys->p_end, 
+
-                    return rtp_ChainSend( p_access, &p_sys->p_list, i_start );
-                }
-                /* hold packets that arrive too early. */
-&p_sys->p_list, &p_sys->p_end, 
+
-                return rtp_ChainSend( p_access, &p_sys->p_list, i_sequence_expected );
-            }
-            else if( /* ((i_sequence_expected - i_sequence_number ) > 0) && */
-i_pcr <= p_sys->i_last_pcr)
+p_sys->i_last_pcr - i_pcr) >= 0
-            {
-                msg_Warn( p_access,
@@ -699 +707 @@
-    else if( (p_sys->i_rtp_late > 0) && p_sys->p_list )
-    {
-i_pcr <= p_sys->i_last_pcr
+(p_sys->i_last_pcr - i_pcr) >= 0
-        {
-            msg_Warn( p_access,
@@ -709 +717 @@
-            return NULL;
-        }
-&p_sys->p_list, &p_sys->p_end, 
+
-        return rtp_ChainSend( p_access, &p_sys->p_list, i_sequence_expected );
-    }