Changeset e75daaa6f4ea320321f900e8657212365f0099a5

Timestamp:

17/10/05 23:41:01 (3 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

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

git-parent:

[eeab96f133f3e745a9b961557d6b6537e9628548]

git-author:

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

Message:

reverted most of revision 12872, it didn't work after all

Files:

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

modules/access/udp.c

@@ -361 +361 @@
-    uint32_t i_pcr_new = 0;
-
+    if( !p_block ) return;
-    if( *pp_list == NULL )
-    {
@@ -387 +388 @@
-    i_new = ( (p_block->p_buffer[2] << 8 ) + p_block->p_buffer[3] );
-    i_cur = ( (p->p_buffer[2] << 8 ) + p->p_buffer[3] );
-(i_cur - i_new) > 0
+i_cur > i_new
-    {
-        msg_Dbg( p_access, ">> prepend %p(%u)==%p(%u)\n", p_block, i_cur, p, i_new );
@@ -420 +421 @@
-            break;
-        }
-(i_expected - i_new) >= 0
+i_expected >= i_new
-        {
-            p_tmp = p->p_next;
@@ -460 +461 @@
-            i_cur = ( (p->p_buffer[2] << 8 ) + p->p_buffer[3] );
-            msg_Dbg( p_access, "rtp_ChainSend: i_cur %u, i_seq %u", i_cur, i_seq );
-(i_cur - i_seq) == 0
+i_cur == i_seq
-            {
-                i_seq++; /* sent all packets that are received in order */
@@ -489 +490 @@
-                p->p_buffer += i_skip;
-            }
-(i_cur - i_seq) > 0
+i_cur > i_seq 
-            {
-                if( p_prev )
@@ -602 +603 @@
-    if( p_sys->b_first_seqno )
-    {
--
+ - 
-        p_sys->i_last_pcr = i_pcr;
-        p_sys->b_first_seqno = VLC_FALSE;
@@ -616 +617 @@
-#endif
-    i_sequence_expected = ((p_sys->i_sequence_number + 1) % RTP_SEQ_NUM_SIZE);
-(i_sequence_expected - i_sequence_number) != 0
+i_sequence_expected != i_sequence_number
-    {
-        /* Handle out of order packets */
-        if( p_sys->i_rtp_late > 0 )
-        {
-(i_sequence_number - i_sequence_expected) > 0
+i_sequence_number > i_sequence_expected
-            {
-                msg_Warn( p_access,
@@ -629 +630 @@
-                {
-                    block_t *p_start = p_sys->p_list;
-
+
+
-                                        p_start->p_buffer[3];
-                    /* Gap too big, we have been holding this data for too long,