/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
#include <vlc/vlc.h>
#include <vlc_access.h>
#include <vlc_network.h>
-#if defined (HAVE_NETINET_UDPLITE_H)
-# include <netinet/udplite.h>
-#elif defined (__linux__)
-# define UDPLITE_SEND_CSCOV 10
-# define UDPLITE_RECV_CSCOV 11
+#ifndef SOCK_DCCP /* provisional API */
+# ifdef __linux__
+# define SOCK_DCCP 6
+# endif
+#endif
+
+#ifndef IPPROTO_DCCP
+# define IPPROTO_DCCP 33 /* IANA */
#endif
#ifndef IPPROTO_UDPLITE
# define SOL_UDPLITE IPPROTO_UDPLITE
#endif
+#define MTU 65535
/*****************************************************************************
* Module descriptor
"Caching value for UDP streams. This " \
"value should be set in milliseconds." )
-#define AUTO_MTU_TEXT N_("Autodetection of MTU")
-#define AUTO_MTU_LONGTEXT N_( \
- "Automatically detect the line's MTU. This will increase the size if" \
- " truncated packets are found" )
-
#define RTP_LATE_TEXT N_("RTP reordering timeout in ms")
#define RTP_LATE_LONGTEXT N_( \
"VLC reorders RTP packets. The input will wait for late packets at most "\
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 );
-
- add_bool( "udp-auto-mtu", 1, NULL,
- AUTO_MTU_TEXT, AUTO_MTU_LONGTEXT, VLC_TRUE );
+ add_obsolete_bool( "udp-auto-mtu" );
set_capability( "access2", 0 );
add_shortcut( "udp" );
add_shortcut( "rtp4" );
add_shortcut( "rtp6" );
add_shortcut( "udplite" );
- add_shortcut( "rtplite" );
+ add_shortcut( "rtptcp" );
+ add_shortcut( "dccp" );
set_callbacks( Open, Close );
vlc_module_end();
#define RTP_HEADER_LEN 12
static block_t *BlockUDP( access_t * );
+static block_t *BlockTCP( access_t * );
static block_t *BlockRTP( access_t * );
static block_t *BlockChoose( access_t * );
static int Control( access_t *, int, va_list );
{
int fd;
- int i_mtu;
- vlc_bool_t b_auto_mtu;
+ vlc_bool_t b_framed_rtp;
/* reorder rtp packets when out-of-sequence */
- mtime_t i_rtp_late;
uint16_t i_last_seqno;
+ mtime_t i_rtp_late;
block_t *p_list;
block_t *p_end;
+ block_t *p_partial_frame; /* Partial Framed RTP packet */
};
/*****************************************************************************
char *psz_parser;
const char *psz_server_addr, *psz_bind_addr = "";
int i_bind_port, i_server_port = 0;
- int fam = AF_UNSPEC, proto = IPPROTO_UDP, cscov = 8;
+ int fam = AF_UNSPEC, proto = IPPROTO_UDP;
if (strlen (p_access->psz_access) >= 3)
{
}
if (strcmp (p_access->psz_access + 3, "lite") == 0)
proto = IPPROTO_UDPLITE;
- }
- if (strncmp (p_access->psz_access, "rtp", 3) == 0)
- /* Checksum coverage: RTP header is AT LEAST 12 bytes
- * in addition to UDP header (8 bytes) */
- cscov += 12;
+ else
+ if (strcmp (p_access->psz_access + 3, "tcp") == 0)
+ proto = IPPROTO_TCP;
+ else
+ if (strcmp (p_access->psz_access, "dccp") == 0)
+ proto = IPPROTO_DCCP;
+ }
i_bind_port = var_CreateGetInteger( p_access, "server-port" );
*psz_parser++ = '\0';
psz_bind_addr = psz_parser;
- if( *psz_parser == '[' )
+ if( psz_bind_addr[0] == '[' )
/* skips bracket'd IPv6 address */
psz_parser = strchr( psz_parser, ']' );
}
psz_server_addr = psz_name;
- if( *psz_server_addr == '[' )
- /* skips bracket'd IPv6 address */
- psz_parser = strchr( psz_name, ']' );
+ psz_parser = ( psz_server_addr[0] == '[' )
+ ? strchr( psz_name, ']' ) /* skips bracket'd IPv6 address */
+ : psz_name;
if( psz_parser != NULL )
{
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));
+
+ switch (proto)
+ {
+ case IPPROTO_UDP:
+ case IPPROTO_UDPLITE:
+ p_sys->fd = net_OpenDgram( p_access, psz_bind_addr, i_bind_port,
+ psz_server_addr, i_server_port, fam,
+ proto );
+ break;
+
+ case IPPROTO_TCP:
+ p_sys->fd = net_ConnectTCP( p_access, psz_server_addr, i_server_port );
+ p_sys->b_framed_rtp = VLC_TRUE;
+ break;
- p_sys->fd = net_OpenDgram( p_access, psz_bind_addr, i_bind_port,
- psz_server_addr, i_server_port, fam, proto );
+ case IPPROTO_DCCP:
+#ifdef SOCK_DCCP
+ 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
+ break;
+ }
free (psz_name);
if( p_sys->fd == -1 )
{
return VLC_EGENERIC;
}
- net_StopSend( p_sys->fd );
-
-#ifdef UDPLITE_RECV_CSCOV
- if (proto == IPPROTO_UDPLITE)
- setsockopt (p_sys->fd, SOL_UDPLITE, UDPLITE_RECV_CSCOV, &cscov, sizeof (cscov));
-#endif
+ shutdown( p_sys->fd, SHUT_WR );
- /* FIXME */
- p_sys->i_mtu = var_CreateGetInteger( p_access, "mtu" );
- if( p_sys->i_mtu <= 1 )
- p_sys->i_mtu = 1500; /* Avoid problem */
+ net_SetCSCov (p_sys->fd, -1, 12);
- p_sys->b_auto_mtu = var_CreateGetBool( p_access, "udp-auto-mtu" );;
+ 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 )
{
- access_sys_t *p_sys = p_access->p_sys;
vlc_bool_t *pb_bool;
int *pi_int;
int64_t *pi_64;
/* */
case ACCESS_GET_MTU:
pi_int = (int*)va_arg( args, int * );
- *pi_int = p_sys->i_mtu;
+ *pi_int = MTU;
break;
case ACCESS_GET_PTS_DELAY:
block_t *p_block;
/* Read data */
- p_block = block_New( p_access, p_sys->i_mtu );
+ p_block = block_New( p_access, MTU );
p_block->i_buffer = net_Read( p_access, p_sys->fd, NULL,
- p_block->p_buffer, p_sys->i_mtu,
- VLC_FALSE );
- if( p_block->i_buffer <= 0 )
+ p_block->p_buffer, MTU, VLC_FALSE );
+ if( p_block->i_buffer < 0 )
{
block_Release( p_block );
return NULL;
}
- if( (p_block->i_buffer >= p_sys->i_mtu) && p_sys->b_auto_mtu &&
- p_sys->i_mtu < 32767 )
+ return block_Realloc( p_block, 0, p_block->i_buffer );
+}
+
+/*****************************************************************************
+ * BlockTCP: Framed RTP/AVP packet reception for COMEDIA (see RFC4571)
+ *****************************************************************************/
+static block_t *BlockTCP( access_t *p_access )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ block_t *p_block = p_sys->p_partial_frame;
+
+ if( p_access->info.b_eof )
+ return NULL;
+
+ if( p_block == NULL )
+ {
+ /* MTU should always be 65535 in this case */
+ p_sys->p_partial_frame = p_block = block_New( p_access, 2 + MTU );
+ if (p_block == NULL)
+ return NULL;
+ }
+
+ /* 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 );
+ if( i_read <= 0 )
+ goto error;
+
+ p_block->i_buffer += i_read;
+ if (p_block->i_buffer < 2)
+ return NULL;
+ }
+
+ uint16_t framelen = GetWLE( p_block->p_buffer );
+ /* Read RTP frame */
+ if( framelen > 0 )
{
- /* Increase by 100% */
- p_sys->i_mtu *= 2;
- msg_Dbg( p_access, "increasing MTU to %d", p_sys->i_mtu );
+ 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 );
+ if( i_read <= 0 )
+ goto error;
+
+ p_block->i_buffer += i_read;
}
+ if( p_block->i_buffer < (2 + framelen) )
+ return NULL; // incomplete frame
+
+ /* Hide framing from RTP layer */
+ p_block->p_buffer += 2;
+ p_block->i_buffer -= 2;
+ p_sys->p_partial_frame = NULL;
return p_block;
+
+error:
+ p_access->info.b_eof = VLC_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.
p_sys->p_end = p_block;
return VLC_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( ;; )
i_tmp = i_new - (uint16_t) p->i_dts;
if( !i_tmp ) /* trash duplicate */
- break;
+ break;
if ( i_tmp < 32768 )
{ /* insert after this block ( i_new > p->i_dts ) */
if (p_prev)
{
p_prev->p_prev = p_block;
- msg_Dbg(p_access, "RTP reordering: insert after %d, new %d",
- (uint16_t) p->i_dts, i_new );
+ msg_Dbg(p_access, "RTP reordering: insert after %d, new %d",
+ (uint16_t) p->i_dts, i_new );
}
- else
+ else
{
p_sys->p_end = p_block;
}
i_tmp = p_sys->i_last_seqno - i_new;
if( !p_access->info.b_prebuffered || (i_tmp > 32767) )
{
- msg_Dbg(p_access, "RTP reordering: prepend %d before %d",
+ msg_Dbg(p_access, "RTP reordering: prepend %d before %d",
i_new, (uint16_t) p->i_dts );
p_block->p_next = p;
p->p_prev = p_block;
}
if( !i_tmp ) /* trash duplicate */
- break;
+ break;
/* reordering failed - append the packet to the end of queue */
msg_Dbg(p_access, "RTP: sequence changed (or buffer too small) "
- "new: %d, buffer %d...%d", i_new, (uint16_t) p->i_dts,
+ "new: %d, buffer %d...%d", i_new, (uint16_t) p->i_dts,
(uint16_t) p_sys->p_end->i_dts);
p_sys->p_end->p_next = p_block;
p_block->p_prev = p_sys->p_end;
*****************************************************************************/
static block_t *BlockParseRTP( access_t *p_access, block_t *p_block )
{
- int i_rtp_version;
- int i_CSRC_count;
int i_payload_type;
- int i_skip = 0;
- int i_extension_flag = 0;
- int i_extension_length = 0;
- uint16_t i_sequence_number = 0;
+ size_t i_skip = RTP_HEADER_LEN;
if( p_block == NULL )
return NULL;
if( p_block->i_buffer < RTP_HEADER_LEN )
+ {
+ msg_Dbg( p_access, "short RTP packet received" );
goto trash;
+ }
/* Parse the header and make some verifications.
* See RFC 3550. */
- i_rtp_version = ( p_block->p_buffer[0] & 0xC0 ) >> 6;
- i_CSRC_count = p_block->p_buffer[0] & 0x0F;
- i_extension_flag = p_block->p_buffer[0] & 0x10;
+ // Version number:
+ if( ( p_block->p_buffer[0] >> 6 ) != 2)
+ {
+ msg_Dbg( p_access, "RTP version is %u instead of 2",
+ p_block->p_buffer[0] >> 6 );
+ goto trash;
+ }
+ // Padding bit:
+ uint8_t pad = (p_block->p_buffer[0] & 0x20)
+ ? p_block->p_buffer[p_block->i_buffer - 1] : 0;
+ // CSRC count:
+ i_skip += (p_block->p_buffer[0] & 0x0F) * 4;
+ // Extension header:
+ if (p_block->p_buffer[0] & 0x10) /* Extension header */
+ {
+ i_skip += 4;
+ if ((size_t)p_block->i_buffer < i_skip)
+ goto trash;
+
+ i_skip += 4 * GetWBE( p_block->p_buffer + i_skip - 2 );
+ }
+
i_payload_type = p_block->p_buffer[1] & 0x7F;
- i_sequence_number = (p_block->p_buffer[2] << 8 ) + p_block->p_buffer[3];
- if( i_rtp_version != 2 )
- msg_Dbg( p_access, "RTP version is %u, should be 2", i_rtp_version );
+ /* Remember sequence number in i_dts */
+ p_block->i_pts = mdate();
+ p_block->i_dts = (mtime_t) GetWBE( p_block->p_buffer + 2 );
+
+ /* FIXME: use rtpmap */
+ switch( i_payload_type )
+ {
+ case 14: // MPA: MPEG Audio (RFC2250, §3.4)
+ i_skip += 4; // 32 bits RTP/MPA header
+ break;
+
+ case 32: // MPV: MPEG Video (RFC2250, §3.5)
+ i_skip += 4; // 32 bits RTP/MPV header
+ if( (size_t)p_block->i_buffer < i_skip )
+ goto trash;
+ if( p_block->p_buffer[i_skip - 3] & 0x4 )
+ {
+ /* MPEG2 Video extension header */
+ /* TODO: shouldn't we skip this too ? */
+ }
+ break;
- if( i_payload_type == 14 || i_payload_type == 32)
- i_skip = 4;
- else if( i_payload_type != 33 )
- msg_Dbg( p_access, "unsupported RTP payload type (%u)", i_payload_type );
- if( i_extension_flag )
- i_extension_length = 4 +
- 4 * ( (p_block->p_buffer[14] << 8) + p_block->p_buffer[15] );
+ case 33: // MP2: MPEG TS (RFC2250, §2)
+ /* plain TS over RTP */
+ break;
- /* Skip header + CSRC extension field n*(32 bits) + extension */
- i_skip += RTP_HEADER_LEN + 4*i_CSRC_count + i_extension_length;
+ default:
+ msg_Dbg( p_access, "unsupported RTP payload type: %u", i_payload_type );
+ goto trash;
+ }
- if( i_skip >= p_block->i_buffer )
+ if( (size_t)p_block->i_buffer < (i_skip + pad) )
goto trash;
- /* Return the packet without the RTP header, remember seqno in i_dts */
+ /* Remove the RTP header */
p_block->i_buffer -= i_skip;
p_block->p_buffer += i_skip;
- p_block->i_pts = mdate();
- p_block->i_dts = (mtime_t) i_sequence_number;
+
+ /* This is the place for deciphering and authentication */
+
+ /* Remove padding (at the end) */
+ p_block->i_buffer -= pad;
#if 0
/* Emulate packet loss */
return p_block;
trash:
- msg_Warn( p_access, "received a too short packet for RTP" );
block_Release( p_block );
return NULL;
}
if( i_count > 2 && (i_date - i_first) > p_sys->i_rtp_late )
break;
- p = BlockParseRTP( p_access, BlockUDP( p_access ));
- if( !p && (i_date - i_first) > p_sys->i_rtp_late )
+ p = BlockParseRTP( p_access, BlockUDP( p_access ) );
+ if( !p && (i_date - i_first) > p_sys->i_rtp_late )
{
msg_Err( p_access, "error in RTP prebuffering!" );
break;
access_sys_t *p_sys = p_access->p_sys;
block_t *p;
- while ( !p_sys->p_list ||
+ while ( !p_sys->p_list ||
( mdate() - p_sys->p_list->i_pts ) < p_sys->i_rtp_late )
{
- p = BlockParseRTP( p_access, BlockUDP( p_access ));
-
- if ( !p )
+ p = BlockParseRTP( p_access,
+ p_sys->b_framed_rtp ? BlockTCP( p_access )
+ : BlockUDP( p_access ) );
+ if ( !p )
return NULL;
rtp_ChainInsert( p_access, p );
{
block_t *p_block;
int i_rtp_version;
- int i_CSRC_count;
int i_payload_type;
if( ( p_block = BlockUDP( p_access ) ) == NULL )
/* Parse the header and make some verifications.
* See RFC 3550. */
- i_rtp_version = ( p_block->p_buffer[0] & 0xC0 ) >> 6;
- i_CSRC_count = ( p_block->p_buffer[0] & 0x0F );
+ i_rtp_version = p_block->p_buffer[0] >> 6;
i_payload_type = ( p_block->p_buffer[1] & 0x7F );
if( i_rtp_version != 2 )
switch( i_payload_type )
{
case 33:
- msg_Dbg( p_access, "detected TS over RTP" );
+ msg_Dbg( p_access, "detected MPEG2 TS over RTP" );
p_access->psz_demux = strdup( "ts" );
break;
case 14:
- msg_Dbg( p_access, "detected MPEG audio over RTP" );
+ msg_Dbg( p_access, "detected MPEG Audio over RTP" );
p_access->psz_demux = strdup( "mpga" );
break;
case 32:
- msg_Dbg( p_access, "detected MPEG video over RTP" );
+ msg_Dbg( p_access, "detected MPEG Video over RTP" );
p_access->psz_demux = strdup( "mpgv" );
break;
projects / vlc / blobdiff