X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Frtp.c;h=dee1aeca83cbfebd596b531bcbbd279c7ab05f05;hb=f6ead8f791204507f33fc20c02b24ff3d2a3dd0f;hp=108b7d67d53a4c62b39fcdb99a29da77fde33b14;hpb=5adfe5b919b91cd875b51f1ab7fa033d335fea03;p=vlc diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index 108b7d67d5..dee1aeca83 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -1,7 +1,7 @@ /***************************************************************************** * rtp.c: rtp stream output module ***************************************************************************** - * Copyright (C) 2003-2004 VideoLAN + * Copyright (C) 2003-2004 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,65 +18,86 @@ * * 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 "config.h" +#include #include +#ifdef HAVE_UNISTD_H +# include +#endif #include #include -#include -#include +#include +#include -#include "vlc_httpd.h" -#include "network.h" +#include +#include +#include +#include /***************************************************************************** * Module descriptor *****************************************************************************/ + +#define MTU_REDUCE 50 + #define DST_TEXT N_("Destination") #define DST_LONGTEXT N_( \ - "Allows you to specify the output URL used for the streaming output." ) + "This is the output URL that will be used." ) #define SDP_TEXT N_("SDP") #define SDP_LONGTEXT N_( \ - "Allows you to specify the SDP used for the streaming output. " \ - "You must use an url: http://location to access the SDP via HTTP, " \ - "rtsp://location for RTSP access, and sap:// for the SDP to be " \ - "announced via SAP." ) + "This allows you to specify how the SDP (Session Descriptor) for this RTP "\ + "session will be made available. You must use an url: http://location to " \ + "access the SDP via HTTP, rtsp://location for RTSP access, and sap:// " \ + "for the SDP to be announced via SAP." ) #define MUX_TEXT N_("Muxer") #define MUX_LONGTEXT N_( \ - "Allows you to specify the muxer used for the streaming output." ) + "This allows you to specify the muxer used for the streaming output. " \ + "Default is to use no muxer (standard RTP stream)." ) #define NAME_TEXT N_("Session name") #define NAME_LONGTEXT N_( \ - "Allows you to specify the session name used for the streaming output." ) + "This is the name of the session that will be announced in the SDP " \ + "(Session Descriptor)." ) #define DESC_TEXT N_("Session description") #define DESC_LONGTEXT N_( \ - "Allows you to give a broader description of the stream." ) + "This allows you to give a broader description of the stream, that will " \ + "be announced in the SDP (Session Descriptor)." ) #define URL_TEXT N_("Session URL") #define URL_LONGTEXT N_( \ - "Allows you to specify a URL with additional information on the stream." ) + "This allows you to give an URL with more details about the stream " \ + "(often the website of the streaming organization), that will " \ + "be announced in the SDP (Session Descriptor)." ) #define EMAIL_TEXT N_("Session email") #define EMAIL_LONGTEXT N_( \ - "Allows you to specify contact e-mail address for this session." ) - + "This allows you to give a contact mail address for the stream, that will " \ + "be announced in the SDP (Session Descriptor)." ) #define PORT_TEXT N_("Port") #define PORT_LONGTEXT N_( \ - "Allows you to specify the base port used for the RTP streaming." ) + "This allows you to specify the base port for the RTP streaming." ) #define PORT_AUDIO_TEXT N_("Audio port") #define PORT_AUDIO_LONGTEXT N_( \ - "Allows you to specify the default audio port used for the RTP streaming." ) + "This allows you to specify the default audio port for the RTP streaming." ) #define PORT_VIDEO_TEXT N_("Video port") #define PORT_VIDEO_LONGTEXT N_( \ - "Allows you to specify the default video port used for the RTP streaming." ) + "This allows you to specify the default video port for the RTP streaming." ) -#define TTL_TEXT N_("Time to live") +#define TTL_TEXT N_("Hop limit (TTL)") #define TTL_LONGTEXT N_( \ - "Allows you to specify the time to live for the output stream." ) + "This is the hop limit (also known as \"Time-To-Live\" or TTL) of " \ + "the multicast packets sent by the stream output (0 = use operating " \ + "system built-in default).") + +#define RFC3016_TEXT N_("MP4A LATM") +#define RFC3016_LONGTEXT N_( \ + "This allows you to stream MPEG4 LATM audio streams (see RFC3016)." ) static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); @@ -84,9 +105,12 @@ static void Close( vlc_object_t * ); #define SOUT_CFG_PREFIX "sout-rtp-" vlc_module_begin(); + set_shortname( _("RTP")); set_description( _("RTP stream output") ); set_capability( "sout stream", 0 ); add_shortcut( "rtp" ); + set_category( CAT_SOUT ); + set_subcategory( SUBCAT_SOUT_STREAM ); add_string( SOUT_CFG_PREFIX "dst", "", NULL, DST_TEXT, DST_LONGTEXT, VLC_TRUE ); @@ -104,16 +128,19 @@ vlc_module_begin(); add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT, EMAIL_LONGTEXT, VLC_TRUE ); - add_integer( SOUT_CFG_PREFIX "port-audio", 1234, NULL, PORT_AUDIO_TEXT, - PORT_LONGTEXT, VLC_TRUE ); - add_integer( SOUT_CFG_PREFIX "port-video", 1236, NULL, PORT_VIDEO_TEXT, - PORT_LONGTEXT, VLC_TRUE ); - add_integer( SOUT_CFG_PREFIX "port", 1238, NULL, PORT_TEXT, + add_integer( SOUT_CFG_PREFIX "port", 1234, NULL, PORT_TEXT, PORT_LONGTEXT, VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "port-audio", 1230, NULL, PORT_AUDIO_TEXT, + PORT_AUDIO_LONGTEXT, VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "port-video", 1232, NULL, PORT_VIDEO_TEXT, + PORT_VIDEO_LONGTEXT, VLC_TRUE ); add_integer( SOUT_CFG_PREFIX "ttl", 0, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_TRUE ); + add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT, + RFC3016_LONGTEXT, VLC_FALSE ); + set_callbacks( Open, Close ); vlc_module_end(); @@ -122,7 +149,7 @@ vlc_module_end(); *****************************************************************************/ static const char *ppsz_sout_options[] = { "dst", "name", "port", "port-audio", "port-video", "*sdp", "ttl", "mux", - "description", "url","email", NULL + "description", "url","email", "mp4a-latm", NULL }; static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * ); @@ -180,6 +207,7 @@ struct sout_stream_sys_t int i_port_audio; int i_port_video; int i_ttl; + vlc_bool_t b_latm; /* when need to use a private one or when using muxer */ int i_payload_type; @@ -223,6 +251,7 @@ struct sout_stream_id_t char *psz_destination; int i_port; int i_cat; + int i_bitrate; /* Packetizer specific fields */ pf_rtp_packetizer_t pf_packetize; @@ -257,8 +286,8 @@ static int RtspCallbackId( httpd_callback_sys_t *, httpd_client_t *, httpd_message_t *, httpd_message_t * ); -static rtsp_client_t *RtspClientNew( sout_stream_t *, char *psz_session ); -static rtsp_client_t *RtspClientGet( sout_stream_t *, char *psz_session ); +static rtsp_client_t *RtspClientNew( sout_stream_t *, const char *psz_session ); +static rtsp_client_t *RtspClientGet( sout_stream_t *, const char *psz_session ); static void RtspClientDel( sout_stream_t *, rtsp_client_t * ); /***************************************************************************** @@ -268,10 +297,13 @@ static int Open( vlc_object_t *p_this ) { sout_stream_t *p_stream = (sout_stream_t*)p_this; sout_instance_t *p_sout = p_stream->p_sout; - sout_stream_sys_t *p_sys; + sout_stream_sys_t *p_sys = NULL; + config_chain_t *p_cfg = NULL; vlc_value_t val; + vlc_bool_t b_rtsp = VLC_FALSE; - sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, p_stream->p_cfg ); + config_ChainParse( p_stream, SOUT_CFG_PREFIX, + ppsz_sout_options, p_stream->p_cfg ); p_sys = malloc( sizeof( sout_stream_sys_t ) ); @@ -308,32 +340,29 @@ static int Open( vlc_object_t *p_this ) p_sys->psz_session_name = strdup( "NONE" ); } - if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' ) + for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next ) { - sout_cfg_t *p_cfg; - vlc_bool_t b_ok = VLC_FALSE; - - for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next ) + if( !strcmp( p_cfg->psz_name, "sdp" ) ) { - if( !strcmp( p_cfg->psz_name, "sdp" ) ) + if( p_cfg->psz_value && !strncasecmp( p_cfg->psz_value, "rtsp", 4 ) ) { - if( p_cfg->psz_value && !strncasecmp( p_cfg->psz_value, "rtsp", 4 ) ) - { - b_ok = VLC_TRUE; - break; - } + b_rtsp = VLC_TRUE; + break; } } - if( !b_ok ) - { - vlc_value_t val2; - var_Get( p_stream, SOUT_CFG_PREFIX "sdp", &val2 ); - if( !strncasecmp( val2.psz_string, "rtsp", 4 ) ) - b_ok = VLC_TRUE; - free( val2.psz_string ); - } + } + if( !b_rtsp ) + { + vlc_value_t val2; + var_Get( p_stream, SOUT_CFG_PREFIX "sdp", &val2 ); + if( !strncasecmp( val2.psz_string, "rtsp", 4 ) ) + b_rtsp = VLC_TRUE; + free( val2.psz_string ); + } - if( !b_ok ) + if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' ) + { + if( !b_rtsp ) { msg_Err( p_stream, "missing destination and not in rtsp mode" ); free( p_sys ); @@ -349,8 +378,24 @@ static int Open( vlc_object_t *p_this ) } var_Get( p_stream, SOUT_CFG_PREFIX "ttl", &val ); + if( val.i_int == 0 ) + { + /* Normally, we should let the default hop limit up to the core, + * but we have to know it to build our SDP properly, which is why + * we ask the core. FIXME: broken when neither sout-rtp-ttl nor + * ttl are set. */ + val.i_int = config_GetInt( p_stream, "ttl" ); + } + if( val.i_int > 255 ) val.i_int = 255; + /* must not exceed 999 once formatted */ + + if( val.i_int < 0 ) + msg_Warn( p_stream, "illegal TTL %d, the SDP advertised value will be faked", val.i_int ); p_sys->i_ttl = val.i_int; + var_Get( p_stream, SOUT_CFG_PREFIX "mp4a-latm", &val ); + p_sys->b_latm = val.b_bool; + p_sys->i_payload_type = 96; p_sys->i_es = 0; p_sys->es = NULL; @@ -386,10 +431,21 @@ static int Open( vlc_object_t *p_this ) if( *val.psz_string ) { sout_access_out_t *p_grab; + const char *psz_rtpmap; + char url[NI_MAXHOST + 8], access[17], psz_ttl[5], ipv; - char *psz_rtpmap; - char access[100]; - char url[p_sys->psz_destination ? strlen( p_sys->psz_destination ) + 1 + 12+1 : 14]; + if( b_rtsp ) + { + msg_Err( p_stream, "muxing is not supported in RTSP mode" ); + free( p_sys ); + return VLC_EGENERIC; + } + else if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' ) + { + msg_Err( p_stream, "rtp needs a destination when muxing" ); + free( p_sys ); + return VLC_EGENERIC; + } /* Check muxer type */ if( !strncasecmp( val.psz_string, "ps", 2 ) || !strncasecmp( val.psz_string, "mpeg1", 5 ) ) @@ -404,6 +460,7 @@ static int Open( vlc_object_t *p_this ) else { msg_Err( p_stream, "unsupported muxer type with rtp (only ts/ps)" ); + free( p_sys ); return VLC_EGENERIC; } @@ -416,7 +473,20 @@ static int Open( vlc_object_t *p_this ) { sprintf( access, "udp{raw}" ); } - sprintf( url, "%s:%d", p_sys->psz_destination, p_sys->i_port ); + + /* IPv6 needs brackets if not already present */ + snprintf( url, sizeof( url ), + ( ( p_sys->psz_destination[0] != '[' ) + && ( strchr( p_sys->psz_destination, ':' ) != NULL ) ) + ? "[%s]:%d" : "%s:%d", p_sys->psz_destination, + p_sys->i_port ); + url[sizeof( url ) - 1] = '\0'; + /* FIXME: we should check that url is a numerical address, otherwise + * the SDP will be quite broken (regardless of the IP protocol version) + * Also it might be IPv6 with no ':' if it is a DNS name. + */ + ipv = ( strchr( p_sys->psz_destination, ':' ) != NULL ) ? '6' : '4'; + if( !( p_sys->p_access = sout_AccessOutNew( p_sout, access, url ) ) ) { msg_Err( p_stream, "cannot create the access out for %s://%s", @@ -425,11 +495,12 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } p_sys->i_mtu = config_GetInt( p_stream, "mtu" ); /* XXX beurk */ - if( p_sys->i_mtu <= 16 ) + if( p_sys->i_mtu <= 16 + MTU_REDUCE ) { /* better than nothing */ p_sys->i_mtu = 1500; } + p_sys->i_mtu -= MTU_REDUCE; /* the access out grabber TODO export it as sout_AccessOutGrabberNew */ p_grab = p_sys->p_grab = @@ -438,7 +509,7 @@ static int Open( vlc_object_t *p_this ) p_grab->p_sout = p_sout; p_grab->psz_access = strdup( "grab" ); p_grab->p_cfg = NULL; - p_grab->psz_name = strdup( "" ); + p_grab->psz_path = strdup( "" ); p_grab->p_sys = (sout_access_out_sys_t*)p_stream; p_grab->pf_seek = NULL; p_grab->pf_write = AccessOutGrabberWrite; @@ -454,47 +525,48 @@ static int Open( vlc_object_t *p_this ) } /* create the SDP for a muxed stream (only once) */ - /* FIXME http://www.faqs.org/rfcs/rfc2327.html - All text fields should be UTF-8 encoded. Use global a:charset to announce this. + /* FIXME http://www.faqs.org/rfcs/rfc4566.html o= - should be local username (no spaces allowed) - o= time should be hashed with some other value to garantue uniqueness - o= we need IP6 support? + o= time should be hashed with some other value to garantee uniqueness o= don't use the localhost address. use fully qualified domain name or IP4 address - p= international phone number (pass via vars?) - c= IP6 support - c= /ttl should only be added in case of multicast - a= recvonly (missing) - a= type:broadcast (missing) - a= charset: (normally charset should be UTF-8, this can be used to override s= and i=) + a= source-filter: we need our source address a= x-plgroup: (missing) RTP packets need to get the correct src IP address */ - p_sys->psz_sdp = - malloc( 10 + 30 + 10 + strlen( p_sys->psz_session_name ) + - 10 + strlen( p_sys->psz_session_description ) + 10 + strlen( p_sys->psz_session_url ) + - 10 + strlen( p_sys->psz_session_email ) + 10 + strlen( p_sys->psz_destination ) + - 10 + 10 + strlen( PACKAGE_STRING ) + - 20 + 10 + 20 + 10 + strlen( psz_rtpmap ) ); - sprintf( p_sys->psz_sdp, - "v=0\r\n" - "o=- "I64Fd" %d IN IP4 127.0.0.1\r\n" - "s=%s\r\n" - "i=%s\r\n" - "u=%s\r\n" - "e=%s\r\n" - "t=0 0\r\n" /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */ - "a=tool:"PACKAGE_STRING"\r\n" - "c=IN IP4 %s/%d\r\n" - "m=video %d RTP/AVP %d\r\n" - "a=rtpmap:%d %s\r\n", - p_sys->i_sdp_id, p_sys->i_sdp_version, - p_sys->psz_session_name, - p_sys->psz_session_description, - p_sys->psz_session_url, - p_sys->psz_session_email, - p_sys->psz_destination, p_sys->i_ttl, - p_sys->i_port, p_sys->i_payload_type, - p_sys->i_payload_type, psz_rtpmap ); - fprintf( stderr, "sdp=%s", p_sys->psz_sdp ); + if( ipv == 4 && net_AddressIsMulticast( VLC_OBJECT(p_stream), p_sys->psz_destination ) ) + { + snprintf( psz_ttl, sizeof( psz_ttl ), "/%d", p_sys->i_ttl ); + psz_ttl[sizeof( psz_ttl ) - 1] = '\0'; + } + else + { + psz_ttl[0] = '\0'; + } + + asprintf( &p_sys->psz_sdp, + "v=0\r\n" + /* FIXME: source address not known :( */ + "o=- "I64Fd" %d IN IP%c %s\r\n" + "s=%s\r\n" + "i=%s\r\n" + "u=%s\r\n" + "e=%s\r\n" + "c=IN IP%c %s%s\r\n" + "t=0 0\r\n" /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */ + "a=tool:"PACKAGE_STRING"\r\n" + "a=recvonly\r\n" + "a=type:broadcast\r\n" + "m=video %d RTP/AVP %d\r\n" + "a=rtpmap:%d %s\r\n", + p_sys->i_sdp_id, p_sys->i_sdp_version, + ipv, ipv == '6' ? "::1" : "127.0.0.1" /* FIXME */, + p_sys->psz_session_name, + p_sys->psz_session_description, + p_sys->psz_session_url, + p_sys->psz_session_email, + ipv, p_sys->psz_destination, psz_ttl, + p_sys->i_port, p_sys->i_payload_type, + p_sys->i_payload_type, psz_rtpmap ); + msg_Dbg( p_stream, "sdp=%s", p_sys->psz_sdp ); /* create the rtp context */ p_sys->ssrc[0] = rand()&0xff; @@ -517,7 +589,7 @@ static int Open( vlc_object_t *p_this ) var_Get( p_stream, SOUT_CFG_PREFIX "sdp", &val ); if( *val.psz_string ) { - sout_cfg_t *p_cfg; + config_chain_t *p_cfg; SDPHandleUrl( p_stream, val.psz_string ); @@ -563,58 +635,54 @@ static void Close( vlc_object_t * p_this ) { block_Release( p_sys->packet ); } + if( p_sys->b_export_sap ) + { + p_sys->p_mux = NULL; + SapSetup( p_stream ); + } } while( p_sys->i_rtsp > 0 ) - { RtspClientDel( p_stream, p_sys->rtsp[0] ); - } vlc_mutex_destroy( &p_sys->lock_sdp ); if( p_sys->p_httpd_file ) - { httpd_FileDelete( p_sys->p_httpd_file ); - } + if( p_sys->p_httpd_host ) - { httpd_HostDelete( p_sys->p_httpd_host ); - } + if( p_sys->p_rtsp_url ) - { httpd_UrlDelete( p_sys->p_rtsp_url ); - } + if( p_sys->p_rtsp_host ) - { httpd_HostDelete( p_sys->p_rtsp_host ); - } -#if 0 - /* why? is this disabled? */ + if( p_sys->psz_session_name ) - { free( p_sys->psz_session_name ); - p_sys->psz_session_name = NULL; - } + if( p_sys->psz_session_description ) - { free( p_sys->psz_session_description ); - p_sys->psz_session_description = NULL; - } + if( p_sys->psz_session_url ) - { free( p_sys->psz_session_url ); - p_sys->psz_session_url = NULL; - } + if( p_sys->psz_session_email ) - { free( p_sys->psz_session_email ); - p_sys->psz_session_email = NULL; - } -#endif + if( p_sys->psz_sdp ) - { free( p_sys->psz_sdp ); + + if( p_sys->b_export_sdp_file ) + { +#ifdef HAVE_UNISTD_H + unlink( p_sys->psz_sdp_file ); +#endif + free( p_sys->psz_sdp_file ); } + if( p_sys->psz_destination ) + free( p_sys->psz_destination ); free( p_sys ); } @@ -631,7 +699,7 @@ static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url ) { if( p_sys->p_httpd_file ) { - msg_Err( p_stream, "You can used sdp=http:// only once" ); + msg_Err( p_stream, "you can use sdp=http:// only once" ); return; } @@ -644,7 +712,7 @@ static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url ) { if( p_sys->p_rtsp_url ) { - msg_Err( p_stream, "You can used sdp=rtsp:// only once" ); + msg_Err( p_stream, "you can use sdp=rtsp:// only once" ); return; } @@ -664,7 +732,7 @@ static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url ) { if( p_sys->b_export_sdp_file ) { - msg_Err( p_stream, "You can used sdp=file:// only once" ); + msg_Err( p_stream, "you can use sdp=file:// only once" ); return; } p_sys->b_export_sdp_file = VLC_TRUE; @@ -692,34 +760,42 @@ static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url ) o= don't use the localhost address. use fully qualified domain name or IP4 address p= international phone number (pass via vars?) c= IP6 support - c= /ttl should only be added in case of multicast a= recvonly (missing) a= type:broadcast (missing) a= charset: (normally charset should be UTF-8, this can be used to override s= and i=) a= x-plgroup: (missing) RTP packets need to get the correct src IP address */ -static char *SDPGenerate( sout_stream_t *p_stream, char *psz_destination, vlc_bool_t b_rtsp ) +static char *SDPGenerate( const sout_stream_t *p_stream, + const char *psz_destination, vlc_bool_t b_rtsp ) { sout_stream_sys_t *p_sys = p_stream->p_sys; int i_size; - char *psz_sdp, *p; + char *psz_sdp, *p, ipv; int i; - i_size = strlen( "v=0\r\n" ) + - strlen( "o=- * * IN IP4 127.0.0.1\r\n" ) + 10 + 10 + - strlen( "s=*\r\n" ) + strlen( p_sys->psz_session_name ) + - strlen( "i=*\r\n" ) + strlen( p_sys->psz_session_description ) + - strlen( "u=*\r\n" ) + strlen( p_sys->psz_session_url ) + - strlen( "e=*\r\n" ) + strlen( p_sys->psz_session_email ) + - strlen( "t=0 0\r\n" ) + /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */ - strlen( "a=tool:"PACKAGE_STRING"\r\n" ) + - strlen( "c=IN IP4 */*\r\n" ) + 20 + 10 + - strlen( psz_destination ? psz_destination : "0.0.0.0") ; + /* FIXME: breaks IP version check on unknown destination */ + if( psz_destination == NULL ) + psz_destination = "0.0.0.0"; + + i_size = sizeof( "v=0\r\n" ) + + sizeof( "o=- * * IN IP4 127.0.0.1\r\n" ) + 10 + 10 + + sizeof( "s=*\r\n" ) + strlen( p_sys->psz_session_name ) + + sizeof( "i=*\r\n" ) + strlen( p_sys->psz_session_description ) + + sizeof( "u=*\r\n" ) + strlen( p_sys->psz_session_url ) + + sizeof( "e=*\r\n" ) + strlen( p_sys->psz_session_email ) + + sizeof( "t=0 0\r\n" ) + /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */ + sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) + + sizeof( "c=IN IP4 */*\r\n" ) + 20 + 10 + + strlen( psz_destination ) ; for( i = 0; i < p_sys->i_es; i++ ) { sout_stream_id_t *id = p_sys->es[i]; i_size += strlen( "m=**d*o * RTP/AVP *\r\n" ) + 10 + 10; + if ( id->i_bitrate ) + { + i_size += strlen( "b=AS: *\r\n") + 10; + } if( id->psz_rtpmap ) { i_size += strlen( "a=rtpmap:* *\r\n" ) + strlen( id->psz_rtpmap )+10; @@ -730,14 +806,21 @@ static char *SDPGenerate( sout_stream_t *p_stream, char *psz_destination, vlc_bo } if( b_rtsp ) { - i_size += strlen( "a=control:*/trackid=*\r\n" ) + strlen( p_sys->psz_rtsp_control ) + 10; + i_size += strlen( "a=control:*/trackID=*\r\n" ) + strlen( p_sys->psz_rtsp_control ) + 10; } } + if( p_sys->p_mux ) + { + i_size += strlen( "m=video %d RTP/AVP %d\r\n" ) +10 +10; + } + + ipv = ( strchr( psz_destination, ':' ) != NULL ) ? '6' : '4'; p = psz_sdp = malloc( i_size ); p += sprintf( p, "v=0\r\n" ); - p += sprintf( p, "o=- "I64Fd" %d IN IP4 127.0.0.1\r\n", - p_sys->i_sdp_id, p_sys->i_sdp_version ); + p += sprintf( p, "o=- "I64Fd" %d IN IP%c %s\r\n", + p_sys->i_sdp_id, p_sys->i_sdp_version, + ipv, ipv == '6' ? "::1" : "127.0.0.1" ); if( *p_sys->psz_session_name ) p += sprintf( p, "s=%s\r\n", p_sys->psz_session_name ); if( *p_sys->psz_session_description ) @@ -750,8 +833,15 @@ static char *SDPGenerate( sout_stream_t *p_stream, char *psz_destination, vlc_bo p += sprintf( p, "t=0 0\r\n" ); /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */ p += sprintf( p, "a=tool:"PACKAGE_STRING"\r\n" ); - p += sprintf( p, "c=IN IP4 %s/%d\r\n", psz_destination ? psz_destination : "0.0.0.0", - p_sys->i_ttl ); + p += sprintf( p, "c=IN IP%c %s", ipv, psz_destination ); + + if( ( ipv == 4 ) + && net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) ) + { + /* Add the deprecated TTL field if it is an IPv4 multicast address */ + p += sprintf( p, "/%d", p_sys->i_ttl ?: 1 ); + } + p += sprintf( p, "\r\n" ); for( i = 0; i < p_sys->i_es; i++ ) { @@ -771,6 +861,10 @@ static char *SDPGenerate( sout_stream_t *p_stream, char *psz_destination, vlc_bo { continue; } + if ( id->i_bitrate ) + { + p += sprintf(p,"b=AS:%d\r\n",id->i_bitrate); + } if( id->psz_rtpmap ) { p += sprintf( p, "a=rtpmap:%d %s\r\n", id->i_payload_type, @@ -783,9 +877,14 @@ static char *SDPGenerate( sout_stream_t *p_stream, char *psz_destination, vlc_bo } if( b_rtsp ) { - p += sprintf( p, "a=control:%s/trackid=%d\r\n", p_sys->psz_rtsp_control, i ); + p += sprintf( p, "a=control:/trackID=%d\r\n", i ); } } + if( p_sys->p_mux ) + { + p += sprintf( p, "m=video %d RTP/AVP %d\r\n", + p_sys->i_port, p_sys->i_payload_type ); + } return psz_sdp; } @@ -800,7 +899,10 @@ static int rtp_packetize_mpv ( sout_stream_t *, sout_stream_id_t *, block_t * ) static int rtp_packetize_ac3 ( sout_stream_t *, sout_stream_id_t *, block_t * ); static int rtp_packetize_split( sout_stream_t *, sout_stream_id_t *, block_t * ); static int rtp_packetize_mp4a ( sout_stream_t *, sout_stream_id_t *, block_t * ); +static int rtp_packetize_mp4a_latm ( sout_stream_t *, sout_stream_id_t *, block_t * ); static int rtp_packetize_h263 ( sout_stream_t *, sout_stream_id_t *, block_t * ); +static int rtp_packetize_h264 ( sout_stream_t *, sout_stream_id_t *, block_t * ); +static int rtp_packetize_amr ( sout_stream_t *, sout_stream_id_t *, block_t * ); static void sprintf_hexa( char *s, uint8_t *p_data, int i_data ) { @@ -869,19 +971,24 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) if( p_sys->psz_destination ) { - char access[100]; - char url[strlen( p_sys->psz_destination ) + 1 + 12 + 1]; + char access[17]; + char url[NI_MAXHOST + 8]; /* first try to create the access out */ - if( p_sys->i_ttl > 0 ) + if( p_sys->i_ttl ) { - sprintf( access, "udp{raw,ttl=%d}", p_sys->i_ttl ); + snprintf( access, sizeof( access ), "udp{raw,ttl=%d}", + p_sys->i_ttl ); + access[sizeof( access ) - 1] = '\0'; } else - { - sprintf( access, "udp{raw}" ); - } - sprintf( url, "%s:%d", p_sys->psz_destination, i_port ); + strcpy( access, "udp{raw}" ); + + snprintf( url, sizeof( url ), (( p_sys->psz_destination[0] != '[' ) && + strchr( p_sys->psz_destination, ':' )) ? "[%s]:%d" : "%s:%d", + p_sys->psz_destination, i_port ); + url[sizeof( url ) - 1] = '\0'; + if( ( p_access = sout_AccessOutNew( p_sout, access, url ) ) == NULL ) { msg_Err( p_stream, "cannot create the access out for %s://%s", @@ -960,6 +1067,64 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) id->psz_rtpmap = strdup( "H263-1998/90000" ); id->pf_packetize = rtp_packetize_h263; break; + case VLC_FOURCC( 'h', '2', '6', '4' ): + id->i_payload_type = p_sys->i_payload_type++; + id->i_clock_rate = 90000; + id->psz_rtpmap = strdup( "H264/90000" ); + id->pf_packetize = rtp_packetize_h264; + id->psz_fmtp = NULL; + + if( p_fmt->i_extra > 0 ) + { + uint8_t *p_buffer = p_fmt->p_extra; + int i_buffer = p_fmt->i_extra; + char *p_64_sps = NULL; + char *p_64_pps = NULL; + char hexa[6+1]; + + while( i_buffer > 4 && + p_buffer[0] == 0 && p_buffer[1] == 0 && + p_buffer[2] == 0 && p_buffer[3] == 1 ) + { + const int i_nal_type = p_buffer[4]&0x1f; + int i_offset; + int i_size = 0; + + msg_Dbg( p_stream, "we found a startcode for NAL with TYPE:%d", i_nal_type ); + + i_size = i_buffer; + for( i_offset = 4; i_offset+3 < i_buffer ; i_offset++) + { + if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 ) + { + /* we found another startcode */ + i_size = i_offset; + break; + } + } + if( i_nal_type == 7 ) + { + p_64_sps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 ); + sprintf_hexa( hexa, &p_buffer[5], 3 ); + } + else if( i_nal_type == 8 ) + { + p_64_pps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 ); + } + i_buffer -= i_size; + p_buffer += i_size; + } + /* */ + if( p_64_sps && p_64_pps ) + asprintf( &id->psz_fmtp, "packetization-mode=1;profile-level-id=%s;sprop-parameter-sets=%s,%s;", hexa, p_64_sps, p_64_pps ); + if( p_64_sps ) + free( p_64_sps ); + if( p_64_pps ) + free( p_64_pps ); + } + if( !id->psz_fmtp ) + id->psz_fmtp = strdup( "packetization-mode=1" ); + break; case VLC_FOURCC( 'm', 'p', '4', 'v' ): { @@ -980,25 +1145,76 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) } case VLC_FOURCC( 'm', 'p', '4', 'a' ): { - char hexa[2*p_fmt->i_extra +1]; - id->i_payload_type = p_sys->i_payload_type++; id->i_clock_rate = p_fmt->audio.i_rate; - id->psz_rtpmap = malloc( strlen( "mpeg4-generic/" ) + 12 ); - sprintf( id->psz_rtpmap, "mpeg4-generic/%d", p_fmt->audio.i_rate ); - id->pf_packetize = rtp_packetize_mp4a; - id->psz_fmtp = malloc( 200 + 2 * p_fmt->i_extra ); - sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra ); - sprintf( id->psz_fmtp, - "streamtype=5; profile-level-id=15; mode=AAC-hbr; " - "config=%s; SizeLength=13;IndexLength=3; " - "IndexDeltaLength=3; Profile=1;", hexa ); + + if(!p_sys->b_latm) + { + char hexa[2*p_fmt->i_extra +1]; + + id->psz_rtpmap = malloc( strlen( "mpeg4-generic/" ) + 12 ); + sprintf( id->psz_rtpmap, "mpeg4-generic/%d", p_fmt->audio.i_rate ); + id->pf_packetize = rtp_packetize_mp4a; + id->psz_fmtp = malloc( 200 + 2 * p_fmt->i_extra ); + sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra ); + sprintf( id->psz_fmtp, + "streamtype=5; profile-level-id=15; mode=AAC-hbr; " + "config=%s; SizeLength=13;IndexLength=3; " + "IndexDeltaLength=3; Profile=1;", hexa ); + } + else + { + char hexa[13]; + int i; + unsigned char config[6]; + unsigned int aacsrates[15] = { + 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, + 16000, 12000, 11025, 8000, 7350, 0, 0 }; + + for( i = 0; i < 15; i++ ) + if( p_fmt->audio.i_rate == aacsrates[i] ) + break; + + config[0]=0x40; + config[1]=0; + config[2]=0x20|i; + config[3]=p_fmt->audio.i_channels<<4; + config[4]=0x3f; + config[5]=0xc0; + + asprintf( &id->psz_rtpmap, "MP4A-LATM/%d/%d", + p_fmt->audio.i_rate, p_fmt->audio.i_channels ); + id->pf_packetize = rtp_packetize_mp4a_latm; + sprintf_hexa( hexa, config, 6 ); + asprintf( &id->psz_fmtp, "profile-level-id=15; " + "object=2; cpresent=0; config=%s", hexa ); + } break; } + case VLC_FOURCC( 's', 'a', 'm', 'r' ): + id->i_payload_type = p_sys->i_payload_type++; + id->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ? + "AMR/8000/2" : "AMR/8000" ); + id->psz_fmtp = strdup( "octet-align=1" ); + id->i_clock_rate = p_fmt->audio.i_rate; + id->pf_packetize = rtp_packetize_amr; + break; + case VLC_FOURCC( 's', 'a', 'w', 'b' ): + id->i_payload_type = p_sys->i_payload_type++; + id->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ? + "AMR-WB/16000/2" : "AMR-WB/16000" ); + id->psz_fmtp = strdup( "octet-align=1" ); + id->i_clock_rate = p_fmt->audio.i_rate; + id->pf_packetize = rtp_packetize_amr; + break; default: msg_Err( p_stream, "cannot add this stream (unsupported " "codec:%4.4s)", (char*)&p_fmt->i_codec ); + if( p_access ) + { + sout_AccessOutDelete( p_access ); + } free( id ); return NULL; } @@ -1010,22 +1226,24 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) id->ssrc[3] = rand()&0xff; id->i_sequence = rand()&0xffff; id->i_timestamp_start = rand()&0xffffffff; + id->i_bitrate = p_fmt->i_bitrate/1000; /* Stream bitrate in kbps */ id->i_mtu = config_GetInt( p_stream, "mtu" ); /* XXX beuk */ - if( id->i_mtu <= 16 ) + if( id->i_mtu <= 16 + MTU_REDUCE ) { /* better than nothing */ id->i_mtu = 1500; } - msg_Dbg( p_stream, "using mtu=%d", id->i_mtu ); + id->i_mtu -= MTU_REDUCE; + msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu ); if( p_sys->p_rtsp_url ) { char psz_urlc[strlen( p_sys->psz_rtsp_control ) + 1 + 10]; - sprintf( psz_urlc, "%s/trackid=%d", p_sys->psz_rtsp_path, p_sys->i_es ); - fprintf( stderr, "rtsp: adding %s\n", psz_urlc ); - id->p_rtsp_url = httpd_UrlNewUnique( p_sys->p_rtsp_host, psz_urlc, NULL, NULL ); + sprintf( psz_urlc, "%s/trackID=%d", p_sys->psz_rtsp_path, p_sys->i_es ); + msg_Dbg( p_stream, "rtsp: adding %s\n", psz_urlc ); + id->p_rtsp_url = httpd_UrlNewUnique( p_sys->p_rtsp_host, psz_urlc, NULL, NULL, NULL ); if( id->p_rtsp_url ) { @@ -1050,7 +1268,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) p_sys->i_sdp_version++; - fprintf( stderr, "sdp=%s", p_sys->psz_sdp ); + msg_Dbg( p_stream, "sdp=%s", p_sys->psz_sdp ); /* Update SDP (sap/file) */ if( p_sys->b_export_sap ) SapSetup( p_stream ); @@ -1102,7 +1320,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) if( id->rtsp_access ) free( id->rtsp_access ); /* Update SDP (sap/file) */ - if( p_sys->b_export_sap ) SapSetup( p_stream ); + if( p_sys->b_export_sap && !p_sys->p_mux ) SapSetup( p_stream ); if( p_sys->b_export_sdp_file ) FileSetup( p_stream ); free( id ); @@ -1147,7 +1365,7 @@ static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, unsigned int i_data = p_buffer->i_buffer; unsigned int i_max = p_sys->i_mtu - 12; - int i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max; + unsigned i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max; while( i_data > 0 ) { @@ -1186,7 +1404,8 @@ static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, p_sys->i_sequence++; } - i_size = __MIN( i_data, p_sys->i_mtu - p_sys->packet->i_buffer ); + i_size = __MIN( i_data, + (unsigned)(p_sys->i_mtu - p_sys->packet->i_buffer) ); memcpy( &p_sys->packet->p_buffer[p_sys->packet->i_buffer], p_data, i_size ); @@ -1227,8 +1446,7 @@ static int SapSetup( sout_stream_t *p_stream ) { sout_stream_sys_t *p_sys = p_stream->p_sys; sout_instance_t *p_sout = p_stream->p_sout; - announce_method_t *p_method = (announce_method_t *) - malloc(sizeof(announce_method_t)); + announce_method_t *p_method = sout_SAPMethod(); /* Remove the previous session */ if( p_sys->p_session != NULL) @@ -1237,17 +1455,16 @@ static int SapSetup( sout_stream_t *p_stream ) sout_AnnounceSessionDestroy( p_sys->p_session ); p_sys->p_session = NULL; } - p_method->i_type = METHOD_TYPE_SAP; - p_method->psz_address = NULL; /* FIXME */ - p_method->i_ip_version = 4; /* FIXME ! */ - if( p_sys->i_es > 0 && p_sys->psz_sdp && *p_sys->psz_sdp ) + if( ( p_sys->i_es > 0 || p_sys->p_mux ) && p_sys->psz_sdp && *p_sys->psz_sdp ) { - p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, p_sys->psz_sdp, + p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, SOUT_CFG_PREFIX, + p_sys->psz_sdp, + p_sys->psz_destination, p_method ); } - free( p_method ); + sout_MethodRelease( p_method ); return VLC_SUCCESS; } @@ -1259,7 +1476,7 @@ static int FileSetup( sout_stream_t *p_stream ) sout_stream_sys_t *p_sys = p_stream->p_sys; FILE *f; - if( ( f = fopen( p_sys->psz_sdp_file, "wt" ) ) == NULL ) + if( ( f = utf8_fopen( p_sys->psz_sdp_file, "wt" ) ) == NULL ) { msg_Err( p_stream, "cannot open file '%s' (%s)", p_sys->psz_sdp_file, strerror(errno) ); @@ -1283,13 +1500,13 @@ static int HttpSetup( sout_stream_t *p_stream, vlc_url_t *url) { sout_stream_sys_t *p_sys = p_stream->p_sys; - p_sys->p_httpd_host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host, url->i_port ); + p_sys->p_httpd_host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host, url->i_port > 0 ? url->i_port : 80 ); if( p_sys->p_httpd_host ) { p_sys->p_httpd_file = httpd_FileNew( p_sys->p_httpd_host, url->psz_path ? url->psz_path : "/", "application/sdp", - NULL, NULL, + NULL, NULL, NULL, HttpCallback, (void*)p_sys ); } if( p_sys->p_httpd_file == NULL ) @@ -1325,11 +1542,11 @@ static int HttpCallback( httpd_file_sys_t *p_args, /**************************************************************************** * RTSP: ****************************************************************************/ -static rtsp_client_t *RtspClientNew( sout_stream_t *p_stream, char *psz_session ) +static rtsp_client_t *RtspClientNew( sout_stream_t *p_stream, const char *psz_session ) { rtsp_client_t *rtsp = malloc( sizeof( rtsp_client_t )); - rtsp->psz_session = psz_session; + rtsp->psz_session = strdup( psz_session ); rtsp->i_last = 0; rtsp->b_playing = VLC_FALSE; rtsp->i_id = 0; @@ -1341,9 +1558,12 @@ static rtsp_client_t *RtspClientNew( sout_stream_t *p_stream, char *psz_session return rtsp; } -static rtsp_client_t *RtspClientGet( sout_stream_t *p_stream, char *psz_session ) +static rtsp_client_t *RtspClientGet( sout_stream_t *p_stream, const char *psz_session ) { int i; + + if( !psz_session ) return NULL; + for( i = 0; i < p_stream->p_sys->i_rtsp; i++ ) { if( !strcmp( p_stream->p_sys->rtsp[i]->psz_session, psz_session ) ) @@ -1374,7 +1594,7 @@ static int RtspSetup( sout_stream_t *p_stream, vlc_url_t *url ) { sout_stream_sys_t *p_sys = p_stream->p_sys; - fprintf( stderr, "rtsp setup: %s : %d / %s\n", url->psz_host, url->i_port, url->psz_path ); + msg_Dbg( p_stream, "rtsp setup: %s : %d / %s\n", url->psz_host, url->i_port, url->psz_path ); p_sys->p_rtsp_host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host, url->i_port > 0 ? url->i_port : 554 ); if( p_sys->p_rtsp_host == NULL ) @@ -1387,7 +1607,7 @@ static int RtspSetup( sout_stream_t *p_stream, vlc_url_t *url ) sprintf( p_sys->psz_rtsp_control, "rtsp://%s:%d%s", url->psz_host, url->i_port > 0 ? url->i_port : 554, p_sys->psz_rtsp_path ); - p_sys->p_rtsp_url = httpd_UrlNewUnique( p_sys->p_rtsp_host, p_sys->psz_rtsp_path, NULL, NULL ); + p_sys->p_rtsp_url = httpd_UrlNewUnique( p_sys->p_rtsp_host, p_sys->psz_rtsp_path, NULL, NULL, NULL ); if( p_sys->p_rtsp_url == 0 ) { return VLC_EGENERIC; @@ -1406,14 +1626,16 @@ static int RtspCallback( httpd_callback_sys_t *p_args, { sout_stream_t *p_stream = (sout_stream_t*)p_args; sout_stream_sys_t *p_sys = p_stream->p_sys; - char *psz_destination = p_sys->psz_destination; - char *psz_session = NULL; + char *psz_destination = p_sys->psz_destination; + const char *psz_session = NULL; + const char *psz_cseq = NULL; + int i_cseq = 0; if( answer == NULL || query == NULL ) { return VLC_SUCCESS; } - fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type ); + //fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type ); answer->i_proto = HTTPD_PROTO_RTSP; answer->i_version= query->i_version; @@ -1428,8 +1650,8 @@ static int RtspCallback( httpd_callback_sys_t *p_args, answer->i_status = 200; answer->psz_status = strdup( "OK" ); httpd_MsgAdd( answer, "Content-type", "%s", "application/sdp" ); - - answer->p_body = psz_sdp; + httpd_MsgAdd( answer, "Content-Base", "%s", p_sys->psz_rtsp_control ); + answer->p_body = (uint8_t *)psz_sdp; answer->i_body = strlen( psz_sdp ); break; } @@ -1518,33 +1740,42 @@ static int RtspCallback( httpd_callback_sys_t *p_args, default: return VLC_EGENERIC; } - httpd_MsgAdd( answer, "Server", "VLC Server" ); + httpd_MsgAdd( answer, "Server", PACKAGE_STRING ); httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); - httpd_MsgAdd( answer, "Cseq", "%d", atoi( httpd_MsgGet( query, "Cseq" ) ) ); + psz_cseq = httpd_MsgGet( query, "Cseq" ); + if( psz_cseq ) + i_cseq = atoi( psz_cseq ); + else + i_cseq = 0; + httpd_MsgAdd( answer, "Cseq", "%d", i_cseq ); httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" ); if( psz_session ) - { httpd_MsgAdd( answer, "Session", "%s;timeout=5", psz_session ); - } return VLC_SUCCESS; } -static int RtspCallbackId( httpd_callback_sys_t *p_args, +static int RtspCallbackId( httpd_callback_sys_t *p_args, httpd_client_t *cl, httpd_message_t *answer, httpd_message_t *query ) { sout_stream_id_t *id = (sout_stream_id_t*)p_args; sout_stream_t *p_stream = id->p_stream; sout_stream_sys_t *p_sys = p_stream->p_sys; - char *psz_session = NULL; + char psz_session_init[100]; + const char *psz_session = NULL; + const char *psz_cseq = NULL; + int i_cseq = 0; + if( answer == NULL || query == NULL ) - { return VLC_SUCCESS; - } - fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type ); + //fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type ); + + /* */ + snprintf( psz_session_init, sizeof(psz_session_init), "%d", rand() ); + /* */ answer->i_proto = HTTPD_PROTO_RTSP; answer->i_version= query->i_version; answer->i_type = HTTPD_MSG_ANSWER; @@ -1553,88 +1784,83 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, { case HTTPD_MSG_SETUP: { - char *psz_transport = httpd_MsgGet( query, "Transport" ); + const char *psz_transport = httpd_MsgGet( query, "Transport" ); - fprintf( stderr, "HTTPD_MSG_SETUP: transport=%s\n", psz_transport ); + //fprintf( stderr, "HTTPD_MSG_SETUP: transport=%s\n", psz_transport ); if( strstr( psz_transport, "multicast" ) && id->psz_destination ) { - fprintf( stderr, "HTTPD_MSG_SETUP: multicast\n" ); + //fprintf( stderr, "HTTPD_MSG_SETUP: multicast\n" ); answer->i_status = 200; answer->psz_status = strdup( "OK" ); answer->i_body = 0; answer->p_body = NULL; + psz_session = httpd_MsgGet( query, "Session" ); - if( *psz_session == 0 ) - { - psz_session = malloc( 100 ); - sprintf( psz_session, "%d", rand() ); - } + if( !psz_session ) + psz_session = psz_session_init; + httpd_MsgAdd( answer, "Transport", "RTP/AVP/UDP;destination=%s;port=%d-%d;ttl=%d", - id->psz_destination, id->i_port,id->i_port+1, p_sys->i_ttl ); + id->psz_destination, id->i_port,id->i_port+1, + p_sys->i_ttl > 0 ? p_sys->i_ttl : 1); } else if( strstr( psz_transport, "unicast" ) && strstr( psz_transport, "client_port=" ) ) { int i_port = atoi( strstr( psz_transport, "client_port=" ) + strlen("client_port=") ); - char *ip = httpd_ClientIP( cl ); - - char psz_access[100]; - char psz_url[100]; + char ip[NI_MAXNUMERICHOST], psz_access[17], psz_url[NI_MAXNUMERICHOST + 8]; sout_access_out_t *p_access; rtsp_client_t *rtsp = NULL; - if( ip == NULL ) + if( httpd_ClientIP( cl, ip ) == NULL ) { - answer->i_status = 400; + answer->i_status = 500; answer->psz_status = strdup( "Internal server error" ); answer->i_body = 0; answer->p_body = NULL; break; } - fprintf( stderr, "HTTPD_MSG_SETUP: unicast ip=%s port=%d\n", - ip, i_port ); + //fprintf( stderr, "HTTPD_MSG_SETUP: unicast ip=%s port=%d\n", ip, i_port ); psz_session = httpd_MsgGet( query, "Session" ); - if( *psz_session == 0 ) + if( !psz_session ) { - psz_session = malloc( 100 ); - sprintf( psz_session, "%d", rand() ); - - rtsp = RtspClientNew( p_stream, psz_session ); + psz_session = psz_session_init; + rtsp = RtspClientNew( p_stream, psz_session_init ); } else { rtsp = RtspClientGet( p_stream, psz_session ); if( rtsp == NULL ) { - /* FIXME right error code */ - answer->i_status = 400; + answer->i_status = 454; answer->psz_status = strdup( "Unknown session id" ); answer->i_body = 0; answer->p_body = NULL; - free( ip ); break; } } /* first try to create the access out */ - if( p_sys->i_ttl > 0 ) - sprintf( psz_access, "udp{raw,ttl=%d}", p_sys->i_ttl ); + if( p_sys->i_ttl ) + snprintf( psz_access, sizeof( psz_access ), + "udp{raw,ttl=%d}", p_sys->i_ttl ); else - sprintf( psz_access, "udp{raw}" ); - sprintf( psz_url, "%s:%d", ip, i_port ); - free( ip ); - + strlcpy( psz_access, "udp{raw}", sizeof( psz_access ) ); + + snprintf( psz_url, sizeof( psz_url ), + ( strchr( ip, ':' ) != NULL ) ? "[%s]:%d" : "%s:%d", + ip, i_port ); + if( ( p_access = sout_AccessOutNew( p_stream->p_sout, psz_access, psz_url ) ) == NULL ) { msg_Err( p_stream, "cannot create the access out for %s://%s", psz_access, psz_url ); - answer->i_status = 400; - answer->psz_status = strdup( "Server internal error" ); + answer->i_status = 500; + answer->psz_status = strdup( "Internal server error" ); answer->i_body = 0; answer->p_body = NULL; break; @@ -1653,8 +1879,8 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, } else /* TODO strstr( psz_transport, "interleaved" ) ) */ { - answer->i_status = 400; - answer->psz_status = strdup( "Bad Request" ); + answer->i_status = 461; + answer->psz_status = strdup( "Unsupported Transport" ); answer->i_body = 0; answer->p_body = NULL; } @@ -1666,13 +1892,16 @@ static int RtspCallbackId( httpd_callback_sys_t *p_args, } httpd_MsgAdd( answer, "Server", "VLC Server" ); httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); - httpd_MsgAdd( answer, "Cseq", "%d", atoi( httpd_MsgGet( query, "Cseq" ) ) ); + psz_cseq = httpd_MsgGet( query, "Cseq" ); + if( psz_cseq ) + i_cseq = atoi( psz_cseq ); + else + i_cseq = 0; + httpd_MsgAdd( answer, "Cseq", "%d", i_cseq ); httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" ); if( psz_session ) - { httpd_MsgAdd( answer, "Session", "%s"/*;timeout=5*/, psz_session ); - } return VLC_SUCCESS; } @@ -1863,6 +2092,7 @@ static int rtp_packetize_mpv( sout_stream_t *p_stream, sout_stream_id_t *id, return VLC_SUCCESS; } + static int rtp_packetize_ac3( sout_stream_t *p_stream, sout_stream_id_t *id, block_t *in ) { @@ -1933,6 +2163,60 @@ static int rtp_packetize_split( sout_stream_t *p_stream, sout_stream_id_t *id, return VLC_SUCCESS; } +/* rfc3016 */ +static int rtp_packetize_mp4a_latm( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *in ) +{ + int i_max = id->i_mtu - 14; /* payload max in one packet */ + int latmhdrsize = in->i_buffer / 0xff + 1; + int i_count = ( in->i_buffer + i_max - 1 ) / i_max; + + uint8_t *p_data = in->p_buffer, *p_header = NULL; + int i_data = in->i_buffer; + int i; + + for( i = 0; i < i_count; i++ ) + { + int i_payload = __MIN( i_max, i_data ); + block_t *out; + + if( i != 0 ) + latmhdrsize = 0; + out = block_New( p_stream, 12 + latmhdrsize + i_payload ); + + /* rtp common header */ + rtp_packetize_common( id, out, ((i == i_count - 1) ? 1 : 0), + (in->i_pts > 0 ? in->i_pts : in->i_dts) ); + + if( i == 0 ) + { + int tmp = in->i_buffer; + + p_header=out->p_buffer+12; + while( tmp > 0xfe ) + { + *p_header = 0xff; + p_header++; + tmp -= 0xff; + } + *p_header = tmp; + } + + memcpy( &out->p_buffer[12+latmhdrsize], p_data, i_payload ); + + out->i_buffer = 12 + latmhdrsize + i_payload; + out->i_dts = in->i_dts + i * in->i_length / i_count; + out->i_length = in->i_length / i_count; + + rtp_packetize_send( id, out ); + + p_data += i_payload; + i_data -= i_payload; + } + + return VLC_SUCCESS; +} + static int rtp_packetize_l16( sout_stream_t *p_stream, sout_stream_id_t *id, block_t *in ) { @@ -2106,3 +2390,157 @@ static int rtp_packetize_h263( sout_stream_t *p_stream, sout_stream_id_t *id, return VLC_SUCCESS; } +/* rfc3984 */ +static int rtp_packetize_h264_nal( sout_stream_t *p_stream, sout_stream_id_t *id, + const uint8_t *p_data, int i_data, int64_t i_pts, int64_t i_dts, vlc_bool_t b_last, int64_t i_length ) +{ + const int i_max = id->i_mtu - 12; /* payload max in one packet */ + int i_nal_hdr; + int i_nal_type; + + if( i_data < 5 ) + return VLC_SUCCESS; + + i_nal_hdr = p_data[3]; + i_nal_type = i_nal_hdr&0x1f; + if( i_nal_type == 7 || i_nal_type == 8 ) + { + /* XXX Why do you want to remove them ? It will break streaming with + * SPS/PPS change (broadcast) ? */ + return VLC_SUCCESS; + } + + /* Skip start code */ + p_data += 3; + i_data -= 3; + + /* */ + if( i_data <= i_max ) + { + /* Single NAL unit packet */ + block_t *out = block_New( p_stream, 12 + i_data ); + out->i_dts = i_dts; + out->i_length = i_length; + + /* */ + rtp_packetize_common( id, out, b_last, i_pts ); + out->i_buffer = 12 + i_data; + + memcpy( &out->p_buffer[12], p_data, i_data ); + + rtp_packetize_send( id, out ); + } + else + { + /* FU-A Fragmentation Unit without interleaving */ + const int i_count = ( i_data-1 + i_max-2 - 1 ) / (i_max-2); + int i; + + p_data++; + i_data--; + + for( i = 0; i < i_count; i++ ) + { + const int i_payload = __MIN( i_data, i_max-2 ); + block_t *out = block_New( p_stream, 12 + 2 + i_payload ); + out->i_dts = i_dts + i * i_length / i_count; + out->i_length = i_length / i_count; + + /* */ + rtp_packetize_common( id, out, (b_last && i_payload == i_data), i_pts ); + out->i_buffer = 14 + i_payload; + + /* FU indicator */ + out->p_buffer[12] = 0x00 | (i_nal_hdr & 0x60) | 28; + /* FU header */ + out->p_buffer[13] = ( i == 0 ? 0x80 : 0x00 ) | ( (i == i_count-1) ? 0x40 : 0x00 ) | i_nal_type; + memcpy( &out->p_buffer[14], p_data, i_payload ); + + rtp_packetize_send( id, out ); + + i_data -= i_payload; + p_data += i_payload; + } + } + return VLC_SUCCESS; +} + +static int rtp_packetize_h264( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *in ) +{ + const uint8_t *p_buffer = in->p_buffer; + int i_buffer = in->i_buffer; + + while( i_buffer > 4 && ( p_buffer[0] != 0 || p_buffer[1] != 0 || p_buffer[2] != 1 ) ) + { + i_buffer--; + p_buffer++; + } + + /* Split nal units */ + while( i_buffer > 4 ) + { + int i_offset; + int i_size = i_buffer; + int i_skip = i_buffer; + + /* search nal end */ + for( i_offset = 4; i_offset+2 < i_buffer ; i_offset++) + { + if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 1 ) + { + /* we found another startcode */ + i_size = i_offset - ( p_buffer[i_offset-1] == 0 ? 1 : 0); + i_skip = i_offset; + break; + } + } + /* TODO add STAP-A to remove a lot of overhead with small slice/sei/... */ + rtp_packetize_h264_nal( p_stream, id, p_buffer, i_size, + (in->i_pts > 0 ? in->i_pts : in->i_dts), in->i_dts, + (i_size >= i_buffer), in->i_length * i_size / in->i_buffer ); + + i_buffer -= i_skip; + p_buffer += i_skip; + } + return VLC_SUCCESS; +} + +static int rtp_packetize_amr( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *in ) +{ + int i_max = id->i_mtu - 14; /* payload max in one packet */ + int i_count = ( in->i_buffer + i_max - 1 ) / i_max; + + uint8_t *p_data = in->p_buffer; + int i_data = in->i_buffer; + int i; + + /* Only supports octet-aligned mode */ + for( i = 0; i < i_count; i++ ) + { + int i_payload = __MIN( i_max, i_data ); + block_t *out = block_New( p_stream, 14 + i_payload ); + + /* rtp common header */ + rtp_packetize_common( id, out, ((i == i_count - 1)?1:0), + (in->i_pts > 0 ? in->i_pts : in->i_dts) ); + /* Payload header */ + out->p_buffer[12] = 0xF0; /* CMR */ + out->p_buffer[13] = p_data[0]&0x7C; /* ToC */ /* FIXME: frame type */ + + /* FIXME: are we fed multiple frames ? */ + memcpy( &out->p_buffer[14], p_data+1, i_payload-1 ); + + out->i_buffer = 14 + i_payload-1; + out->i_dts = in->i_dts + i * in->i_length / i_count; + out->i_length = in->i_length / i_count; + + rtp_packetize_send( id, out ); + + p_data += i_payload; + i_data -= i_payload; + } + + return VLC_SUCCESS; +}