/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
#include <vlc/vlc.h>
#include <vlc_access.h>
#include <vlc_network.h>
-/* Big pile of stuff missing form glibc 2.5 */
-#if defined (HAVE_NETINET_UDPLITE_H)
-# include <netinet/udplite.h>
-#elif defined (__linux__)
-# define UDPLITE_SEND_CSCOV 10
-# define UDPLITE_RECV_CSCOV 11
-#endif
-
#ifndef SOCK_DCCP /* provisional API */
# ifdef __linux__
# define SOCK_DCCP 6
# 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" );
{
int fd;
- int i_mtu;
- vlc_bool_t b_auto_mtu;
vlc_bool_t b_framed_rtp;
/* reorder rtp packets when out-of-sequence */
*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 )
{
break;
case IPPROTO_TCP:
- p_sys = net_ConnectTCP( p_access, psz_server_addr, i_server_port );
+ p_sys->fd = net_ConnectTCP( p_access, psz_server_addr, i_server_port );
p_sys->b_framed_rtp = VLC_TRUE;
break;
shutdown( p_sys->fd, SHUT_WR );
-#ifdef UDPLITE_RECV_CSCOV
- if (proto == IPPROTO_UDPLITE)
- /* UDP header: 8 bytes + RTP header: 12 bytes (or more) */
- setsockopt (p_sys->fd, SOL_UDPLITE, UDPLITE_RECV_CSCOV,
- &(int){ 20 }, sizeof (int));
-#endif
+ 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;
- p_sys->i_mtu = 65535;
- }
- else
- {
- /* FIXME */
- p_sys->i_mtu = var_CreateGetInteger( p_access, "mtu" );
- if( p_sys->i_mtu <= 1 )
- p_sys->i_mtu = 1500; /* Avoid problem */
-
- p_sys->b_auto_mtu = var_CreateGetBool( p_access, "udp-auto-mtu" );;
}
/* Update default_pts to a suitable value for udp access */
*****************************************************************************/
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 );
+ 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 )
- {
- /* Increase by 100% */
- p_sys->i_mtu *= 2;
- msg_Dbg( p_access, "increasing MTU to %d", p_sys->i_mtu );
- }
-
- return p_block;
+ return block_Realloc( p_block, 0, p_block->i_buffer );
}
/*****************************************************************************
- * BlockTCP: Framed RTP/AVP packet reception for COMEDIA
- * Still an I-D (draft-ietf-avt-rtp-framing-contrans-06) - subject to change.
+ * BlockTCP: Framed RTP/AVP packet reception for COMEDIA (see RFC4571)
*****************************************************************************/
static block_t *BlockTCP( access_t *p_access )
{
if( p_block == NULL )
{
/* MTU should always be 65535 in this case */
- p_sys->p_partial_frame = p_block = block_New( p_access, 65537 );
+ p_sys->p_partial_frame = p_block = block_New( p_access, 2 + MTU );
if (p_block == NULL)
return NULL;
}
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;
/* 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;
// 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 */
+ 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 + 14 );
+ i_skip += 4 * GetWBE( p_block->p_buffer + i_skip - 2 );
}
- // CSRC count:
- i_skip += (p_block->p_buffer[0] & 0x0F) * 4;
i_payload_type = p_block->p_buffer[1] & 0x7F;
p_block->i_pts = mdate();
p_block->i_dts = (mtime_t) GetWBE( p_block->p_buffer + 2 );
- /* FIXME: use ptmap */
+ /* FIXME: use rtpmap */
switch( i_payload_type )
{
case 14: // MPA: MPEG Audio (RFC2250, ยง3.4)
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;
{
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;