* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
+#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_network.h>
#ifndef IPPROTO_UDPLITE
# define IPPROTO_UDPLITE 136 /* from IANA */
#endif
-#ifndef SOL_UDPLITE
-# define SOL_UDPLITE IPPROTO_UDPLITE
-#endif
#define MTU 65535
set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
- CACHING_LONGTEXT, VLC_TRUE );
- add_integer( "rtp-late", 100, NULL, RTP_LATE_TEXT, RTP_LATE_LONGTEXT, VLC_TRUE );
+ CACHING_LONGTEXT, true );
+ add_integer( "rtp-late", 100, NULL, RTP_LATE_TEXT, RTP_LATE_LONGTEXT, true );
add_obsolete_bool( "udp-auto-mtu" );
- set_capability( "access2", 0 );
+ set_capability( "access", 0 );
add_shortcut( "udp" );
add_shortcut( "udpstream" );
add_shortcut( "udp4" );
add_shortcut( "rtp4" );
add_shortcut( "rtp6" );
add_shortcut( "udplite" );
- add_shortcut( "rtptcp" );
+ add_shortcut( "rtptcp" ); /* tcp name is already taken */
add_shortcut( "dccp" );
set_callbacks( Open, Close );
#define RTP_HEADER_LEN 12
static block_t *BlockUDP( access_t * );
-static block_t *BlockTCP( access_t * );
+static block_t *BlockStartRTP( access_t * );
static block_t *BlockRTP( access_t * );
static block_t *BlockChoose( access_t * );
static int Control( access_t *, int, va_list );
{
int fd;
- vlc_bool_t b_framed_rtp;
+ bool b_framed_rtp, b_comedia;
/* reorder rtp packets when out-of-sequence */
uint16_t i_last_seqno;
int i_bind_port, i_server_port = 0;
int fam = AF_UNSPEC, proto = IPPROTO_UDP;
- if (strlen (p_access->psz_access) >= 3)
+ /* Set up p_access */
+ access_InitFields( p_access );
+ ACCESS_SET_CALLBACKS( NULL, BlockStartRTP, Control, NULL );
+ p_access->info.b_prebuffered = false;
+ MALLOC_ERR( p_access->p_sys, access_sys_t ); p_sys = p_access->p_sys;
+ memset (p_sys, 0, sizeof (*p_sys));
+
+ if (strlen (p_access->psz_access) > 0)
{
- switch (p_access->psz_access[3])
+ switch (p_access->psz_access[strlen (p_access->psz_access) - 1])
{
case '4':
fam = AF_INET;
fam = AF_INET6;
break;
}
- if (strcmp (p_access->psz_access + 3, "lite") == 0)
+
+ if (strcmp (p_access->psz_access, "udplite") == 0)
proto = IPPROTO_UDPLITE;
else
- if (strcmp (p_access->psz_access + 3, "tcp") == 0)
+ if (strncmp (p_access->psz_access, "udp", 3 ) == 0 )
+ p_access->pf_block = BlockChoose;
+ else
+ if (strcmp (p_access->psz_access, "rtptcp") == 0)
proto = IPPROTO_TCP;
else
if (strcmp (p_access->psz_access, "dccp") == 0)
msg_Dbg( p_access, "opening server=%s:%d local=%s:%d",
psz_server_addr, i_server_port, psz_bind_addr, i_bind_port );
- /* Set up p_access */
- access_InitFields( p_access );
- ACCESS_SET_CALLBACKS( NULL, BlockChoose, Control, NULL );
- p_access->info.b_prebuffered = VLC_FALSE;
- MALLOC_ERR( p_access->p_sys, access_sys_t ); p_sys = p_access->p_sys;
- memset (p_sys, 0, sizeof (*p_sys));
-
+ /* Hmm, the net_* connection functions may need to be unified... */
switch (proto)
{
case IPPROTO_UDP:
case IPPROTO_TCP:
p_sys->fd = net_ConnectTCP( p_access, psz_server_addr, i_server_port );
- p_sys->b_framed_rtp = VLC_TRUE;
+ p_access->pf_block = BlockRTP;
+ p_sys->b_comedia = p_sys->b_framed_rtp = true;
break;
case IPPROTO_DCCP:
#ifdef SOCK_DCCP
+ var_Create( p_access, "dccp-service", VLC_VAR_STRING );
+ var_SetString( p_access, "dccp-service", "RTPV" );
p_sys->fd = net_Connect( p_access, psz_server_addr, i_server_port,
SOCK_DCCP, IPPROTO_DCCP );
#else
p_sys->fd = -1;
msg_Err( p_access, "DCCP support not compiled-in!" );
#endif
+ p_sys->b_comedia = true;
break;
}
free (psz_name);
}
shutdown( p_sys->fd, SHUT_WR );
-
net_SetCSCov (p_sys->fd, -1, 12);
- if (p_sys->b_framed_rtp)
- {
- /* We don't do autodetection and prebuffering in case of framing */
- p_access->pf_block = BlockRTP;
- }
-
/* Update default_pts to a suitable value for udp access */
var_Create( p_access, "udp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
{
- vlc_bool_t *pb_bool;
+ bool *pb_bool;
int *pi_int;
int64_t *pi_64;
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
- *pb_bool = VLC_FALSE;
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = false;
break;
/* */
case ACCESS_GET_MTU:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
+ case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
{
access_sys_t *p_sys = p_access->p_sys;
block_t *p_block;
+ ssize_t len;
+
+ if( p_access->info.b_eof )
+ return NULL;
/* Read data */
p_block = block_New( p_access, MTU );
- p_block->i_buffer = net_Read( p_access, p_sys->fd, NULL,
- p_block->p_buffer, MTU, VLC_FALSE );
- if( p_block->i_buffer < 0 )
+ len = net_Read( p_access, p_sys->fd, NULL,
+ p_block->p_buffer, MTU, false );
+ if( ( len < 0 )
+ || ( p_sys->b_comedia && ( len == 0 ) ) )
{
+ if( p_sys->b_comedia )
+ {
+ p_access->info.b_eof = true;
+ msg_Dbg( p_access, "connection-oriented media hangup" );
+ }
block_Release( p_block );
return NULL;
}
- return block_Realloc( p_block, 0, p_block->i_buffer );
+ return block_Realloc( p_block, 0, p_block->i_buffer = len );
}
/*****************************************************************************
/* Read RTP framing */
if (p_block->i_buffer < 2)
{
- /* FIXME: not very efficient */
int i_read = net_Read( p_access, p_sys->fd, NULL,
p_block->p_buffer + p_block->i_buffer,
- 2 - p_block->i_buffer, VLC_FALSE );
+ 2 - p_block->i_buffer, false );
if( i_read <= 0 )
goto error;
{
int i_read = net_Read( p_access, p_sys->fd, NULL,
p_block->p_buffer + p_block->i_buffer,
- 2 + framelen - p_block->i_buffer, VLC_FALSE );
+ 2 + framelen - p_block->i_buffer, false );
if( i_read <= 0 )
goto error;
p_block->i_buffer += i_read;
}
- if( p_block->i_buffer < (2 + framelen) )
+ if( p_block->i_buffer < (2u + framelen) )
return NULL; // incomplete frame
/* Hide framing from RTP layer */
return p_block;
error:
- p_access->info.b_eof = VLC_TRUE;
+ p_access->info.b_eof = true;
block_Release( p_block );
p_sys->p_partial_frame = NULL;
return NULL;
* rtp_ChainInsert - insert a p_block in the chain and
* look at the sequence numbers.
*/
-static inline vlc_bool_t rtp_ChainInsert( access_t *p_access, block_t *p_block )
+static inline bool rtp_ChainInsert( access_t *p_access, block_t *p_block )
{
access_sys_t *p_sys = (access_sys_t *) p_access->p_sys;
block_t *p_prev = NULL;
{
p_sys->p_list = p_block;
p_sys->p_end = p_block;
- return VLC_TRUE;
+ return true;
}
- /* walk through the queue from top down since the new packet is in
+ /* walk through the queue from top down since the new packet is in
most cases just appended to the end */
for( ;; )
{
p_sys->p_end = p_block;
}
- return VLC_TRUE;
+ return true;
}
if( p == p_sys->p_list )
{ /* we've reached bottom of chain */
p_block->p_next = p;
p->p_prev = p_block;
p_sys->p_list = p_block;
- return VLC_TRUE;
+ return true;
}
if( !i_tmp ) /* trash duplicate */
p_sys->p_end->p_next = p_block;
p_block->p_prev = p_sys->p_end;
p_sys->p_end = p_block;
- return VLC_TRUE;
+ return true;
}
p_prev = p;
p = p->p_prev;
}
block_Release( p_block );
- return VLC_FALSE;
+ return false;
}
/*****************************************************************************
- * BlockParseRTP/BlockRTP:
+ * BlockParseRTP: decapsulate the RTP packet and return it
*****************************************************************************/
static block_t *BlockParseRTP( access_t *p_access, block_t *p_block )
{
p_block->i_dts = (mtime_t) GetWBE( p_block->p_buffer + 2 );
/* 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;
case 32: // MPV: MPEG Video (RFC2250, §3.5)
/* MPEG2 Video extension header */
/* 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;
+ case 72: /* muxed SR */
+ case 73: /* muxed RR */
+ case 74: /* muxed SDES */
+ case 75: /* muxed BYE */
+ case 76: /* muxed APP */
+ goto trash; /* ooh! ignoring RTCP is evil! */
+
default:
msg_Dbg( p_access, "unsupported RTP payload type: %u", i_payload_type );
goto trash;
}
#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;
trash:
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;
+}
+
+/*****************************************************************************
+ * BlockPrebufferRTP: waits until we have at least two RTP datagrams,
+ * so that we can synchronize the RTP sequence number.
+ * This is only useful for non-reliable transport protocols.
+ ****************************************************************************/
static block_t *BlockPrebufferRTP( access_t *p_access, block_t *p_block )
{
access_sys_t *p_sys = p_access->p_sys;
int i_count = 0;
block_t *p = p_block;
+ if( BlockParseRTP( p_access, p_block ) == NULL )
+ return NULL;
+
for( ;; )
{
mtime_t i_date = mdate();
break;
p = BlockParseRTP( p_access, BlockUDP( p_access ) );
- if( !p && (i_date - i_first) > p_sys->i_rtp_late )
+ if( !p && (i_date - i_first) > p_sys->i_rtp_late )
{
msg_Err( p_access, "error in RTP prebuffering!" );
- break;
+ return NULL;
}
}
msg_Dbg( p_access, "RTP: prebuffered %d packets", i_count - 1 );
- p_access->info.b_prebuffered = VLC_TRUE;
+ p_access->info.b_prebuffered = true;
p = p_sys->p_list;
p_sys->p_list = p_sys->p_list->p_next;
p_sys->i_last_seqno = (uint16_t) p->i_dts;
return p;
}
-static block_t *BlockRTP( access_t *p_access )
+static block_t *BlockStartRTP( 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;
+ p_access->pf_block = BlockRTP;
+ return BlockPrebufferRTP( p_access, BlockUDP( p_access ) );
}
+
/*****************************************************************************
* BlockChoose: decide between RTP and UDP
*****************************************************************************/
{
msg_Dbg( p_access, "detected TS over raw UDP" );
p_access->pf_block = BlockUDP;
- p_access->info.b_prebuffered = VLC_TRUE;
+ p_access->info.b_prebuffered = true;
return p_block;
}
{
msg_Dbg( p_access, "no supported RTP header detected" );
p_access->pf_block = BlockUDP;
- p_access->info.b_prebuffered = VLC_TRUE;
+ p_access->info.b_prebuffered = true;
return p_block;
}
default:
msg_Dbg( p_access, "no RTP header detected" );
p_access->pf_block = BlockUDP;
- p_access->info.b_prebuffered = VLC_TRUE;
+ p_access->info.b_prebuffered = true;
return p_block;
}
- if( !BlockParseRTP( p_access, p_block )) return NULL;
-
p_access->pf_block = BlockRTP;
-
return BlockPrebufferRTP( p_access, p_block );
}
projects / vlc / blobdiff