X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fudp.c;h=5a46d2a84569f90bc0455c8da0488f6bcba51312;hb=688f0a8d8913f20ac5d3e27bf4f2bbe35c9f5de7;hp=e9c23edef3478fda5557e7681347ec8537d92a91;hpb=8546371b488f862b0e216a0b326957a5708f0124;p=vlc diff --git a/modules/access/udp.c b/modules/access/udp.c index e9c23edef3..5a46d2a845 100644 --- a/modules/access/udp.c +++ b/modules/access/udp.c @@ -1,15 +1,17 @@ /***************************************************************************** - * udp.c: raw UDP & RTP input module + * udp.c: raw UDP input module ***************************************************************************** - * Copyright (C) 2001-2004 the VideoLAN team + * Copyright (C) 2001-2005 the VideoLAN team + * Copyright (C) 2007 Remi Denis-Courmont * $Id$ * * Authors: Christophe Massiot * Tristan Leteurtre * Laurent Aimar * Jean-Paul Saman + * Remi Denis-Courmont * - * Reviewed: 23 October 2003, Jean-Paul Saman + * Reviewed: 23 October 2003, Jean-Paul Saman * * 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 @@ -23,53 +25,52 @@ * * 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 -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "network.h" +#include +#include +#include +#include + +#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." ) static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); vlc_module_begin(); - set_shortname( _("UDP/RTP" ) ); - set_description( _("UDP/RTP input") ); + set_shortname( N_("UDP" ) ); + set_description( N_("UDP 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_bool( "udp-auto-mtu", 1, NULL, - AUTO_MTU_TEXT, AUTO_MTU_LONGTEXT, VLC_TRUE ); + CACHING_LONGTEXT, true ); + add_obsolete_integer( "rtp-late" ); + 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( "udp6" ); - add_shortcut( "rtp" ); - add_shortcut( "rtp4" ); - add_shortcut( "rtp6" ); + set_callbacks( Open, Close ); vlc_module_end(); @@ -79,58 +80,38 @@ vlc_module_end(); #define RTP_HEADER_LEN 12 static block_t *BlockUDP( 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; - - int i_mtu; - vlc_bool_t b_auto_mtu; - - /* rtp only */ - int i_sequence_number; -}; - /***************************************************************************** * Open: open the socket *****************************************************************************/ static int Open( vlc_object_t *p_this ) { access_t *p_access = (access_t*)p_this; - 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; + int fd; - /* 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 ); + /* Set up p_access */ + access_InitFields( p_access ); + ACCESS_SET_CALLBACKS( NULL, BlockUDP, Control, NULL ); + p_access->info.b_prebuffered = false; - if( *p_access->psz_access ) + if (strlen (p_access->psz_access) > 0) { - 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 )) + switch (p_access->psz_access[strlen (p_access->psz_access) - 1]) { - val.b_bool = VLC_TRUE; - var_Set( p_access, "ipv4", val ); + case '4': + fam = AF_INET; + break; - 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 ) ) - { - val.b_bool = VLC_TRUE; - var_Set( p_access, "ipv6", val ); - - val.b_bool = VLC_FALSE; - var_Set( p_access, "ipv4", val ); + case '6': + fam = AF_INET6; + break; } } @@ -145,7 +126,7 @@ static int Open( vlc_object_t *p_this ) *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, ']' ); @@ -161,9 +142,9 @@ static int Open( vlc_object_t *p_this ) } 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 ) { @@ -178,54 +159,18 @@ static int Open( vlc_object_t *p_this ) 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 */ - 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 - { - p_access->pf_block = BlockChoose; - } - 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 ) + fd = net_OpenDgram( p_access, psz_bind_addr, i_bind_port, + psz_server_addr, i_server_port, fam, IPPROTO_UDP ); + free (psz_name); + if( 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 ); - - /* 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" );; + p_access->p_sys = (void *)(intptr_t)fd; /* 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 = -1; - return VLC_SUCCESS; } @@ -235,10 +180,8 @@ static int Open( vlc_object_t *p_this ) 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; - net_Close( p_sys->fd ); - free( p_sys ); + net_Close( (intptr_t)p_access->p_sys ); } /***************************************************************************** @@ -246,8 +189,7 @@ static void Close( vlc_object_t *p_this ) *****************************************************************************/ 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; + bool *pb_bool; int *pi_int; int64_t *pi_64; @@ -258,13 +200,13 @@ static int Control( access_t *p_access, int i_query, va_list args ) 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: pi_int = (int*)va_arg( args, int * ); - *pi_int = p_sys->i_mtu; + *pi_int = MTU; break; case ACCESS_GET_PTS_DELAY: @@ -278,6 +220,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_SET_TITLE: case ACCESS_SET_SEEKPOINT: case ACCESS_SET_PRIVATE_ID_STATE: + case ACCESS_GET_CONTENT_TYPE: return VLC_EGENERIC; default: @@ -295,176 +238,20 @@ static block_t *BlockUDP( access_t *p_access ) { access_sys_t *p_sys = p_access->p_sys; block_t *p_block; + ssize_t len; - /* Read data */ - p_block = block_New( p_access, p_sys->i_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 ) - { - 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; -} - -/***************************************************************************** - * BlockParseRTP/BlockRTP: - *****************************************************************************/ -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_sequence_number = 0; - int i_extention_flag; - int i_extention_length = 0; - - if( p_block == NULL ) + if( p_access->info.b_eof ) return NULL; - if( p_block->i_buffer < RTP_HEADER_LEN ) - goto trash; - - /* Parse the header and make some verifications. - * See RFC 1889 & RFC 2250. */ - i_rtp_version = ( p_block->p_buffer[0] & 0xC0 ) >> 6; - i_CSRC_count = p_block->p_buffer[0] & 0x0F; - i_extention_flag = p_block->p_buffer[0] & 0x10; - 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 ); - - 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 ); - if( i_extention_flag ) - i_extention_length = 4 + - 4 * ( (p_block->p_buffer[14] << 8) + p_block->p_buffer[15] ); - - /* Skip header + CSRC extension field n*(32 bits) + extention */ - i_skip += RTP_HEADER_LEN + 4*i_CSRC_count + i_extention_length; - - if( i_skip >= p_block->i_buffer ) - goto trash; - - /* Return the packet without the RTP header. */ - p_block->i_buffer -= i_skip; - p_block->p_buffer += i_skip; - -#define RTP_SEQ_NUM_SIZE 65536 - /* Detect RTP packet loss through tracking sequence numbers. - * See RFC 1889. */ - if( p_access->p_sys->i_sequence_number == -1 ) - p_access->p_sys->i_sequence_number = i_sequence_number; - - if( ((p_access->p_sys->i_sequence_number + 1) % RTP_SEQ_NUM_SIZE) != i_sequence_number ) + /* Read data */ + p_block = block_New( p_access, MTU ); + len = net_Read( p_access, (intptr_t)p_sys, NULL, + p_block->p_buffer, MTU, false ); + if( len < 0 ) { - msg_Warn( p_access, "RTP packet(s) lost, expected sequence number %d got %d", - ((p_access->p_sys->i_sequence_number + 1) % RTP_SEQ_NUM_SIZE), - i_sequence_number ); - if( i_payload_type == 33 ) - { - /* Mark transport error in the first TS packet in the RTP stream. */ - p_block->p_buffer[1] |= 0x80; - } - } - p_access->p_sys->i_sequence_number = i_sequence_number; -#undef RTP_SEQ_NUM_SIZE - return p_block; - -trash: - msg_Warn( p_access, "received a too short packet for RTP" ); - block_Release( p_block ); - return NULL; -} - -static block_t *BlockRTP( access_t *p_access ) -{ - block_t *p_block = BlockUDP( p_access ); - - if ( p_block != NULL ) - return BlockParseRTP( p_access, p_block ); - else - return NULL; -} - -/***************************************************************************** - * BlockChoose: decide between RTP and UDP - *****************************************************************************/ -static block_t *BlockChoose( access_t *p_access ) -{ - block_t *p_block; - int i_rtp_version; - int i_CSRC_count; - int i_payload_type; - - if( ( p_block = BlockUDP( p_access ) ) == NULL ) + block_Release( p_block ); return NULL; - - if( p_block->p_buffer[0] == 0x47 ) - { - msg_Dbg( p_access, "detected TS over raw UDP" ); - p_access->pf_block = BlockUDP; - 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. */ - - 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 ); - - if( i_rtp_version != 2 ) - { - msg_Dbg( p_access, "no supported RTP header detected" ); - p_access->pf_block = BlockUDP; - return p_block; - } - - switch( i_payload_type ) - { - case 33: - msg_Dbg( p_access, "detected TS over RTP" ); - /* Disabled because it is auto-detected. */ - /* 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; - return p_block; } - p_access->pf_block = BlockRTP; - - return BlockParseRTP( p_access, p_block ); + return block_Realloc( p_block, 0, p_block->i_buffer = len ); }