/*****************************************************************************
- * udp.c: raw UDP & RTP access plug-in
+ * udp.c: raw UDP & RTP input module
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: udp.c,v 1.13 2003/02/12 13:42:43 massiot Exp $
+ * 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 _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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* 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 <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_access.h>
+#include <vlc_network.h>
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
+#ifndef SOCK_DCCP /* provisional API */
+# ifdef __linux__
+# define SOCK_DCCP 6
+# endif
#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#elif defined( _MSC_VER ) && defined( _WIN32 )
-# include <io.h>
+#ifndef IPPROTO_DCCP
+# define IPPROTO_DCCP 33 /* IANA */
#endif
-#ifdef WIN32
-# include <winsock2.h>
-# include <ws2tcpip.h>
-# ifndef IN_MULTICAST
-# define IN_MULTICAST(a) IN_CLASSD(a)
-# endif
-#else
-# include <sys/socket.h>
+#ifndef IPPROTO_UDPLITE
+# define IPPROTO_UDPLITE 136 /* from IANA */
+#endif
+#ifndef SOL_UDPLITE
+# define SOL_UDPLITE IPPROTO_UDPLITE
#endif
-#include "network.h"
-
-#define RTP_HEADER_LEN 12
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close ( vlc_object_t * );
-static ssize_t Read ( input_thread_t *, byte_t *, size_t );
-static ssize_t RTPRead ( input_thread_t *, byte_t *, size_t );
-static ssize_t RTPChoose( input_thread_t *, byte_t *, size_t );
+#define MTU 65535
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define CACHING_TEXT N_("caching value in ms")
+#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 miliseconds units." )
+ "Caching value for UDP streams. This " \
+ "value should be set in milliseconds." )
+
+#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 "\
+ "the time specified here (in milliseconds)." )
+
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
vlc_module_begin();
- set_description( _("raw UDP access module") );
- add_category_hint( N_("udp"), NULL );
- add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT );
- set_capability( "access", 0 );
+ set_shortname( _("UDP/RTP" ) );
+ set_description( _("UDP/RTP input") );
+ set_category( CAT_INPUT );
+ 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 );
+ add_obsolete_bool( "udp-auto-mtu" );
+
+ set_capability( "access2", 0 );
add_shortcut( "udp" );
add_shortcut( "udpstream" );
add_shortcut( "udp4" );
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
+
+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 );
+
+struct access_sys_t
+{
+ int fd;
+
+ 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 */
+};
+
/*****************************************************************************
* Open: open the socket
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
- input_thread_t * p_input = (input_thread_t *)p_this;
- input_socket_t * p_access_data;
- module_t * p_network;
- char * psz_network = "";
- char * psz_name = strdup(p_input->psz_name);
- char * psz_parser = psz_name;
- char * psz_server_addr = "";
- char * psz_server_port = "";
- char * psz_bind_addr = "";
- char * psz_bind_port = "";
- int i_bind_port = 0, i_server_port = 0;
- network_socket_t socket_desc;
-
- if( config_GetInt( p_input, "ipv4" ) )
- {
- psz_network = "ipv4";
- }
- if( config_GetInt( p_input, "ipv6" ) )
- {
- psz_network = "ipv6";
- }
+ access_t *p_access = (access_t*)p_this;
+ access_sys_t *p_sys;
- if( *p_input->psz_access )
+ char *psz_name = strdup( p_access->psz_path );
+ 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;
+
+ if (strlen (p_access->psz_access) >= 3)
{
- /* Find out which shortcut was used */
- if( !strncmp( p_input->psz_access, "udp6", 5 ) )
- {
- psz_network = "ipv6";
- }
- else if( !strncmp( p_input->psz_access, "udp4", 5 ) )
+ switch (p_access->psz_access[3])
{
- psz_network = "ipv4";
+ case '4':
+ fam = AF_INET;
+ break;
+
+ 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" );
+
/* Parse psz_name syntax :
* [serveraddr[:serverport]][@[bindaddr]:[bindport]] */
-
- if( *psz_parser && *psz_parser != '@' )
+ psz_parser = strchr( psz_name, '@' );
+ if( psz_parser != NULL )
{
- /* Found server */
- psz_server_addr = psz_parser;
+ /* Found bind address and/or bind port */
+ *psz_parser++ = '\0';
+ psz_bind_addr = psz_parser;
- while( *psz_parser && *psz_parser != ':' && *psz_parser != '@' )
- {
- if( *psz_parser == '[' )
- {
- /* IPv6 address */
- while( *psz_parser && *psz_parser != ']' )
- {
- psz_parser++;
- }
- }
- psz_parser++;
- }
+ if( psz_bind_addr[0] == '[' )
+ /* skips bracket'd IPv6 address */
+ psz_parser = strchr( psz_parser, ']' );
- if( *psz_parser == ':' )
+ if( psz_parser != NULL )
{
- /* Found server port */
- *psz_parser = '\0'; /* Terminate server name */
- psz_parser++;
- psz_server_port = psz_parser;
-
- while( *psz_parser && *psz_parser != '@' )
+ psz_parser = strchr( psz_parser, ':' );
+ if( psz_parser != NULL )
{
- psz_parser++;
+ *psz_parser++ = '\0';
+ i_bind_port = atoi( psz_parser );
}
}
}
- if( *psz_parser == '@' )
- {
- /* Found bind address or bind port */
- *psz_parser = '\0'; /* Terminate server port or name if necessary */
- psz_parser++;
+ psz_server_addr = psz_name;
+ psz_parser = ( psz_server_addr[0] == '[' )
+ ? strchr( psz_name, ']' ) /* skips bracket'd IPv6 address */
+ : psz_name;
- if( *psz_parser && *psz_parser != ':' )
+ if( psz_parser != NULL )
+ {
+ psz_parser = strchr( psz_parser, ':' );
+ if( psz_parser != NULL )
{
- /* Found bind address */
- psz_bind_addr = psz_parser;
-
- while( *psz_parser && *psz_parser != ':' )
- {
- if( *psz_parser == '[' )
- {
- /* IPv6 address */
- while( *psz_parser && *psz_parser != ']' )
- {
- psz_parser++;
- }
- }
- psz_parser++;
- }
+ *psz_parser++ = '\0';
+ i_server_port = atoi( psz_parser );
}
+ }
- if( *psz_parser == ':' )
- {
- /* Found bind port */
- *psz_parser = '\0'; /* Terminate bind address if necessary */
- psz_parser++;
+ msg_Dbg( p_access, "opening server=%s:%d local=%s:%d",
+ psz_server_addr, i_server_port, psz_bind_addr, i_bind_port );
- psz_bind_port = psz_parser;
- }
+ /* 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));
+
+ 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;
+
+ 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 )
+ {
+ msg_Err( p_access, "cannot open socket" );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+
+ shutdown( p_sys->fd, SHUT_WR );
+
+ net_SetCSCov (p_sys->fd, -1, 12);
- /* Convert ports format */
- if( *psz_server_port )
+ if (p_sys->b_framed_rtp)
{
- i_server_port = strtol( psz_server_port, &psz_parser, 10 );
- if( *psz_parser )
- {
- msg_Err( p_input, "cannot parse server port near %s", psz_parser );
- free(psz_name);
- return( -1 );
- }
+ /* We don't do autodetection and prebuffering in case of framing */
+ p_access->pf_block = BlockRTP;
}
- if( *psz_bind_port )
+ /* Update default_pts to a suitable value for udp access */
+ var_Create( p_access, "udp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+
+ /* 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;
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Close: free unused data structures
+ *****************************************************************************/
+static void Close( vlc_object_t *p_this )
+{
+ access_t *p_access = (access_t*)p_this;
+ access_sys_t *p_sys = p_access->p_sys;
+
+ block_ChainRelease( p_sys->p_list );
+ net_Close( p_sys->fd );
+ free( p_sys );
+}
+
+/*****************************************************************************
+ * Control:
+ *****************************************************************************/
+static int Control( access_t *p_access, int i_query, va_list args )
+{
+ vlc_bool_t *pb_bool;
+ int *pi_int;
+ int64_t *pi_64;
+
+ switch( i_query )
{
- i_bind_port = strtol( psz_bind_port, &psz_parser, 10 );
- if( *psz_parser )
- {
- msg_Err( p_input, "cannot parse bind port near %s", psz_parser );
- free(psz_name);
- return( -1 );
- }
+ /* */
+ case ACCESS_CAN_SEEK:
+ 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;
+ break;
+ /* */
+ case ACCESS_GET_MTU:
+ pi_int = (int*)va_arg( args, int * );
+ *pi_int = MTU;
+ break;
+
+ case ACCESS_GET_PTS_DELAY:
+ pi_64 = (int64_t*)va_arg( args, int64_t * );
+ *pi_64 = var_GetInteger( p_access, "udp-caching" ) * 1000;
+ break;
+
+ /* */
+ case ACCESS_SET_PAUSE_STATE:
+ case ACCESS_GET_TITLE_INFO:
+ case ACCESS_SET_TITLE:
+ case ACCESS_SET_SEEKPOINT:
+ case ACCESS_SET_PRIVATE_ID_STATE:
+ return VLC_EGENERIC;
+
+ default:
+ msg_Warn( p_access, "unimplemented query in control" );
+ return VLC_EGENERIC;
+
}
+ return VLC_SUCCESS;
+}
- if( i_bind_port == 0 )
+/*****************************************************************************
+ * BlockUDP:
+ *****************************************************************************/
+static block_t *BlockUDP( access_t *p_access )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ block_t *p_block;
+
+ /* 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 )
{
- i_bind_port = config_GetInt( p_this, "server-port" );
+ block_Release( p_block );
+ return NULL;
}
- p_input->pf_read = RTPChoose;
- p_input->pf_set_program = input_SetProgram;
- p_input->pf_set_area = NULL;
- p_input->pf_seek = NULL;
+ 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;
- vlc_mutex_lock( &p_input->stream.stream_lock );
- p_input->stream.b_pace_control = 0;
- p_input->stream.b_seekable = 0;
- p_input->stream.b_connected = 0;
- p_input->stream.p_selected_area->i_tell = 0;
- p_input->stream.i_method = INPUT_METHOD_NETWORK;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ if( p_access->info.b_eof )
+ return NULL;
- if( *psz_server_addr || i_server_port )
+ if( p_block == NULL )
{
- msg_Err( p_input, "this UDP syntax is deprecated; the server argument will be");
- msg_Err( p_input, "ignored (%s:%d). If you wanted to enter a multicast address",
- psz_server_addr, i_server_port);
- msg_Err( p_input, "or local port, type : %s:@%s:%d",
- *p_input->psz_access ? p_input->psz_access : "udp",
- psz_server_addr, i_server_port );
-
- i_server_port = 0;
- psz_server_addr = "";
+ /* 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;
}
-
- msg_Dbg( p_input, "opening server=%s:%d local=%s:%d",
- psz_server_addr, i_server_port, psz_bind_addr, i_bind_port );
- /* Prepare the network_socket_t structure */
- socket_desc.i_type = NETWORK_UDP;
- socket_desc.psz_bind_addr = psz_bind_addr;
- socket_desc.i_bind_port = i_bind_port;
- socket_desc.psz_server_addr = psz_server_addr;
- socket_desc.i_server_port = i_server_port;
-
- /* Find an appropriate network module */
- p_input->p_private = (void*) &socket_desc;
- p_network = module_Need( p_input, "network", psz_network );
- free(psz_name);
- if( p_network == NULL )
+ /* Read RTP framing */
+ if (p_block->i_buffer < 2)
{
- return( -1 );
+ /* 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;
}
- module_Unneed( p_input, p_network );
-
- p_access_data = malloc( sizeof(input_socket_t) );
- p_input->p_access_data = (access_sys_t *)p_access_data;
- if( p_access_data == NULL )
+ uint16_t framelen = GetWLE( p_block->p_buffer );
+ /* Read RTP frame */
+ if( framelen > 0 )
{
- msg_Err( p_input, "out of memory" );
- return( -1 );
+ 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;
}
- p_access_data->i_handle = socket_desc.i_handle;
- p_input->i_mtu = socket_desc.i_mtu;
+ if( p_block->i_buffer < (2 + framelen) )
+ return NULL; // incomplete frame
- /* Update default_pts to a suitable value for udp access */
- p_input->i_pts_delay = config_GetInt( p_input, "udp-caching" ) * 1000;
+ /* Hide framing from RTP layer */
+ p_block->p_buffer += 2;
+ p_block->i_buffer -= 2;
+ p_sys->p_partial_frame = NULL;
+ return p_block;
- return( 0 );
+error:
+ p_access->info.b_eof = VLC_TRUE;
+ block_Release( p_block );
+ p_sys->p_partial_frame = NULL;
+ return NULL;
}
-/*****************************************************************************
- * Close: free unused data structures
- *****************************************************************************/
-static void Close( vlc_object_t *p_this )
+
+/*
+ * 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 )
{
- input_thread_t * p_input = (input_thread_t *)p_this;
- input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data;
+ access_sys_t *p_sys = (access_sys_t *) p_access->p_sys;
+ 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( !p_sys->p_list )
+ {
+ 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 */
- msg_Info( p_input, "closing UDP target `%s'", p_input->psz_source );
+ for( ;; )
+ {
+ i_tmp = i_new - (uint16_t) p->i_dts;
-#ifdef UNDER_CE
- CloseHandle( (HANDLE)p_access_data->i_handle );
-#elif defined( WIN32 )
- closesocket( p_access_data->i_handle );
-#else
- close( p_access_data->i_handle );
-#endif
+ if( !i_tmp ) /* trash duplicate */
+ break;
- free( p_access_data );
+ 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)
+ {
+ 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
+ {
+ p_sys->p_end = p_block;
+ }
+ 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;
+ }
+ p_prev = p;
+ p = p->p_prev;
+ }
+ block_Release( p_block );
+ return VLC_FALSE;
}
/*****************************************************************************
- * Read: read on a file descriptor, checking b_die periodically
+ * BlockParseRTP/BlockRTP:
*****************************************************************************/
-static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
+static block_t *BlockParseRTP( access_t *p_access, block_t *p_block )
{
-#ifdef UNDER_CE
- return -1;
-
-#else
- input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data;
- struct timeval timeout;
- fd_set fds;
- int i_ret;
-
- /* Initialize file descriptor set */
- FD_ZERO( &fds );
- FD_SET( p_access_data->i_handle, &fds );
+ int i_payload_type;
+ size_t i_skip = RTP_HEADER_LEN;
- /* We'll wait 0.5 second if nothing happens */
- timeout.tv_sec = 0;
- timeout.tv_usec = 500000;
+ if( p_block == NULL )
+ return NULL;
- /* Find if some data is available */
- i_ret = select( p_access_data->i_handle + 1, &fds,
- NULL, NULL, &timeout );
+ if( p_block->i_buffer < RTP_HEADER_LEN )
+ {
+ msg_Dbg( p_access, "short RTP packet received" );
+ goto trash;
+ }
- if( i_ret == -1 && errno != EINTR )
+ /* Parse the header and make some verifications.
+ * See RFC 3550. */
+ // Version number:
+ if( ( p_block->p_buffer[0] >> 6 ) != 2)
{
- msg_Err( p_input, "network select error (%s)", strerror(errno) );
+ msg_Dbg( p_access, "RTP version is %u instead of 2",
+ p_block->p_buffer[0] >> 6 );
+ goto trash;
}
- else if( i_ret > 0 )
+ // 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 */
{
- ssize_t i_recv = recv( p_access_data->i_handle, p_buffer, i_len, 0 );
+ i_skip += 4;
+ if ((size_t)p_block->i_buffer < i_skip)
+ goto trash;
- if( i_recv < 0 )
- {
-#ifdef WIN32
- /* On win32 recv() will fail if the datagram doesn't fit inside
- * the passed buffer, even though the buffer will be filled with
- * the first part of the datagram. */
- if( WSAGetLastError() == WSAEMSGSIZE )
+ i_skip += 4 * GetWBE( p_block->p_buffer + i_skip - 2 );
+ }
+
+ i_payload_type = p_block->p_buffer[1] & 0x7F;
+
+ /* 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 )
{
- msg_Err( p_input, "recv() failed. "
- "Increase the mtu size (--mtu option)" );
- i_recv = i_len;
+ /* MPEG2 Video extension header */
+ /* TODO: shouldn't we skip this too ? */
}
- else
-#endif
- msg_Err( p_input, "recv failed (%s)", strerror(errno) );
- }
+ break;
+
+ case 33: // MP2: MPEG TS (RFC2250, §2)
+ /* plain TS over RTP */
+ break;
- return i_recv;
+ default:
+ msg_Dbg( p_access, "unsupported RTP payload type: %u", i_payload_type );
+ goto trash;
}
- return 0;
+ 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)
+ {
+ msg_Warn( p_access, "Emulating packet drop" );
+ block_Release( p_block );
+ return NULL;
+ }
#endif
+
+ return p_block;
+
+trash:
+ block_Release( p_block );
+ return NULL;
}
-/*****************************************************************************
- * RTPRead : read from the network, and parse the RTP header
- *****************************************************************************/
-static ssize_t RTPRead( input_thread_t * p_input, byte_t * p_buffer,
- size_t i_len )
+static block_t *BlockPrebufferRTP( access_t *p_access, block_t *p_block )
{
- int i_rtp_version;
- int i_CSRC_count;
- int i_payload_type;
+ access_sys_t *p_sys = p_access->p_sys;
+ mtime_t i_first = mdate();
+ int i_count = 0;
+ block_t *p = p_block;
- byte_t * p_tmp_buffer = alloca( p_input->i_mtu );
+ for( ;; )
+ {
+ mtime_t i_date = mdate();
- /* Get the raw data from the socket.
- * We first assume that RTP header size is the classic RTP_HEADER_LEN. */
- ssize_t i_ret = Read( p_input, p_tmp_buffer, p_input->i_mtu );
+ if( p && rtp_ChainInsert( p_access, p ))
+ i_count++;
- if ( !i_ret ) return 0;
+ /* Require at least 2 packets in the buffer */
+ if( i_count > 2 && (i_date - i_first) > p_sys->i_rtp_late )
+ break;
- /* Parse the header and make some verifications.
- * See RFC 1889 & RFC 2250. */
+ 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;
+ }
+ }
- i_rtp_version = ( p_tmp_buffer[0] & 0xC0 ) >> 6;
- i_CSRC_count = ( p_tmp_buffer[0] & 0x0F );
- i_payload_type = ( p_tmp_buffer[1] & 0x7F );
+ 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;
+}
- if ( i_rtp_version != 2 )
- msg_Dbg( p_input, "RTP version is %u, should be 2", i_rtp_version );
+static block_t *BlockRTP( access_t *p_access )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ block_t *p;
- if ( i_payload_type != 33 && i_payload_type != 14
- && i_payload_type != 32 )
- msg_Dbg( p_input, "unsupported RTP payload type (%u)", i_payload_type );
+ 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;
- /* Return the packet without the RTP header. */
- i_ret -= ( RTP_HEADER_LEN + 4 * i_CSRC_count );
+ rtp_ChainInsert( p_access, p );
+ }
- if ( (size_t)i_ret > i_len )
+ 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 )
{
- /* This should NOT happen. */
- msg_Warn( p_input, "RTP input trashing %d bytes", i_ret - i_len );
- i_ret = i_len;
+ 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_input->p_vlc->pf_memcpy( p_buffer,
- p_tmp_buffer + RTP_HEADER_LEN + 4 * i_CSRC_count,
- i_ret );
-
- return i_ret;
+ p->p_next = NULL;
+ return p;
}
/*****************************************************************************
- * RTPChoose : read from the network, and decide whether it's UDP or RTP
+ * BlockChoose: decide between RTP and UDP
*****************************************************************************/
-static ssize_t RTPChoose( input_thread_t * p_input, byte_t * p_buffer,
- size_t i_len )
+static block_t *BlockChoose( access_t *p_access )
{
- int i_rtp_version;
- int i_CSRC_count;
- int i_payload_type;
-
- byte_t * p_tmp_buffer = alloca( p_input->i_mtu );
+ block_t *p_block;
+ int i_rtp_version;
+ int i_payload_type;
- /* Get the raw data from the socket.
- * We first assume that RTP header size is the classic RTP_HEADER_LEN. */
- ssize_t i_ret = Read( p_input, p_tmp_buffer, p_input->i_mtu );
+ if( ( p_block = BlockUDP( p_access ) ) == NULL )
+ return NULL;
- if ( !i_ret ) return 0;
-
- /* Check that it's not TS. */
- if ( p_tmp_buffer[0] == 0x47 )
+ if( p_block->p_buffer[0] == 0x47 )
{
- msg_Dbg( p_input, "detected TS over raw UDP" );
- p_input->pf_read = Read;
- p_input->p_vlc->pf_memcpy( p_buffer, p_tmp_buffer, i_ret );
- return i_ret;
+ msg_Dbg( p_access, "detected TS over raw UDP" );
+ p_access->pf_block = BlockUDP;
+ p_access->info.b_prebuffered = VLC_TRUE;
+ return p_block;
}
+ if( p_block->i_buffer < RTP_HEADER_LEN )
+ return p_block;
+
/* Parse the header and make some verifications.
- * See RFC 1889 & RFC 2250. */
+ * See RFC 3550. */
- i_rtp_version = ( p_tmp_buffer[0] & 0xC0 ) >> 6;
- i_CSRC_count = ( p_tmp_buffer[0] & 0x0F );
- i_payload_type = ( p_tmp_buffer[1] & 0x7F );
+ i_rtp_version = p_block->p_buffer[0] >> 6;
+ i_payload_type = ( p_block->p_buffer[1] & 0x7F );
- if ( i_rtp_version != 2 )
+ if( i_rtp_version != 2 )
{
- msg_Dbg( p_input, "no RTP header detected" );
- p_input->pf_read = Read;
- p_input->p_vlc->pf_memcpy( p_buffer, p_tmp_buffer, i_ret );
- return i_ret;
+ 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 )
+ switch( i_payload_type )
{
- case 33:
- msg_Dbg( p_input, "detected TS over RTP" );
- break;
-
- case 14:
- msg_Dbg( p_input, "detected MPEG audio over RTP" );
- break;
-
- case 32:
- msg_Dbg( p_input, "detected MPEG video over RTP" );
- break;
-
- default:
- msg_Dbg( p_input, "no RTP header detected" );
- p_input->pf_read = Read;
- p_input->p_vlc->pf_memcpy( p_buffer, p_tmp_buffer, i_ret );
- return i_ret;
+ case 33:
+ 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" );
+ p_access->psz_demux = strdup( "mpga" );
+ break;
+
+ case 32:
+ 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;
}
- /* Return the packet without the RTP header. */
- p_input->pf_read = RTPRead;
- i_ret -= ( RTP_HEADER_LEN + 4 * i_CSRC_count );
-
- if ( (size_t)i_ret > i_len )
- {
- /* This should NOT happen. */
- msg_Warn( p_input, "RTP input trashing %d bytes", i_ret - i_len );
- i_ret = i_len;
- }
+ if( !BlockParseRTP( p_access, p_block )) return NULL;
- p_input->p_vlc->pf_memcpy( p_buffer,
- p_tmp_buffer + RTP_HEADER_LEN + 4 * i_CSRC_count,
- i_ret );
+ p_access->pf_block = BlockRTP;
- return i_ret;
+ return BlockPrebufferRTP( p_access, p_block );
}