* udp.c: raw UDP & RTP input module
*****************************************************************************
* Copyright (C) 2001-2005 the VideoLAN team
+ * Copyright (C) 2007 Remi Denis-Courmont
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Tristan Leteurtre <tooney@via.ecp.fr>
* Laurent Aimar <fenrir@via.ecp.fr>
* Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
+ * Remi Denis-Courmont
*
- * Reviewed: 23 October 2003, Jean-Paul Saman <jpsaman@wxs.nl>
+ * Reviewed: 23 October 2003, Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_access.h>
+#include <vlc_network.h>
-#include "network.h"
+#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 IPPROTO_UDPLITE 136 /* from IANA */
+#endif
+#ifndef SOL_UDPLITE
+# define SOL_UDPLITE IPPROTO_UDPLITE
+#endif
+
+#define MTU 65535
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
- "Allows you to modify the default caching value for UDP streams. This " \
- "value should be set in millisecond units." )
-
-#define AUTO_MTU_TEXT N_("Autodetection of MTU")
-#define AUTO_MTU_LONGTEXT N_( \
- "Allows growing the MTU if truncated packets are found" )
+ "Caching value for UDP streams. This " \
+ "value should be set in milliseconds." )
-#define RTP_LATE_TEXT N_("Reorder timeout in ms for late RTP packets")
+#define RTP_LATE_TEXT N_("RTP reordering timeout in ms")
#define RTP_LATE_LONGTEXT N_( \
- "Allows you to modify the RTP packets reorder and late behaviour. " \
- "If enabled (value>0) then out-of-order packets will be held for the " \
- "specified timeout in ms. " \
- "The default behaviour is not to reorder." )
+ "VLC reorders RTP packets. The input will wait for late packets at most "\
+ "the time specified here (in milliseconds)." )
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
CACHING_LONGTEXT, VLC_TRUE );
- add_bool( "udp-auto-mtu", 1, NULL,
- AUTO_MTU_TEXT, AUTO_MTU_LONGTEXT, VLC_TRUE );
-
- add_integer( "rtp-late", 0, NULL, RTP_LATE_TEXT, RTP_LATE_LONGTEXT, VLC_TRUE );
+ add_integer( "rtp-late", 100, NULL, RTP_LATE_TEXT, RTP_LATE_LONGTEXT, VLC_TRUE );
+ add_obsolete_bool( "udp-auto-mtu" );
set_capability( "access2", 0 );
add_shortcut( "udp" );
add_shortcut( "rtp" );
add_shortcut( "rtp4" );
add_shortcut( "rtp6" );
+ add_shortcut( "udplite" );
+ add_shortcut( "rtptcp" );
+ add_shortcut( "dccp" );
+
set_callbacks( Open, Close );
vlc_module_end();
* Local prototypes
*****************************************************************************/
#define RTP_HEADER_LEN 12
-#define RTP_SEQ_NUM_SIZE 65536
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;
-
- /* rtp only */
- uint16_t i_sequence_number;
- vlc_bool_t b_first_seqno;
-
- /* reorder rtp packets when out-of-bounds
- * the packets hold queue is one level deep
- */
- uint32_t i_rtp_late; /* number of ms an RTP packet may be too late*/
- uint32_t i_last_pcr; /* last known good PCR */
- block_t *p_list; /* list of packets to rearrange */
- block_t *p_end; /* last packet in p_list */
- block_t *p_next; /* p_next ?? */
+ vlc_bool_t b_framed_rtp;
+
+ /* reorder rtp packets when out-of-sequence */
+ 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 */
};
/*****************************************************************************
access_sys_t *p_sys;
char *psz_name = strdup( p_access->psz_path );
- char *psz_parser, *psz_server_addr, *psz_bind_addr = "";
+ 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;
- /* First set ipv4/ipv6 */
- var_Create( p_access, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Create( p_access, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-
- if( *p_access->psz_access )
+ if (strlen (p_access->psz_access) >= 3)
{
- vlc_value_t val;
- /* Find out which shortcut was used */
- if( !strncmp( p_access->psz_access, "udp4", 6 ) ||
- !strncmp( p_access->psz_access, "rtp4", 6 ))
- {
- val.b_bool = VLC_TRUE;
- var_Set( p_access, "ipv4", val );
-
- val.b_bool = VLC_FALSE;
- var_Set( p_access, "ipv6", val );
- }
- else if( !strncmp( p_access->psz_access, "udp6", 6 ) ||
- !strncmp( p_access->psz_access, "rtp6", 6 ) )
+ switch (p_access->psz_access[3])
{
- val.b_bool = VLC_TRUE;
- var_Set( p_access, "ipv6", val );
+ case '4':
+ fam = AF_INET;
+ break;
- val.b_bool = VLC_FALSE;
- var_Set( p_access, "ipv4", val );
+ case '6':
+ fam = AF_INET6;
+ break;
}
+ if (strcmp (p_access->psz_access + 3, "lite") == 0)
+ proto = IPPROTO_UDPLITE;
+ 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 )
{
psz_server_addr, i_server_port, psz_bind_addr, i_bind_port );
/* Set up p_access */
- p_access->pf_read = NULL;
- if( !strcasecmp( p_access->psz_access, "rtp" )
- || !strcasecmp( p_access->psz_access, "rtp4" )
- || !strcasecmp( p_access->psz_access, "rtp6" ) )
- {
- p_access->pf_block = BlockRTP;
- }
- else
+ 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));
+
+ switch (proto)
{
- p_access->pf_block = BlockChoose;
+ 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;
+
+ 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;
}
- p_access->pf_control = Control;
- p_access->pf_seek = NULL;
- p_access->info.i_update = 0;
- p_access->info.i_size = 0;
- p_access->info.i_pos = 0;
- p_access->info.b_eof = VLC_FALSE;
- p_access->info.i_title = 0;
- p_access->info.i_seekpoint = 0;
-
- p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
- p_sys->fd = net_OpenUDP( p_access, psz_bind_addr, i_bind_port,
- psz_server_addr, i_server_port );
- if( p_sys->fd < 0 )
+ free (psz_name);
+ if( p_sys->fd == -1 )
{
msg_Err( p_access, "cannot open socket" );
- free( psz_name );
free( p_sys );
return VLC_EGENERIC;
}
- free( psz_name );
- net_StopSend( p_sys->fd );
+ 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 );
- /* Keep track of RTP sequence number */
- p_sys->i_sequence_number = 0;
- p_sys->b_first_seqno = VLC_TRUE;
-
- /* RTP reordering out-of-bound packets */
- p_sys->i_last_pcr = 0;
- p_sys->i_rtp_late = var_CreateGetInteger( p_access, "rtp-late" );
+ /* RTP reordering for out-of-sequence packets */
+ p_sys->i_rtp_late = var_CreateGetInteger( p_access, "rtp-late" ) * 1000;
+ p_sys->i_last_seqno = 0;
p_sys->p_list = NULL;
p_sys->p_end = NULL;
- p_sys->p_next = NULL;
-
return VLC_SUCCESS;
}
*****************************************************************************/
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 )
- {
- /* 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 );
}
-/*
- * rtp_ChainInsert - insert a p_block in the chain and
- * look at the sequence numbers.
- */
-static inline void rtp_ChainInsert( access_t *p_access, block_t **pp_list, block_t **pp_end, block_t *p_block )
+/*****************************************************************************
+ * BlockTCP: Framed RTP/AVP packet reception for COMEDIA (see RFC4571)
+ *****************************************************************************/
+static block_t *BlockTCP( access_t *p_access )
{
- block_t *p_tmp = NULL;
- block_t *p = NULL;
- uint16_t i_new = 0;
- uint16_t i_cur = 0;
- uint16_t i_expected = 0;
- uint32_t i_pcr_new = 0;
-
- if( !p_block ) return;
- if( *pp_list == NULL )
- {
- *pp_list = p_block;
- *pp_end = p_block;
- return;
- }
- /* Appending packets at the end of the chain is the normal case */
- i_pcr_new = ( (p_block->p_buffer[4] << 24) +
- (p_block->p_buffer[5] << 16) +
- (p_block->p_buffer[6] << 8) +
- p_block->p_buffer[7] );
- i_new = ( (p_block->p_buffer[2] << 8 ) + p_block->p_buffer[3] );
-
- p = *pp_end;
- i_cur = ( (p->p_buffer[2] << 8 ) + p->p_buffer[3] );
- i_expected = ((i_cur+1) % RTP_SEQ_NUM_SIZE);
- if( (i_new - i_expected) >= 0 ) /* Append at the end? */
+ 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 )
{
- msg_Dbg( p_access, ">> append %p(%u)==%p(%u)\n", p_block, i_cur, p, i_new );
- p->p_next = *pp_end = p_block;
- return;
+ /* 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;
}
- /* Add to the front fo the chain? */
- p = *pp_list;
- i_new = ( (p_block->p_buffer[2] << 8 ) + p_block->p_buffer[3] );
- i_cur = ( (p->p_buffer[2] << 8 ) + p->p_buffer[3] );
- if( i_cur > i_new )
+
+ /* Read RTP framing */
+ if (p_block->i_buffer < 2)
{
- msg_Dbg( p_access, ">> prepend %p(%u)==%p(%u)\n", p_block, i_cur, p, i_new );
- p_block->p_next = p;
- *pp_list = p_block;
- return;
+ /* 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;
}
- /* The packet can't be added to the front or the end of the chain,
- * thus walk the chain from the start.
- */
- while( p )
+
+ uint16_t framelen = GetWLE( p_block->p_buffer );
+ /* Read RTP frame */
+ if( framelen > 0 )
{
- i_cur = (p->p_buffer[2] << 8 ) + p->p_buffer[3];
- i_expected = (i_cur+1) % RTP_SEQ_NUM_SIZE;
+ 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;
- msg_Dbg( p_access, "i_cur: %u, i_new: %u", i_cur, i_new);
- if( i_cur == i_new )
- {
- uint32_t i_pcr_cur = ( (p->p_buffer[4] << 24) +
- (p->p_buffer[5] << 16) +
- (p->p_buffer[6] << 8) +
- p->p_buffer[7] );
- /* This packet might be a duplicate, so check PCR's */
- if( i_pcr_cur >= i_pcr_new )
- {
- /* packet way too late drop it. */
- block_Release( p_block );
- return;
- }
- /* Add it to list later on
- * else if( i_pcr_cur < i_pcr_new ) */
- break;
- }
- else if( i_expected >= i_new ) /* insert in chain */
- {
- p_tmp = p->p_next;
- msg_Dbg( p_access, ">> insert between %p(%u)==%p(%u)", p, i_cur, p_tmp, i_new );
- p->p_next = p_block;
- p_block->p_next = p_tmp;
- return;
- }
- if( !p->p_next ) break;
- p = p->p_next;
+ 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_ChainSend - look which packets are ready for sending.
+ * rtp_ChainInsert - insert a p_block in the chain and
+ * look at the sequence numbers.
*/
-static inline block_t *rtp_ChainSend( access_t *p_access, block_t **pp_list, uint16_t i_seq )
+static inline vlc_bool_t rtp_ChainInsert( access_t *p_access, block_t *p_block )
{
access_sys_t *p_sys = (access_sys_t *) p_access->p_sys;
- uint16_t i_cur = 0;
+ block_t *p_prev = NULL;
+ block_t *p = p_sys->p_end;
+ uint16_t i_new = (uint16_t) p_block->i_dts;
+ uint16_t i_tmp = 0;
- if( *pp_list )
+ if( !p_sys->p_list )
{
- /* Parse RTP header */
- int i_skip = 0;
- int i_extension_bit = 0;
- int i_extension_length = 0;
- int i_CSRC_count = 0;
- int i_payload_type = 0;
- uint32_t i_pcr_prev = 0;
- uint16_t i_seq_prev = 0;
- /* Data pointers */
- block_t *p_prev = NULL;
- block_t *p_send = *pp_list;
- block_t *p = *pp_list;
-
- while( p )
- {
- 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 );
- if( i_cur == i_seq )
+ p_sys->p_list = p_block;
+ p_sys->p_end = p_block;
+ return VLC_TRUE;
+ }
+ /* 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;
+
+ if ( i_tmp < 32768 )
+ { /* insert after this block ( i_new > p->i_dts ) */
+ p_block->p_next = p->p_next;
+ p->p_next = p_block;
+ p_block->p_prev = p;
+ if (p_prev)
{
- i_seq++; /* sent all packets that are received in order */
-
- /* Remember PCR and sequence number of packet
- * for next iteration */
- i_pcr_prev = ( (p->p_buffer[4] << 24) +
- (p->p_buffer[5] << 16) +
- (p->p_buffer[6] << 8) +
- p->p_buffer[7] );
- i_seq_prev = ( (p->p_buffer[2] << 8 ) +
- p->p_buffer[3] );
-
- /* Parse headerfields we need */
- i_CSRC_count = p->p_buffer[0] & 0x0F;
- i_payload_type = (p->p_buffer[1] & 0x7F);
- i_extension_bit = ( p->p_buffer[0] & 0x10 ) >> 4;
- if ( i_extension_bit == 1)
- i_extension_length = ( (p->p_buffer[14] << 8 ) +
- p->p_buffer[15] );
-
- /* Skip header + CSRC extension field n*(32 bits) + extention */
- i_skip = RTP_HEADER_LEN + 4*i_CSRC_count + i_extension_length;
- if( i_payload_type == 14 ) i_skip += 4;
-
- /* Return the packet without the RTP header. */
- p->i_buffer -= i_skip;
- p->p_buffer += i_skip;
+ p_prev->p_prev = p_block;
+ msg_Dbg(p_access, "RTP reordering: insert after %d, new %d",
+ (uint16_t) p->i_dts, i_new );
}
- else if( i_cur > i_seq )
+ else
{
- if( p_prev )
- {
- *pp_list = p;
- p_prev->p_next = NULL;
- p_sys->i_last_pcr = i_pcr_prev;
- p_sys->i_sequence_number = i_seq_prev;
- return p_send;
- }
- /* FiXME: or should we return NULL here? */
- return NULL;
+ p_sys->p_end = p_block;
}
- p_prev = p;
- if (!p->p_next) break;
- p = p->p_next;
+ return VLC_TRUE;
+ }
+ if( p == p_sys->p_list )
+ { /* we've reached bottom of chain */
+ 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",
+ i_new, (uint16_t) p->i_dts );
+ p_block->p_next = p;
+ p->p_prev = p_block;
+ p_sys->p_list = p_block;
+ return VLC_TRUE;
+ }
+
+ if( !i_tmp ) /* trash duplicate */
+ 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,
+ (uint16_t) p_sys->p_end->i_dts);
+ 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;
}
- /* We have walked through the complete chain and all packets are
- * in sequence - so send the whole chain
- */
- i_payload_type = (p->p_buffer[1] & 0x7F);
- i_CSRC_count = p->p_buffer[0] & 0x0F;
- i_extension_bit = ( p->p_buffer[0] & 0x10 ) >> 4;
- if( i_extension_bit == 1)
- i_extension_length = ( (p->p_buffer[14] << 8 ) + p->p_buffer[15] );
-
- /* Skip header + CSRC extension field n*(32 bits) + extention */
- i_skip = RTP_HEADER_LEN + 4*i_CSRC_count + i_extension_length;
- if( i_payload_type == 14 ) i_skip += 4;
-
- /* Update the list pointers */
- *pp_list = NULL;
- p_sys->p_next = NULL;
- p_sys->p_end = NULL;
- p_sys->i_sequence_number = ( (p->p_buffer[2] << 8 ) +
- p->p_buffer[3] );
- p_sys->i_last_pcr = ( (p->p_buffer[4] << 24) +
- (p->p_buffer[5] << 16) +
- (p->p_buffer[6] << 8) +
- p->p_buffer[7] );
- /* Return the packet without the RTP header. */
- p->i_buffer -= i_skip;
- p->p_buffer += i_skip;
- return p_send;
+ p_prev = p;
+ p = p->p_prev;
}
- return NULL;
+ block_Release( p_block );
+ return VLC_FALSE;
}
/*****************************************************************************
*****************************************************************************/
static block_t *BlockParseRTP( access_t *p_access, block_t *p_block )
{
- access_sys_t *p_sys = (access_sys_t *) p_access->p_sys;
- int i_rtp_version;
- int i_CSRC_count;
int i_payload_type;
- int i_skip = 0;
- uint16_t i_sequence_number = 0;
- uint16_t i_sequence_expected = 0;
- int i_extension_bit = 0;
- int i_extension_length = 0;
- uint32_t i_pcr = 0;
+ size_t i_skip = RTP_HEADER_LEN;
if( p_block == NULL )
return NULL;
if( p_block->i_buffer < RTP_HEADER_LEN )
{
- msg_Warn( p_access, "received a too short packet for RTP" );
- block_Release( p_block );
- return NULL;
+ 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_payload_type = p_block->p_buffer[1] & 0x7F;
- i_sequence_number = (p_block->p_buffer[2] << 8) +
- p_block->p_buffer[3];
- i_pcr = ( (p_block->p_buffer[4] << 24) +
- (p_block->p_buffer[5] << 16) +
- (p_block->p_buffer[6] << 8) +
- p_block->p_buffer[7] );
- i_extension_bit = ( p_block->p_buffer[0] & 0x10 ) >> 4;
+ // 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;
- if( i_rtp_version != 2 )
- msg_Dbg( p_access, "RTP version is %u, should be 2", i_rtp_version );
+ i_skip += 4 * GetWBE( p_block->p_buffer + i_skip - 2 );
+ }
- if( i_payload_type == 14 )
- i_skip = 4;
- else if( i_payload_type != 33 && i_payload_type != 32 )
- msg_Dbg( p_access, "unsupported RTP payload type (%u)", i_payload_type );
+ i_payload_type = p_block->p_buffer[1] & 0x7F;
- if( i_extension_bit == 1)
- i_extension_length = 4 +
- 4 * ( (p_block->p_buffer[14] << 8) + p_block->p_buffer[15] );
+ /* Remember sequence number in i_dts */
+ p_block->i_pts = mdate();
+ p_block->i_dts = (mtime_t) GetWBE( p_block->p_buffer + 2 );
- /* Skip header + CSRC extension field n*(32 bits) + extention */
- i_skip += RTP_HEADER_LEN + 4*i_CSRC_count + i_extension_length;
- if( i_skip >= p_block->i_buffer )
+ /* FIXME: use rtpmap */
+ switch( i_payload_type )
{
- msg_Warn( p_access, "received a too short packet for RTP" );
- block_Release( p_block );
- return NULL;
- }
+ case 14: // MPA: MPEG Audio (RFC2250, §3.4)
+ i_skip += 4; // 32 bits RTP/MPA header
+ break;
- /* Detect RTP packet loss through tracking sequence numbers,
- * and take RTP PCR into account.
- * See RFC 3550.
- */
- if( p_sys->b_first_seqno )
- {
- p_sys->i_sequence_number = i_sequence_number - 1;
- p_sys->i_last_pcr = i_pcr;
- p_sys->b_first_seqno = VLC_FALSE;
+ 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;
+
+ case 33: // MP2: MPEG TS (RFC2250, §2)
+ /* plain TS over RTP */
+ break;
+
+ default:
+ msg_Dbg( p_access, "unsupported RTP payload type: %u", i_payload_type );
+ goto trash;
}
+
+ if( (size_t)p_block->i_buffer < (i_skip + pad) )
+ goto trash;
+
+ /* Remove the RTP header */
+ p_block->i_buffer -= i_skip;
+ p_block->p_buffer += i_skip;
+
+ /* This is the place for deciphering and authentication */
+
+ /* Remove padding (at the end) */
+ p_block->i_buffer -= pad;
+
#if 0
/* Emulate packet loss */
if ( (i_sequence_number % 4000) == 0)
return NULL;
}
#endif
- i_sequence_expected = ((p_sys->i_sequence_number + 1) % RTP_SEQ_NUM_SIZE);
- if( i_sequence_expected != i_sequence_number )
- {
- /* Handle out of order packets */
- if( p_sys->i_rtp_late > 0 )
- {
- if( i_sequence_number > i_sequence_expected )
- {
- msg_Warn( p_access,
- "RTP packet out of order (too early) expected %u, current %u",
- i_sequence_expected, i_sequence_number );
- if( (i_pcr - p_sys->i_last_pcr) > (p_sys->i_rtp_late*90) )
- {
- block_t *p_start = p_sys->p_list;
- uint16_t i_start = (!p_start) ? p_sys->i_sequence_number :
- (p_start->p_buffer[2] << 8) +
- p_start->p_buffer[3];
- /* Gap too big, we have been holding this data for too long,
- * send what we have.
- */
- msg_Warn( p_access,
- "Gap too big resyncing: delta %u, held for %d ms",
- (i_pcr - p_sys->i_last_pcr), p_sys->i_rtp_late );
- rtp_ChainInsert( p_access, &p_sys->p_list, &p_sys->p_end, p_block );
- return rtp_ChainSend( p_access, &p_sys->p_list, i_start );
- }
- /* hold packets that arrive too early. */
- rtp_ChainInsert( p_access, &p_sys->p_list, &p_sys->p_end, p_block );
- return rtp_ChainSend( p_access, &p_sys->p_list, i_sequence_expected );
- }
- else if( /* ((i_sequence_expected - i_sequence_number ) > 0) && */
- (i_pcr <= p_sys->i_last_pcr) )
- {
- msg_Warn( p_access,
- "RTP packet out of order (duplicate or too late) expected %u, current %u .. trashing it",
- i_sequence_expected, i_sequence_number );
- block_Release( p_block );
- p_sys->i_sequence_number = i_sequence_number;
- p_sys->i_last_pcr = i_pcr;
- return NULL;
- }
- if( p_sys->p_list )
- {
- block_t *p = NULL;
- block_t **p_send = &p_sys->p_list;
-
- msg_Warn( p_access,
- "RTP packet (unexpected condition) expected %u, current %u",
- i_sequence_expected, i_sequence_number );
-
- /* Append block to the end of chain and send whole chain */
- block_ChainLastAppend( &p_send, p_block );
- p_sys->p_list = p_sys->p_end = NULL;
- p_sys->i_sequence_number = i_sequence_number;
- p_sys->i_last_pcr = i_pcr;
-
- /* Return the packet without the RTP header. */
- p = *p_send;
- while( p )
- {
- p->i_buffer -= i_skip;
- p->p_buffer += i_skip;
- if( !p->p_next ) break;
- p = p->p_next;
- }
- return *p_send;
- }
- /* This code should never be reached !! */
- msg_Err( p_access,
- "Bug in algorithme: (unexpected condition) expected %u (pcr=%u), current %u (pcr=%u)",
- i_sequence_expected, i_sequence_number, p_sys->i_last_pcr, i_pcr );
- }
- msg_Warn( p_access,
- "RTP packet(s) lost, expected sequence number %d got %d",
- i_sequence_expected, i_sequence_number );
+ return p_block;
- /* Mark transport error in the first TS packet in the RTP stream. */
- if( (i_payload_type == 33) && (p_block->p_buffer[0] == 0x47) )
- p_block->p_buffer[1] |= 0x80;
- }
- else if( (p_sys->i_rtp_late > 0) && p_sys->p_list )
+trash:
+ block_Release( p_block );
+ return NULL;
+}
+
+static block_t *BlockPrebufferRTP( access_t *p_access, block_t *p_block )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ mtime_t i_first = mdate();
+ int i_count = 0;
+ block_t *p = p_block;
+
+ for( ;; )
{
- if( i_pcr <= p_sys->i_last_pcr )
+ mtime_t i_date = mdate();
+
+ if( p && rtp_ChainInsert( p_access, p ))
+ i_count++;
+
+ /* Require at least 2 packets in the buffer */
+ 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 )
{
- msg_Warn( p_access,
- "RTP packet out of order (duplicate) expected %u, current %u .. trashing it",
- i_sequence_expected, i_sequence_number );
- block_Release( p_block );
- p_sys->i_sequence_number = i_sequence_number;
- p_sys->i_last_pcr = i_pcr;
- return NULL;
+ msg_Err( p_access, "error in RTP prebuffering!" );
+ break;
}
- rtp_ChainInsert( p_access, &p_sys->p_list, &p_sys->p_end, p_block );
- return rtp_ChainSend( p_access, &p_sys->p_list, i_sequence_expected );
}
- /* This is the normal case when no packet reordering is effective */
- p_sys->i_sequence_number = i_sequence_number;
- p_sys->i_last_pcr = i_pcr;
-
- /* Return the packet without the RTP header. */
- p_block->i_buffer -= i_skip;
- p_block->p_buffer += i_skip;
- return p_block;
+ msg_Dbg( p_access, "RTP: prebuffered %d packets", i_count - 1 );
+ p_access->info.b_prebuffered = VLC_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;
+ p->p_next = NULL;
+ return p;
}
static block_t *BlockRTP( access_t *p_access )
{
- block_t *p_block = BlockUDP( p_access );
+ access_sys_t *p_sys = p_access->p_sys;
+ block_t *p;
- if ( p_block != NULL )
- return BlockParseRTP( p_access, p_block );
- else
- return NULL;
+ 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;
}
/*****************************************************************************
{
block_t *p_block;
int i_rtp_version;
- int i_CSRC_count;
int i_payload_type;
if( ( p_block = BlockUDP( p_access ) ) == NULL )
{
msg_Dbg( p_access, "detected TS over raw UDP" );
p_access->pf_block = BlockUDP;
+ p_access->info.b_prebuffered = VLC_TRUE;
return p_block;
}
/* 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 )
{
msg_Dbg( p_access, "no supported RTP header detected" );
p_access->pf_block = BlockUDP;
+ p_access->info.b_prebuffered = VLC_TRUE;
return p_block;
}
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;
default:
msg_Dbg( p_access, "no RTP header detected" );
p_access->pf_block = BlockUDP;
+ p_access->info.b_prebuffered = VLC_TRUE;
return p_block;
}
+ if( !BlockParseRTP( p_access, p_block )) return NULL;
+
p_access->pf_block = BlockRTP;
- return BlockParseRTP( p_access, p_block );
+ return BlockPrebufferRTP( p_access, p_block );
}
projects / vlc / blobdiff