Changeset 6a604066e435c727e04726050e2e76c0eebb1797

Timestamp:

09/17/07 19:55:50 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1190051750 +0000

git-parent:

[ed8d5bcb8798ed7257c9b8d8f3f1cf8e5c49db09]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1190051750 +0000

Message:

Attempt to fix today's RTP access changes

Files:

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

modules/access/udp.c

@@ -101 +101 @@
-
-static block_t *BlockUDP( access_t * );
-PrebufferRTP( access_t *p_access, block_t *p_block
+StartRTP( access_t *
-static block_t *BlockRTP( access_t * );
-static block_t *BlockChoose( access_t * );
@@ -136 +136 @@
-    /* Set up p_access */
-    access_InitFields( p_access );
-Prebuffer
+Start
-    p_access->info.b_prebuffered = VLC_FALSE;
-    MALLOC_ERR( p_access->p_sys, access_sys_t ); p_sys = p_access->p_sys;
@@ -527 +527 @@
-
-    /* FIXME: use rtpmap */
+    const char *psz_demux = NULL;
+
-    switch( i_payload_type )
-    {
-        case 14: // MPA: MPEG Audio (RFC2250, §3.4)
-            i_skip += 4; // 32 bits RTP/MPA header
+            psz_demux = "mpga";
-            break;
-
@@ -542 +545 @@
-                /* TODO: shouldn't we skip this too ? */
-            }
+            psz_demux = "mpgv";
-            break;
-
-        case 33: // MP2: MPEG TS (RFC2250, §2)
-            /* plain TS over RTP */
+            psz_demux = "ts";
-            break;
-
@@ -582 +587 @@
-#endif
-
+    if( !p_access->psz_demux || !*p_access->psz_demux )
+    {
+        free( p_access->psz_demux );
+        p_access->psz_demux = strdup( psz_demux );
+    }
+
-    return p_block;
-
@@ -587 +598 @@
-    block_Release( p_block );
-    return NULL;
+}
+
+/*****************************************************************************
+ * BlockRTP: receives an RTP packet, parses it, queues it queue,
+ * then dequeues the oldest packet and returns it to input/demux.
+ ****************************************************************************/
+static block_t *BlockRTP( access_t *p_access )
+{
+    access_sys_t *p_sys = p_access->p_sys;
+    block_t *p;
+
+    while ( !p_sys->p_list ||
+             ( mdate() - p_sys->p_list->i_pts ) < p_sys->i_rtp_late )
+    {
+        p = BlockParseRTP( p_access,
+                           p_sys->b_framed_rtp ? BlockTCP( p_access )
+                                               : BlockUDP( p_access ) );
+        if ( !p )
+            return NULL;
+
+        rtp_ChainInsert( p_access, p );
+    }
+
+    p = p_sys->p_list;
+    p_sys->p_list = p_sys->p_list->p_next;
+    p_sys->i_last_seqno++;
+    if( p_sys->i_last_seqno != (uint16_t) p->i_dts )
+    {
+        msg_Dbg( p_access, "RTP: packet(s) lost, expected %d, got %d",
+                 p_sys->i_last_seqno, (uint16_t) p->i_dts );
+        p_sys->i_last_seqno = (uint16_t) p->i_dts;
+    }
+    p->p_next = NULL;
+    return p;
-}
-
@@ -632 +677 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-/*****************************************************************************