X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Frtp.c;h=878e5fb9f387dc873abd9aee580df8d6fbe73e95;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=fb14e45869e4c9b72bfe04b1e61d5d6d3c4e71b2;hpb=1715ecf8b022e7abe603fb2fde492f245e3d3ccb;p=vlc diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index fb14e45869..878e5fb9f3 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -2,6 +2,7 @@ * rtp.c: rtp stream output module ***************************************************************************** * Copyright (C) 2003-2004 the VideoLAN team + * Copyright © 2007 Rémi Denis-Courmont * $Id$ * * Authors: Laurent Aimar @@ -24,25 +25,32 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include - -#include #include -#include -#include +#include +#include + +#include +#include +#include +#include +#include + +#include "rtp.h" -#include "vlc_httpd.h" -#include "vlc_url.h" -#include "network.h" -#include "charset.h" +#ifdef HAVE_UNISTD_H +# include +# include +# include +# include +#endif + +#include /***************************************************************************** * Module descriptor *****************************************************************************/ -#define MTU_REDUCE 50 - #define DST_TEXT N_("Destination") #define DST_LONGTEXT N_( \ "This is the output URL that will be used." ) @@ -84,9 +92,21 @@ #define PORT_VIDEO_LONGTEXT N_( \ "This allows you to specify the default video port for the RTP streaming." ) -#define TTL_TEXT N_("Time-To-Live (TTL)") +#define TTL_TEXT N_("Hop limit (TTL)") #define TTL_LONGTEXT N_( \ - "This 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 DCCP_TEXT N_("DCCP transport") +#define DCCP_LONGTEXT N_( \ + "This enables DCCP instead of UDP as a transport for RTP." ) +#define TCP_TEXT N_("TCP transport") +#define TCP_LONGTEXT N_( \ + "This enables TCP instead of UDP as a transport for RTP." ) +#define UDP_LITE_TEXT N_("UDP-Lite transport") +#define UDP_LITE_LONGTEXT N_( \ + "This enables UDP-Lite instead of UDP as a transport for RTP." ) #define RFC3016_TEXT N_("MP4A LATM") #define RFC3016_LONGTEXT N_( \ @@ -96,6 +116,7 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); #define SOUT_CFG_PREFIX "sout-rtp-" +#define MAX_EMPTY_BLOCKS 200 vlc_module_begin(); set_shortname( _("RTP")); @@ -131,6 +152,13 @@ vlc_module_begin(); add_integer( SOUT_CFG_PREFIX "ttl", 0, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_TRUE ); + add_bool( SOUT_CFG_PREFIX "dccp", 0, NULL, + DCCP_TEXT, DCCP_LONGTEXT, VLC_FALSE ); + add_bool( SOUT_CFG_PREFIX "tcp", 0, NULL, + TCP_TEXT, TCP_LONGTEXT, VLC_FALSE ); + add_bool( SOUT_CFG_PREFIX "udplite", 0, NULL, + UDP_LITE_TEXT, UDP_LITE_LONGTEXT, VLC_FALSE ); + add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT, RFC3016_LONGTEXT, VLC_FALSE ); @@ -142,33 +170,32 @@ vlc_module_end(); *****************************************************************************/ static const char *ppsz_sout_options[] = { "dst", "name", "port", "port-audio", "port-video", "*sdp", "ttl", "mux", - "description", "url","email", "mp4a-latm", NULL + "description", "url", "email", + "dccp", "tcp", "udplite", + "mp4a-latm", NULL }; static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * ); static int Del ( sout_stream_t *, sout_stream_id_t * ); static int Send( sout_stream_t *, sout_stream_id_t *, block_t* ); +static sout_stream_id_t *MuxAdd ( sout_stream_t *, es_format_t * ); +static int MuxDel ( sout_stream_t *, sout_stream_id_t * ); +static int MuxSend( sout_stream_t *, sout_stream_id_t *, + block_t* ); -/* For unicast/interleaved streaming */ -typedef struct -{ - char *psz_session; - int64_t i_last; /* for timeout */ +static sout_access_out_t *GrabberCreate( sout_stream_t *p_sout ); +static void ThreadSend( vlc_object_t *p_this ); - /* is it in "play" state */ - vlc_bool_t b_playing; +static void SDPHandleUrl( sout_stream_t *, char * ); - /* output (id-access) */ - int i_id; - sout_stream_id_t **id; - int i_access; - sout_access_out_t **access; -} rtsp_client_t; +static int SapSetup( sout_stream_t *p_stream ); +static int FileSetup( sout_stream_t *p_stream ); +static int HttpSetup( sout_stream_t *p_stream, vlc_url_t * ); struct sout_stream_sys_t { - /* sdp */ + /* SDP */ int64_t i_sdp_id; int i_sdp_version; char *psz_sdp; @@ -179,27 +206,28 @@ struct sout_stream_sys_t char *psz_session_url; char *psz_session_email; - /* */ + /* SDP to disk */ vlc_bool_t b_export_sdp_file; char *psz_sdp_file; - /* sap */ + + /* SDP via SAP */ vlc_bool_t b_export_sap; session_descriptor_t *p_session; + /* SDP via HTTP */ httpd_host_t *p_httpd_host; httpd_file_t *p_httpd_file; - httpd_host_t *p_rtsp_host; - httpd_url_t *p_rtsp_url; - char *psz_rtsp_control; - char *psz_rtsp_path; + /* RTSP */ + rtsp_stream_t *rtsp; /* */ - char *psz_destination; - int i_port; - int i_port_audio; - int i_port_video; - int i_ttl; + char *psz_destination; + uint8_t proto; + uint8_t i_ttl; + uint16_t i_port; + uint16_t i_port_audio; + uint16_t i_port_video; vlc_bool_t b_latm; /* when need to use a private one or when using muxer */ @@ -207,80 +235,57 @@ struct sout_stream_sys_t /* in case we do TS/PS over rtp */ sout_mux_t *p_mux; - sout_access_out_t *p_access; - int i_mtu; sout_access_out_t *p_grab; - uint16_t i_sequence; - uint32_t i_timestamp_start; - uint8_t ssrc[4]; block_t *packet; /* */ vlc_mutex_t lock_es; int i_es; sout_stream_id_t **es; - - /* */ - int i_rtsp; - rtsp_client_t **rtsp; }; typedef int (*pf_rtp_packetizer_t)( sout_stream_t *, sout_stream_id_t *, block_t * ); +typedef struct rtp_sink_t +{ + int rtp_fd; + rtcp_sender_t *rtcp; +} rtp_sink_t; + struct sout_stream_id_t { + VLC_COMMON_MEMBERS + sout_stream_t *p_stream; /* rtp field */ - uint8_t i_payload_type; - uint16_t i_sequence; uint32_t i_timestamp_start; + uint16_t i_sequence; + uint8_t i_payload_type; uint8_t ssrc[4]; /* for sdp */ - int i_clock_rate; char *psz_rtpmap; char *psz_fmtp; - char *psz_destination; - int i_port; - int i_cat; + int i_clock_rate; + int i_port; + int i_cat; + int i_bitrate; /* Packetizer specific fields */ pf_rtp_packetizer_t pf_packetize; - int i_mtu; + int i_mtu; - /* for sending the packets */ - sout_access_out_t *p_access; + /* Packets sinks */ + vlc_mutex_t lock_sink; + int sinkc; + rtp_sink_t *sinkv; + rtsp_stream_id_t *rtsp_id; - vlc_mutex_t lock_rtsp; - int i_rtsp_access; - sout_access_out_t **rtsp_access; - - /* */ - sout_input_t *p_input; - - /* RTSP url control */ - httpd_url_t *p_rtsp_url; + block_fifo_t *p_fifo; + int64_t i_caching; }; -static int AccessOutGrabberWrite( sout_access_out_t *, block_t * ); - -static void SDPHandleUrl( sout_stream_t *, char * ); - -static int SapSetup( sout_stream_t *p_stream ); -static int FileSetup( sout_stream_t *p_stream ); -static int HttpSetup( sout_stream_t *p_stream, vlc_url_t * ); -static int RtspSetup( sout_stream_t *p_stream, vlc_url_t * ); - -static int RtspCallback( httpd_callback_sys_t *, httpd_client_t *, - httpd_message_t *, httpd_message_t * ); -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 void RtspClientDel( sout_stream_t *, rtsp_client_t * ); /***************************************************************************** * Open: @@ -290,21 +295,18 @@ 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 = NULL; - sout_cfg_t *p_cfg = NULL; - vlc_value_t val; + config_chain_t *p_cfg = NULL; + char *psz; 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 ) ); + if( p_sys == NULL ) + return VLC_ENOMEM; - p_sys->psz_destination = var_GetString( p_stream, SOUT_CFG_PREFIX "dst" ); - if( *p_sys->psz_destination == '\0' ) - { - free( p_sys->psz_destination ); - p_sys->psz_destination = NULL; - } - + p_sys->psz_destination = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "dst" ); p_sys->psz_session_name = var_GetString( p_stream, SOUT_CFG_PREFIX "name" ); p_sys->psz_session_description = var_GetString( p_stream, SOUT_CFG_PREFIX "description" ); p_sys->psz_session_url = var_GetString( p_stream, SOUT_CFG_PREFIX "url" ); @@ -333,70 +335,68 @@ static int Open( vlc_object_t *p_this ) 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" ) + && ( p_cfg->psz_value != NULL ) + && !strncasecmp( p_cfg->psz_value, "rtsp:", 5 ) ) { - if( p_cfg->psz_value && !strncasecmp( p_cfg->psz_value, "rtsp", 4 ) ) - { - b_rtsp = VLC_TRUE; - break; - } + b_rtsp = VLC_TRUE; + break; } } 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 ); + psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "sdp" ); + if( psz != NULL ) + { + if( !strncasecmp( psz, "rtsp:", 5 ) ) + b_rtsp = VLC_TRUE; + free( psz ); + } } - if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' ) + /* Transport protocol */ + p_sys->proto = IPPROTO_UDP; + +#if 0 + if( var_GetBool( p_stream, SOUT_CFG_PREFIX "dccp" ) ) { - if( !b_rtsp ) - { - msg_Err( p_stream, "missing destination and not in rtsp mode" ); - free( p_sys ); - return VLC_EGENERIC; - } - p_sys->psz_destination = NULL; + p_sys->sotype = SOCK_DCCP; + p_sys->proto = 33 /*IPPROTO_DCCP*/; + } + else + if( var_GetBool( p_stream, SOUT_CFG_PREFIX "tcp" ) ) + { + p_sys->sotype = SOCK_STREAM; + p_sys->proto = IPPROTO_TCP; } - else if( p_sys->i_port <= 0 ) + else +#endif + if( var_GetBool( p_stream, SOUT_CFG_PREFIX "udplite" ) ) + p_sys->proto = 136 /*IPPROTO_UDPLITE*/; + + if( ( p_sys->psz_destination == NULL ) && !b_rtsp ) { - msg_Err( p_stream, "invalid port" ); + msg_Err( p_stream, "missing destination and not in RTSP mode" ); free( p_sys ); return VLC_EGENERIC; } - var_Get( p_stream, SOUT_CFG_PREFIX "ttl", &val ); - if( val.i_int == 0 ) + p_sys->i_ttl = var_GetInteger( p_stream, SOUT_CFG_PREFIX "ttl" ); + if( p_sys->i_ttl == 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_Err( p_stream, "illegal TTL %d", val.i_int ); - free( p_sys ); - return VLC_EGENERIC; + p_sys->i_ttl = config_GetInt( p_stream, "ttl" ); } - 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->b_latm = var_GetBool( p_stream, SOUT_CFG_PREFIX "mp4a-latm" ); p_sys->i_payload_type = 96; p_sys->i_es = 0; p_sys->es = NULL; - p_sys->i_rtsp = 0; - p_sys->rtsp = NULL; + p_sys->rtsp = NULL; p_sys->psz_sdp = NULL; p_sys->i_sdp_id = mdate(); @@ -409,188 +409,90 @@ static int Open( vlc_object_t *p_this ) p_sys->p_httpd_host = NULL; p_sys->p_httpd_file = NULL; - p_sys->p_rtsp_host = NULL; - p_sys->p_rtsp_url = NULL; - p_sys->psz_rtsp_control = NULL; - p_sys->psz_rtsp_path = NULL; + + p_stream->p_sys = p_sys; vlc_mutex_init( p_stream, &p_sys->lock_sdp ); vlc_mutex_init( p_stream, &p_sys->lock_es ); - p_stream->pf_add = Add; - p_stream->pf_del = Del; - p_stream->pf_send = Send; - - p_stream->p_sys = p_sys; - - var_Get( p_stream, SOUT_CFG_PREFIX "mux", &val ); - if( *val.psz_string ) + psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" ); + if( psz != NULL ) { - sout_access_out_t *p_grab; - char *psz_rtpmap, url[NI_MAXHOST + 8], access[17], psz_ttl[5], ipv; - - 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; - } + sout_stream_id_t *id; + const char *psz_rtpmap; + int i_payload_type; /* Check muxer type */ - if( !strncasecmp( val.psz_string, "ps", 2 ) || !strncasecmp( val.psz_string, "mpeg1", 5 ) ) + if( !strncasecmp( psz, "ps", 2 ) + || !strncasecmp( psz, "mpeg1", 5 ) ) { psz_rtpmap = "MP2P/90000"; } - else if( !strncasecmp( val.psz_string, "ts", 2 ) ) + else if( !strncasecmp( psz, "ts", 2 ) ) { psz_rtpmap = "MP2T/90000"; - p_sys->i_payload_type = 33; + i_payload_type = 33; } else { - msg_Err( p_stream, "unsupported muxer type with rtp (only ts/ps)" ); + msg_Err( p_stream, "unsupported muxer type for RTP (only TS/PS)" ); + free( psz ); + vlc_mutex_destroy( &p_sys->lock_sdp ); + vlc_mutex_destroy( &p_sys->lock_es ); free( p_sys ); return VLC_EGENERIC; } - /* create the access out */ - if( p_sys->i_ttl > 0 ) - { - sprintf( access, "udp{raw,ttl=%d}", p_sys->i_ttl ); - } - else - { - sprintf( access, "udp{raw}" ); - } + p_sys->p_grab = GrabberCreate( p_stream ); + p_sys->p_mux = sout_MuxNew( p_sout, psz, p_sys->p_grab ); + free( psz ); - /* 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 ) ) ) + if( p_sys->p_mux == NULL ) { - msg_Err( p_stream, "cannot create the access out for %s://%s", - access, url ); + msg_Err( p_stream, "cannot create muxer" ); + sout_AccessOutDelete( p_sys->p_grab ); + vlc_mutex_destroy( &p_sys->lock_sdp ); + vlc_mutex_destroy( &p_sys->lock_es ); free( p_sys ); return VLC_EGENERIC; } - p_sys->i_mtu = config_GetInt( p_stream, "mtu" ); /* XXX beurk */ - 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 = - vlc_object_create( p_sout, sizeof( sout_access_out_t ) ); - p_grab->p_module = NULL; - p_grab->p_sout = p_sout; - p_grab->psz_access = strdup( "grab" ); - p_grab->p_cfg = NULL; - p_grab->psz_name = strdup( "" ); - p_grab->p_sys = (sout_access_out_sys_t*)p_stream; - p_grab->pf_seek = NULL; - p_grab->pf_write = AccessOutGrabberWrite; - - /* the muxer */ - if( !( p_sys->p_mux = sout_MuxNew( p_sout, val.psz_string, p_sys->p_grab ) ) ) + + id = Add( p_stream, NULL ); + if( id == NULL ) { - msg_Err( p_stream, "cannot create the muxer (%s)", val.psz_string ); + sout_MuxDelete( p_sys->p_mux ); sout_AccessOutDelete( p_sys->p_grab ); - sout_AccessOutDelete( p_sys->p_access ); + vlc_mutex_destroy( &p_sys->lock_sdp ); + vlc_mutex_destroy( &p_sys->lock_es ); free( p_sys ); return VLC_EGENERIC; } - /* 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. - 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= don't use the localhost address. use fully qualified domain name or IP4 address - p= international phone number (pass via vars?) - c= IP6 support - 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 */ - if( net_AddressIsMulticast( (vlc_object_t *)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'; - } + id->psz_rtpmap = strdup( psz_rtpmap ); + id->i_payload_type = i_payload_type; - 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" - "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 IP%c %s%s\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; - p_sys->ssrc[1] = rand()&0xff; - p_sys->ssrc[2] = rand()&0xff; - p_sys->ssrc[3] = rand()&0xff; - p_sys->i_sequence = rand()&0xffff; - p_sys->i_timestamp_start = rand()&0xffffffff; p_sys->packet = NULL; + + p_stream->pf_add = MuxAdd; + p_stream->pf_del = MuxDel; + p_stream->pf_send = MuxSend; } else { p_sys->p_mux = NULL; - p_sys->p_access = NULL; p_sys->p_grab = NULL; - } - free( val.psz_string ); + p_stream->pf_add = Add; + p_stream->pf_del = Del; + p_stream->pf_send = Send; + } - var_Get( p_stream, SOUT_CFG_PREFIX "sdp", &val ); - if( *val.psz_string ) + psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "sdp" ); + if( psz != NULL ) { - sout_cfg_t *p_cfg; + config_chain_t *p_cfg; - SDPHandleUrl( p_stream, val.psz_string ); + SDPHandleUrl( p_stream, psz ); for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next ) { @@ -599,14 +501,15 @@ static int Open( vlc_object_t *p_this ) if( p_cfg->psz_value == NULL || *p_cfg->psz_value == '\0' ) continue; - if( !strcmp( p_cfg->psz_value, val.psz_string ) ) /* needed both :sout-rtp-sdp= and rtp{sdp=} can be used */ + /* needed both :sout-rtp-sdp= and rtp{sdp=} can be used */ + if( !strcmp( p_cfg->psz_value, psz ) ) continue; SDPHandleUrl( p_stream, p_cfg->psz_value ); } } + free( psz ); } - free( val.psz_string ); /* update p_sout->i_out_pace_nocontrol */ p_stream->p_sout->i_out_pace_nocontrol++; @@ -627,68 +530,48 @@ static void Close( vlc_object_t * p_this ) if( p_sys->p_mux ) { + assert( p_sys->i_es == 1 ); + Del( p_stream, p_sys->es[0] ); + sout_MuxDelete( p_sys->p_mux ); - sout_AccessOutDelete( p_sys->p_access ); sout_AccessOutDelete( p_sys->p_grab ); if( p_sys->packet ) { 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] ); - } + if( p_sys->rtsp != NULL ) + RtspUnsetup( p_sys->rtsp ); vlc_mutex_destroy( &p_sys->lock_sdp ); + vlc_mutex_destroy( &p_sys->lock_es ); 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( 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; - } - if( p_sys->psz_sdp ) + + free( p_sys->psz_session_name ); + free( p_sys->psz_session_description ); + free( p_sys->psz_session_url ); + free( p_sys->psz_session_email ); + free( p_sys->psz_sdp ); + + if( p_sys->b_export_sdp_file ) { - free( p_sys->psz_sdp ); - p_sys->psz_sdp = NULL; +#ifdef HAVE_UNISTD_H + unlink( p_sys->psz_sdp_file ); +#endif + free( p_sys->psz_sdp_file ); } + free( p_sys->psz_destination ); free( p_sys ); } @@ -706,29 +589,38 @@ static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url ) if( p_sys->p_httpd_file ) { msg_Err( p_stream, "you can use sdp=http:// only once" ); - return; + goto out; } if( HttpSetup( p_stream, &url ) ) { - msg_Err( p_stream, "cannot export sdp as http" ); + msg_Err( p_stream, "cannot export SDP as HTTP" ); } } else if( url.psz_protocol && !strcasecmp( url.psz_protocol, "rtsp" ) ) { - if( p_sys->p_rtsp_url ) + if( p_sys->rtsp != NULL ) { msg_Err( p_stream, "you can use sdp=rtsp:// only once" ); - return; + goto out; + } + + /* FIXME test if destination is multicast or no destination at all */ + p_sys->rtsp = RtspSetup( p_stream, &url ); + if( p_sys->rtsp == NULL ) + { + msg_Err( p_stream, "cannot export SDP as RTSP" ); } - /* FIXME test if destination is multicast or no destination at all FIXME */ - if( RtspSetup( p_stream, &url ) ) + if( p_sys->p_mux != NULL ) { - msg_Err( p_stream, "cannot export sdp as rtsp" ); + sout_stream_id_t *id = p_sys->es[0]; + id->rtsp_id = RtspAddId( p_sys->rtsp, id, 0, + p_sys->psz_destination, p_sys->i_ttl, + id->i_port, id->i_port + 1 ); } } - else if( ( url.psz_protocol && !strcasecmp( url.psz_protocol, "sap" ) ) || + else if( ( url.psz_protocol && !strcasecmp( url.psz_protocol, "sap" ) ) || ( url.psz_host && !strcasecmp( url.psz_host, "sap" ) ) ) { p_sys->b_export_sap = VLC_TRUE; @@ -739,7 +631,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 use sdp=file:// only once" ); - return; + goto out; } p_sys->b_export_sdp_file = VLC_TRUE; psz_url = &psz_url[5]; @@ -752,6 +644,8 @@ static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url ) msg_Warn( p_stream, "unknown protocol for SDP (%s)", url.psz_protocol ); } + +out: vlc_UrlClean( &url ); } @@ -771,13 +665,30 @@ static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url ) 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( const sout_stream_t *p_stream, - const char *psz_destination, vlc_bool_t b_rtsp ) +/*static*/ +char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url ) { - sout_stream_sys_t *p_sys = p_stream->p_sys; - int i_size; + const sout_stream_sys_t *p_sys = p_stream->p_sys; + size_t i_size; + const char *psz_destination = p_sys->psz_destination; char *psz_sdp, *p, ipv; int i; + /* + * When we have a fixed destination (typically when we do multicast), + * we need to put the actual port numbers in the SDP. + * When there is no fixed destination, we only support RTSP unicast + * on-demand setup, so we should rather let the clients decide which ports + * to use. + * When there is both a fixed destination and RTSP unicast, we need to + * put port numbers used by the fixed destination, otherwise the SDP would + * become totally incorrect for multicast use. It should be noted that + * port numbers from SDP with RTSP are only "recommendation" from the + * server to the clients (per RFC2326), so only broken clients will fail + * to handle this properly. There is no solution but to use two differents + * output chain with two different RTSP URLs if you need to handle this + * scenario. + */ + int inclport = (psz_destination != NULL); /* FIXME: breaks IP version check on unknown destination */ if( psz_destination == NULL ) @@ -789,8 +700,11 @@ static char *SDPGenerate( const sout_stream_t *p_stream, 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( "t=0 0\r\n" ) + + sizeof( "b=RR:0\r\n" ) + sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) + + sizeof( "a=recvonly\r\n" ) + + sizeof( "a=type:broadcast\r\n" ) + sizeof( "c=IN IP4 */*\r\n" ) + 20 + 10 + strlen( psz_destination ) ; for( i = 0; i < p_sys->i_es; i++ ) @@ -798,6 +712,10 @@ static char *SDPGenerate( const sout_stream_t *p_stream, 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; @@ -806,23 +724,19 @@ static char *SDPGenerate( const sout_stream_t *p_stream, { i_size += strlen( "a=fmtp:* *\r\n" ) + strlen( id->psz_fmtp ) + 10; } - if( b_rtsp ) + if( rtsp_url != NULL ) { - i_size += strlen( "a=control:*/trackID=*\r\n" ) + strlen( p_sys->psz_rtsp_control ) + 10; + i_size += strlen( "a=control:*/trackID=*\r\n" ) + strlen( rtsp_url ) + 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 IP%c %s\r\n", + p += sprintf( p, "o=- "I64Fu" %d IN IP%c %s\r\n", p_sys->i_sdp_id, p_sys->i_sdp_version, - ipv, ipv == '6' ? "::" : "127.0.0.1" ); + 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 ) @@ -832,39 +746,42 @@ static char *SDPGenerate( const sout_stream_t *p_stream, if( *p_sys->psz_session_email ) p += sprintf( p, "e=%s\r\n", p_sys->psz_session_email ); - p += sprintf( p, "t=0 0\r\n" ); /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */ + 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, "a=recvonly\r\n" ); + p += sprintf( p, "a=type:broadcast\r\n" ); p += sprintf( p, "c=IN IP%c %s", ipv, psz_destination ); - if( net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) ) - { - /* Add the ttl if it is a multicast address */ - /* FIXME: 1 is not a correct default value in the case of IPv6 */ - p += sprintf( p, "/%d\r\n", p_sys->i_ttl ?: 1 ); - } - else + if( ( ipv == 4 ) + && net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) ) { - p += sprintf( p, "\r\n" ); + /* 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" ); + p += sprintf( p, "b=RR:0\r\n" ); for( i = 0; i < p_sys->i_es; i++ ) { sout_stream_id_t *id = p_sys->es[i]; + const char *mime_major; /* major MIME type */ if( id->i_cat == AUDIO_ES ) - { - p += sprintf( p, "m=audio %d RTP/AVP %d\r\n", - id->i_port, id->i_payload_type ); - } - else if( id->i_cat == VIDEO_ES ) - { - p += sprintf( p, "m=video %d RTP/AVP %d\r\n", - id->i_port, id->i_payload_type ); - } + mime_major = "audio"; + else + if( id->i_cat == VIDEO_ES ) + mime_major = "video"; else - { continue; + + p += sprintf( p, "m=%s %d RTP/AVP %d\r\n", mime_major, + inclport * id->i_port, id->i_payload_type ); + + if ( id->i_bitrate ) + { + p += sprintf(p,"b=AS:%d\r\n",id->i_bitrate); } if( id->psz_rtpmap ) { @@ -876,22 +793,17 @@ static char *SDPGenerate( const sout_stream_t *p_stream, p += sprintf( p, "a=fmtp:%d %s\r\n", id->i_payload_type, id->psz_fmtp ); } - if( b_rtsp ) + if( rtsp_url != NULL ) { - p += sprintf( p, "a=control:trackID=%d\r\n", 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; } /***************************************************************************** - * + * RTP mux *****************************************************************************/ static int rtp_packetize_l16 ( sout_stream_t *, sout_stream_id_t *, block_t * ); static int rtp_packetize_l8 ( sout_stream_t *, sout_stream_id_t *, block_t * ); @@ -902,6 +814,7 @@ 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 ) @@ -917,50 +830,42 @@ static void sprintf_hexa( char *s, uint8_t *p_data, int i_data ) s[2*i_data] = '\0'; } + +/** Add an ES as a new RTP stream */ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) { - sout_instance_t *p_sout = p_stream->p_sout; + /* NOTE: As a special case, if we use a non-RTP + * mux (TS/PS), then p_fmt is NULL. */ sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_t *id; - sout_access_out_t *p_access = NULL; - int i_port; + int i_port, cscov = -1; char *psz_sdp; - if( p_sys->p_mux != NULL ) - { - sout_input_t *p_input = NULL; - if( ( p_input = sout_MuxAddStream( p_sys->p_mux, p_fmt ) ) == NULL ) - { - msg_Err( p_stream, "cannot add this stream to the muxer" ); - return NULL; - } - - id = malloc( sizeof( sout_stream_id_t ) ); - memset( id, 0, sizeof( sout_stream_id_t ) ); - id->p_access = NULL; - id->p_input = p_input; - id->pf_packetize= NULL; - id->p_rtsp_url = NULL; - id->i_port = 0; - return id; - } - + id = vlc_object_create( p_stream, sizeof( sout_stream_id_t ) ); + if( id == NULL ) + return NULL; /* Choose the port */ i_port = 0; + if( p_fmt == NULL ) + ; + else if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 ) { i_port = p_sys->i_port_audio; p_sys->i_port_audio = 0; } - else if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 ) + else + if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 ) { i_port = p_sys->i_port_video; p_sys->i_port_video = 0; } + while( i_port == 0 ) { - if( p_sys->i_port != p_sys->i_port_audio && p_sys->i_port != p_sys->i_port_video ) + if( p_sys->i_port != p_sys->i_port_audio + && p_sys->i_port != p_sys->i_port_video ) { i_port = p_sys->i_port; p_sys->i_port += 2; @@ -969,50 +874,75 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) p_sys->i_port += 2; } - if( p_sys->psz_destination ) + id->p_stream = p_stream; + + id->i_timestamp_start = rand()&0xffffffff; + id->i_sequence = rand()&0xffff; + id->i_payload_type = p_sys->i_payload_type; + id->ssrc[0] = rand()&0xff; + id->ssrc[1] = rand()&0xff; + id->ssrc[2] = rand()&0xff; + id->ssrc[3] = rand()&0xff; + + id->psz_rtpmap = NULL; + id->psz_fmtp = NULL; + id->i_clock_rate = 90000; /* most common case */ + id->i_port = i_port; + if( p_fmt != NULL ) { - char access[17]; - char url[NI_MAXHOST + 8]; + id->i_cat = p_fmt->i_cat; + id->i_bitrate = p_fmt->i_bitrate/1000; /* Stream bitrate in kbps */ + } + else + { + id->i_cat = VIDEO_ES; + id->i_bitrate = 0; + } - /* first try to create the access out */ - if( p_sys->i_ttl ) - { - snprintf( access, sizeof( access ), "udp{raw,ttl=%d}", - p_sys->i_ttl ); - access[sizeof( access ) - 1] = '\0'; - } - else - strcpy( access, "udp{raw}" ); + id->pf_packetize = NULL; + id->i_mtu = config_GetInt( p_stream, "mtu" ); + if( id->i_mtu <= 12 + 16 ) + id->i_mtu = 576 - 20 - 8; /* pessimistic */ + + msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu ); + + vlc_mutex_init( p_stream, &id->lock_sink ); + id->sinkc = 0; + id->sinkv = NULL; + id->rtsp_id = NULL; + + id->i_caching = + (int64_t)1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "caching"); + id->p_fifo = block_FifoNew( p_stream ); + + if( vlc_thread_create( id, "RTP send thread", ThreadSend, + VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) ) + { + vlc_mutex_destroy( &id->lock_sink ); + vlc_object_destroy( id ); + return NULL; + } - 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_sys->psz_destination != NULL ) + { + int ttl = (p_sys->i_ttl > 0) ? p_sys->i_ttl : -1; + int fd = net_ConnectDgram( p_stream, p_sys->psz_destination, + i_port, ttl, p_sys->proto ); - if( ( p_access = sout_AccessOutNew( p_sout, access, url ) ) == NULL ) + if( fd == -1 ) { - msg_Err( p_stream, "cannot create the access out for %s://%s", - access, url ); + msg_Err( p_stream, "cannot create RTP socket" ); + vlc_thread_join( id ); + vlc_mutex_destroy( &id->lock_sink ); + vlc_object_destroy( id ); return NULL; } - msg_Dbg( p_stream, "access out %s:%s", access, url ); + rtp_add_sink( id, fd ); } - /* not create the rtp specific stuff */ - id = malloc( sizeof( sout_stream_id_t ) ); - memset( id, 0, sizeof( sout_stream_id_t ) ); - id->p_stream = p_stream; - id->p_access = p_access; - id->p_input = NULL; - id->psz_rtpmap = NULL; - id->psz_fmtp = NULL; - id->psz_destination = p_sys->psz_destination ? strdup( p_sys->psz_destination ) : NULL; - id->i_port = i_port; - id->p_rtsp_url = NULL; - vlc_mutex_init( p_stream, &id->lock_rtsp ); - id->i_rtsp_access = 0; - id->rtsp_access = NULL; - + if( p_fmt == NULL ) + ; + else switch( p_fmt->i_codec ) { case VLC_FOURCC( 's', '1', '6', 'b' ): @@ -1025,84 +955,130 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) { id->i_payload_type = 10; } - else - { - id->i_payload_type = p_sys->i_payload_type++; - } - id->psz_rtpmap = malloc( strlen( "L16/*/*" ) + 20+1 ); - sprintf( id->psz_rtpmap, "L16/%d/%d", p_fmt->audio.i_rate, - p_fmt->audio.i_channels ); + if( asprintf( &id->psz_rtpmap, "L16/%d/%d", p_fmt->audio.i_rate, + p_fmt->audio.i_channels ) == -1 ) + id->psz_rtpmap = NULL; id->i_clock_rate = p_fmt->audio.i_rate; id->pf_packetize = rtp_packetize_l16; break; case VLC_FOURCC( 'u', '8', ' ', ' ' ): - id->i_payload_type = p_sys->i_payload_type++; - id->psz_rtpmap = malloc( strlen( "L8/*/*" ) + 20+1 ); - sprintf( id->psz_rtpmap, "L8/%d/%d", p_fmt->audio.i_rate, - p_fmt->audio.i_channels ); + if( asprintf( &id->psz_rtpmap, "L8/%d/%d", p_fmt->audio.i_rate, + p_fmt->audio.i_channels ) == -1 ) + id->psz_rtpmap = NULL; id->i_clock_rate = p_fmt->audio.i_rate; id->pf_packetize = rtp_packetize_l8; break; case VLC_FOURCC( 'm', 'p', 'g', 'a' ): id->i_payload_type = 14; - id->i_clock_rate = 90000; id->psz_rtpmap = strdup( "MPA/90000" ); id->pf_packetize = rtp_packetize_mpa; break; case VLC_FOURCC( 'm', 'p', 'g', 'v' ): id->i_payload_type = 32; - id->i_clock_rate = 90000; id->psz_rtpmap = strdup( "MPV/90000" ); id->pf_packetize = rtp_packetize_mpv; break; case VLC_FOURCC( 'a', '5', '2', ' ' ): - id->i_payload_type = p_sys->i_payload_type++; - id->i_clock_rate = 90000; id->psz_rtpmap = strdup( "ac3/90000" ); id->pf_packetize = rtp_packetize_ac3; break; case VLC_FOURCC( 'H', '2', '6', '3' ): - id->i_payload_type = p_sys->i_payload_type++; - id->i_clock_rate = 90000; id->psz_rtpmap = strdup( "H263-1998/90000" ); id->pf_packetize = rtp_packetize_h263; break; + case VLC_FOURCC( 'h', '2', '6', '4' ): + 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( !memcmp (p_buffer + i_offset, "\x00\x00\x00\x01", 4 ) ) + { + /* 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 ) == -1 ) ) + id->psz_fmtp = NULL; + free( p_64_sps ); + free( p_64_pps ); + } + if( !id->psz_fmtp ) + id->psz_fmtp = strdup( "packetization-mode=1" ); + break; case VLC_FOURCC( 'm', 'p', '4', 'v' ): { char hexa[2*p_fmt->i_extra +1]; - id->i_payload_type = p_sys->i_payload_type++; - id->i_clock_rate = 90000; id->psz_rtpmap = strdup( "MP4V-ES/90000" ); id->pf_packetize = rtp_packetize_split; if( p_fmt->i_extra > 0 ) { - id->psz_fmtp = malloc( 100 + 2 * p_fmt->i_extra ); sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra ); - sprintf( id->psz_fmtp, - "profile-level-id=3; config=%s;", hexa ); + if( asprintf( &id->psz_fmtp, + "profile-level-id=3; config=%s;", hexa ) == -1 ) + id->psz_fmtp = NULL; } break; } case VLC_FOURCC( 'm', 'p', '4', 'a' ): { - id->i_payload_type = p_sys->i_payload_type++; id->i_clock_rate = p_fmt->audio.i_rate; 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 ); + if( asprintf( &id->psz_rtpmap, "mpeg4-generic/%d", + p_fmt->audio.i_rate ) == -1 ) + id->psz_rtpmap = NULL; 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( asprintf( &id->psz_fmtp, + "streamtype=5; profile-level-id=15; " + "mode=AAC-hbr; config=%s; SizeLength=13; " + "IndexLength=3; IndexDeltaLength=3; Profile=1;", + hexa ) == -1 ) + id->psz_fmtp = NULL; } else { @@ -1124,83 +1100,63 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) config[4]=0x3f; config[5]=0xc0; - asprintf( &id->psz_rtpmap, "MP4A-LATM/%d/%d", - p_fmt->audio.i_rate, p_fmt->audio.i_channels ); + if( asprintf( &id->psz_rtpmap, "MP4A-LATM/%d/%d", + p_fmt->audio.i_rate, + p_fmt->audio.i_channels ) == -1) + id->psz_rtpmap = NULL; 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 ); + if( asprintf( &id->psz_fmtp, "profile-level-id=15; " + "object=2; cpresent=0; config=%s", hexa ) == -1 ) + id->psz_fmtp = NULL; } 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; + 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; + 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 ); + if( id->sinkc > 0 ) + rtp_del_sink( id, id->sinkv[0].rtp_fd ); + vlc_thread_join( id ); + vlc_mutex_destroy( &id->lock_sink ); + vlc_object_destroy( id ); return NULL; } - id->i_cat = p_fmt->i_cat; - - id->ssrc[0] = rand()&0xff; - id->ssrc[1] = rand()&0xff; - id->ssrc[2] = rand()&0xff; - id->ssrc[3] = rand()&0xff; - id->i_sequence = rand()&0xffff; - id->i_timestamp_start = rand()&0xffffffff; - - id->i_mtu = config_GetInt( p_stream, "mtu" ); /* XXX beuk */ - if( id->i_mtu <= 16 + MTU_REDUCE ) - { - /* better than nothing */ - id->i_mtu = 1500; - } - 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 ); - 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( cscov != -1 ) + cscov += 8 /* UDP */ + 12 /* RTP */; + if( id->sinkc > 0 ) + net_SetCSCov( id->sinkv[0].rtp_fd, cscov, -1 ); - if( id->p_rtsp_url ) - { - httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_SETUP, RtspCallbackId, (void*)id ); - //httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_PLAY, RtspCallback, (void*)p_stream ); - //httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_PAUSE, RtspCallback, (void*)p_stream ); - } - } + if( id->i_payload_type == p_sys->i_payload_type ) + p_sys->i_payload_type++; + if( p_sys->rtsp != NULL ) + id->rtsp_id = RtspAddId( p_sys->rtsp, id, p_sys->i_es, + p_sys->psz_destination, + p_sys->i_ttl, id->i_port, id->i_port + 1 ); /* Update p_sys context */ vlc_mutex_lock( &p_sys->lock_es ); TAB_APPEND( p_sys->i_es, p_sys->es, id ); vlc_mutex_unlock( &p_sys->lock_es ); - psz_sdp = SDPGenerate( p_stream, p_sys->psz_destination, VLC_FALSE ); + psz_sdp = SDPGenerate( p_stream, NULL ); vlc_mutex_lock( &p_sys->lock_sdp ); free( p_sys->psz_sdp ); @@ -1209,12 +1165,13 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) p_sys->i_sdp_version++; - msg_Dbg( p_stream, "sdp=%s", p_sys->psz_sdp ); + msg_Dbg( p_stream, "sdp=\n%s", p_sys->psz_sdp ); /* Update SDP (sap/file) */ if( p_sys->b_export_sap ) SapSetup( p_stream ); if( p_sys->b_export_sdp_file ) FileSetup( p_stream ); + vlc_object_attach( id, p_stream ); return id; } @@ -1222,6 +1179,8 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) { sout_stream_sys_t *p_sys = p_stream->p_sys; + vlc_object_kill( id ); + vlc_mutex_lock( &p_sys->lock_es ); TAB_REMOVE( p_sys->i_es, p_sys->es, id ); vlc_mutex_unlock( &p_sys->lock_es ); @@ -1235,36 +1194,24 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) p_sys->i_port_video = id->i_port; } - if( id->p_access ) - { - if( id->psz_rtpmap ) - { - free( id->psz_rtpmap ); - } - if( id->psz_fmtp ) - { - free( id->psz_fmtp ); - } - if( id->psz_destination ) - free( id->psz_destination ); - sout_AccessOutDelete( id->p_access ); - } - else if( id->p_input ) - { - sout_MuxDeleteStream( p_sys->p_mux, id->p_input ); - } - if( id->p_rtsp_url ) - { - httpd_UrlDelete( id->p_rtsp_url ); - } - vlc_mutex_destroy( &id->lock_rtsp ); - if( id->rtsp_access ) free( id->rtsp_access ); + free( id->psz_rtpmap ); + free( id->psz_fmtp ); + + if( id->rtsp_id ) + RtspDelId( p_sys->rtsp, id->rtsp_id ); + if( id->sinkc > 0 ) + rtp_del_sink( id, id->sinkv[0].rtp_fd ); /* sink for explicit dst= */ + + vlc_thread_join( id ); + vlc_mutex_destroy( &id->lock_sink ); + block_FifoRelease( id->p_fifo ); /* Update SDP (sap/file) */ 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 ); + vlc_object_detach( id ); + vlc_object_destroy( id ); return VLC_SUCCESS; } @@ -1273,110 +1220,17 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, { block_t *p_next; - if( p_stream->p_sys->p_mux ) - { - sout_MuxSendBuffer( p_stream->p_sys->p_mux, id->p_input, p_buffer ); - } - else - { - while( p_buffer ) - { - p_next = p_buffer->p_next; - if( id->pf_packetize( p_stream, id, p_buffer ) ) - { - break; - } - block_Release( p_buffer ); - p_buffer = p_next; - } - } - return VLC_SUCCESS; -} - - -static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, - block_t *p_buffer ) -{ - sout_stream_sys_t *p_sys = p_stream->p_sys; - - int64_t i_dts = p_buffer->i_dts; - uint32_t i_timestamp = i_dts * 9 / 100; - - uint8_t *p_data = p_buffer->p_buffer; - unsigned int i_data = p_buffer->i_buffer; - unsigned int i_max = p_sys->i_mtu - 12; - - unsigned i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max; - - while( i_data > 0 ) - { - unsigned int i_size; - - /* output complete packet */ - if( p_sys->packet && - p_sys->packet->i_buffer + i_data > i_max ) - { - sout_AccessOutWrite( p_sys->p_access, p_sys->packet ); - p_sys->packet = NULL; - } - - if( p_sys->packet == NULL ) - { - /* allocate a new packet */ - p_sys->packet = block_New( p_stream, p_sys->i_mtu ); - p_sys->packet->p_buffer[ 0] = 0x80; - p_sys->packet->p_buffer[ 1] = 0x80|p_sys->i_payload_type; - p_sys->packet->p_buffer[ 2] = ( p_sys->i_sequence >> 8)&0xff; - p_sys->packet->p_buffer[ 3] = ( p_sys->i_sequence )&0xff; - p_sys->packet->p_buffer[ 4] = ( i_timestamp >> 24 )&0xff; - p_sys->packet->p_buffer[ 5] = ( i_timestamp >> 16 )&0xff; - p_sys->packet->p_buffer[ 6] = ( i_timestamp >> 8 )&0xff; - p_sys->packet->p_buffer[ 7] = ( i_timestamp )&0xff; - p_sys->packet->p_buffer[ 8] = p_sys->ssrc[0]; - p_sys->packet->p_buffer[ 9] = p_sys->ssrc[1]; - p_sys->packet->p_buffer[10] = p_sys->ssrc[2]; - p_sys->packet->p_buffer[11] = p_sys->ssrc[3]; - p_sys->packet->i_buffer = 12; - - p_sys->packet->i_dts = i_dts; - p_sys->packet->i_length = p_buffer->i_length / i_packet; - i_dts += p_sys->packet->i_length; - - p_sys->i_sequence++; - } - - 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 ); - - p_sys->packet->i_buffer += i_size; - p_data += i_size; - i_data -= i_size; - } - - return VLC_SUCCESS; -} + assert( p_stream->p_sys->p_mux == NULL ); -static int AccessOutGrabberWrite( sout_access_out_t *p_access, - block_t *p_buffer ) -{ - sout_stream_t *p_stream = (sout_stream_t*)p_access->p_sys; - - //fprintf( stderr, "received buffer size=%d\n", p_buffer->i_buffer ); - // - while( p_buffer ) + while( p_buffer != NULL ) { - block_t *p_next; - - AccessOutGrabberWriteBuffer( p_stream, p_buffer ); - p_next = p_buffer->p_next; + if( id->pf_packetize( p_stream, id, p_buffer ) ) + break; + block_Release( p_buffer ); p_buffer = p_next; } - return VLC_SUCCESS; } @@ -1387,7 +1241,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 = sout_AnnounceMethodCreate( METHOD_TYPE_SAP ); + announce_method_t *p_method = sout_SAPMethod(); /* Remove the previous session */ if( p_sys->p_session != NULL) @@ -1399,12 +1253,13 @@ static int SapSetup( sout_stream_t *p_stream ) 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; } @@ -1423,7 +1278,7 @@ static int FileSetup( sout_stream_t *p_stream ) return VLC_EGENERIC; } - fprintf( f, "%s", p_sys->psz_sdp ); + fputs( p_sys->psz_sdp, f ); fclose( f ); return VLC_SUCCESS; @@ -1440,7 +1295,8 @@ 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 > 0 ? url->i_port : 80 ); + 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, @@ -1480,373 +1336,105 @@ static int HttpCallback( httpd_file_sys_t *p_args, } /**************************************************************************** - * RTSP: + * RTP send ****************************************************************************/ -static rtsp_client_t *RtspClientNew( sout_stream_t *p_stream, char *psz_session ) +static void ThreadSend( vlc_object_t *p_this ) { - rtsp_client_t *rtsp = malloc( sizeof( rtsp_client_t )); - - rtsp->psz_session = psz_session; - rtsp->i_last = 0; - rtsp->b_playing = VLC_FALSE; - rtsp->i_id = 0; - rtsp->id = NULL; - rtsp->i_access = 0; - rtsp->access = NULL; + sout_stream_id_t *id = (sout_stream_id_t *)p_this; + unsigned i_caching = id->i_caching; +#ifdef HAVE_TEE + int fd[5] = { -1, -1, -1, -1, -1 }; - TAB_APPEND( p_stream->p_sys->i_rtsp, p_stream->p_sys->rtsp, rtsp ); + if( pipe( fd ) ) + fd[0] = fd[1] = -1; + else + if( pipe( fd ) ) + fd[2] = fd[3] = -1; + else + fd[4] = open( "/dev/null", O_WRONLY ); +#endif - return rtsp; -} -static rtsp_client_t *RtspClientGet( sout_stream_t *p_stream, char *psz_session ) -{ - int i; + while( !id->b_die ) + { + block_t *out = block_FifoGet( id->p_fifo ); + mtime_t i_date = out->i_dts + i_caching; + ssize_t len = out->i_buffer; - if( psz_session ) return NULL; +#ifdef HAVE_TEE + if( fd[4] != -1 ) + len = write( fd[1], out->p_buffer, len); + if( len == -1 ) + continue; /* Uho - should not happen */ +#endif + mwait( i_date ); - for( i = 0; i < p_stream->p_sys->i_rtsp; i++ ) - { - if( !strcmp( p_stream->p_sys->rtsp[i]->psz_session, psz_session ) ) + vlc_mutex_lock( &id->lock_sink ); + for( int i = 0; i < id->sinkc; i++ ) { - return p_stream->p_sys->rtsp[i]; + SendRTCP( id->sinkv[i].rtcp, out ); + +#ifdef HAVE_TEE + tee( fd[0], fd[3], len, 0 ); + if( splice( fd[2], NULL, id->sinkv[i].rtp_fd, NULL, len, + SPLICE_F_NONBLOCK ) >= 0 ) + continue; + + /* splice failed */ + splice( fd[2], NULL, fd[4], NULL, len, 0 ); +#endif + send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 ); } - } - return NULL; -} + vlc_mutex_unlock( &id->lock_sink ); -static void RtspClientDel( sout_stream_t *p_stream, rtsp_client_t *rtsp ) -{ - int i; - TAB_REMOVE( p_stream->p_sys->i_rtsp, p_stream->p_sys->rtsp, rtsp ); - - for( i = 0; i < rtsp->i_access; i++ ) - { - sout_AccessOutDelete( rtsp->access[i] ); + block_Release( out ); +#ifdef HAVE_TEE + splice( fd[0], NULL, fd[4], NULL, len, 0 ); +#endif } - if( rtsp->id ) free( rtsp->id ); - if( rtsp->access ) free( rtsp->access ); - free( rtsp->psz_session ); - free( rtsp ); +#ifdef HAVE_TEE + for( unsigned i = 0; i < 5; i++ ) + close( fd[i] ); +#endif } -static int RtspSetup( sout_stream_t *p_stream, vlc_url_t *url ) +static inline void rtp_packetize_send( sout_stream_id_t *id, block_t *out ) { - sout_stream_sys_t *p_sys = p_stream->p_sys; - - 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 ) - { - return VLC_EGENERIC; - } - - p_sys->psz_rtsp_path = strdup( url->psz_path ? url->psz_path : "/" ); - p_sys->psz_rtsp_control = malloc (strlen( url->psz_host ) + 20 + strlen( p_sys->psz_rtsp_path ) + 1 ); - 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, NULL ); - if( p_sys->p_rtsp_url == 0 ) - { - return VLC_EGENERIC; - } - httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_DESCRIBE, RtspCallback, (void*)p_stream ); - httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_PLAY, RtspCallback, (void*)p_stream ); - httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_PAUSE, RtspCallback, (void*)p_stream ); - httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_TEARDOWN, RtspCallback, (void*)p_stream ); - - return VLC_SUCCESS; + block_FifoPut( id->p_fifo, out ); } -static int RtspCallback( httpd_callback_sys_t *p_args, - httpd_client_t *cl, - httpd_message_t *answer, httpd_message_t *query ) +int rtp_add_sink( sout_stream_id_t *id, int fd ) { - 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_cseq = NULL; - int i_cseq = 0; - - if( answer == NULL || query == NULL ) - { - return VLC_SUCCESS; - } - //fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type ); - - answer->i_proto = HTTPD_PROTO_RTSP; - answer->i_version= query->i_version; - answer->i_type = HTTPD_MSG_ANSWER; - - switch( query->i_type ) - { - case HTTPD_MSG_DESCRIBE: - { - char *psz_sdp = SDPGenerate( p_stream, psz_destination ? psz_destination : "0.0.0.0", VLC_TRUE ); - - answer->i_status = 200; - answer->psz_status = strdup( "OK" ); - httpd_MsgAdd( answer, "Content-type", "%s", "application/sdp" ); - - answer->p_body = (uint8_t *)psz_sdp; - answer->i_body = strlen( psz_sdp ); - break; - } - - case HTTPD_MSG_PLAY: - { - rtsp_client_t *rtsp; - /* for now only multicast so easy */ - answer->i_status = 200; - answer->psz_status = strdup( "OK" ); - answer->i_body = 0; - answer->p_body = NULL; - - psz_session = httpd_MsgGet( query, "Session" ); - rtsp = RtspClientGet( p_stream, psz_session ); - if( rtsp && !rtsp->b_playing ) - { - int i_id; - /* FIXME */ - rtsp->b_playing = VLC_TRUE; - - vlc_mutex_lock( &p_sys->lock_es ); - for( i_id = 0; i_id < rtsp->i_id; i_id++ ) - { - sout_stream_id_t *id = rtsp->id[i_id]; - int i; - - for( i = 0; i < p_sys->i_es; i++ ) - { - if( id == p_sys->es[i] ) - break; - } - if( i >= p_sys->i_es ) continue; - - vlc_mutex_lock( &id->lock_rtsp ); - TAB_APPEND( id->i_rtsp_access, id->rtsp_access, rtsp->access[i_id] ); - vlc_mutex_unlock( &id->lock_rtsp ); - } - vlc_mutex_unlock( &p_sys->lock_es ); - } - break; - } - case HTTPD_MSG_PAUSE: - /* FIXME */ - return VLC_EGENERIC; - case HTTPD_MSG_TEARDOWN: - { - rtsp_client_t *rtsp; - - /* for now only multicast so easy again */ - answer->i_status = 200; - answer->psz_status = strdup( "OK" ); - answer->i_body = 0; - answer->p_body = NULL; - - psz_session = httpd_MsgGet( query, "Session" ); - rtsp = RtspClientGet( p_stream, psz_session ); - if( rtsp ) - { - int i_id; - - vlc_mutex_lock( &p_sys->lock_es ); - for( i_id = 0; i_id < rtsp->i_id; i_id++ ) - { - sout_stream_id_t *id = rtsp->id[i_id]; - int i; - - for( i = 0; i < p_sys->i_es; i++ ) - { - if( id == p_sys->es[i] ) - break; - } - if( i >= p_sys->i_es ) continue; - - vlc_mutex_lock( &id->lock_rtsp ); - TAB_REMOVE( id->i_rtsp_access, id->rtsp_access, rtsp->access[i_id] ); - vlc_mutex_unlock( &id->lock_rtsp ); - } - vlc_mutex_unlock( &p_sys->lock_es ); - - RtspClientDel( p_stream, rtsp ); - } - break; - } - - default: - return VLC_EGENERIC; - } - httpd_MsgAdd( answer, "Server", PACKAGE_STRING ); - httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); - 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 ); - } + rtp_sink_t sink = { fd, NULL }; + sink.rtcp = OpenRTCP( VLC_OBJECT( id->p_stream ), fd, IPPROTO_UDP ); + if( sink.rtcp == NULL ) + msg_Err( id, "RTCP failed!" ); + + vlc_mutex_lock( &id->lock_sink ); + INSERT_ELEM( id->sinkv, id->sinkc, id->sinkc, sink ); + vlc_mutex_unlock( &id->lock_sink ); return VLC_SUCCESS; } -static int RtspCallbackId( httpd_callback_sys_t *p_args, - httpd_client_t *cl, - httpd_message_t *answer, httpd_message_t *query ) +void rtp_del_sink( sout_stream_id_t *id, int fd ) { - 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_cseq = NULL; - int i_cseq = 0; + rtp_sink_t sink = { fd, NULL }; - - if( answer == NULL || query == NULL ) - { - return VLC_SUCCESS; - } - //fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type ); - - answer->i_proto = HTTPD_PROTO_RTSP; - answer->i_version= query->i_version; - answer->i_type = HTTPD_MSG_ANSWER; - - switch( query->i_type ) + /* NOTE: must be safe to use if fd is not included */ + vlc_mutex_lock( &id->lock_sink ); + for( int i = 0; i < id->sinkc; i++ ) { - case HTTPD_MSG_SETUP: + if (id->sinkv[i].rtp_fd == fd) { - char *psz_transport = httpd_MsgGet( query, "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" ); - 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 ) - { - psz_session = malloc( 100 ); - sprintf( psz_session, "%d", rand() ); - } - 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 ); - } - 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[NI_MAXNUMERICHOST], psz_access[17], psz_url[NI_MAXNUMERICHOST + 8]; - - sout_access_out_t *p_access; - - rtsp_client_t *rtsp = NULL; - - if( httpd_ClientIP( cl, ip ) == NULL ) - { - 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 ); - - psz_session = httpd_MsgGet( query, "Session" ); - if( !psz_session ) - { - psz_session = malloc( 100 ); - sprintf( psz_session, "%d", rand() ); - - rtsp = RtspClientNew( p_stream, psz_session ); - } - else - { - rtsp = RtspClientGet( p_stream, psz_session ); - if( rtsp == NULL ) - { - answer->i_status = 454; - answer->psz_status = strdup( "Unknown session id" ); - answer->i_body = 0; - answer->p_body = NULL; - break; - } - } - - /* first try to create the access out */ - if( p_sys->i_ttl ) - snprintf( psz_access, sizeof( psz_access ), - "udp{raw,ttl=%d}", p_sys->i_ttl ); - else - 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 = 500; - answer->psz_status = strdup( "Internal server error" ); - answer->i_body = 0; - answer->p_body = NULL; - break; - } - - TAB_APPEND( rtsp->i_id, rtsp->id, id ); - TAB_APPEND( rtsp->i_access, rtsp->access, p_access ); - - answer->i_status = 200; - answer->psz_status = strdup( "OK" ); - answer->i_body = 0; - answer->p_body = NULL; - - httpd_MsgAdd( answer, "Transport", - "RTP/AVP/UDP;client_port=%d-%d", i_port, i_port + 1 ); - } - else /* TODO strstr( psz_transport, "interleaved" ) ) */ - { - answer->i_status = 461; - answer->psz_status = strdup( "Unsupported Transport" ); - answer->i_body = 0; - answer->p_body = NULL; - } + sink = id->sinkv[i]; + REMOVE_ELEM( id->sinkv, id->sinkc, i ); break; } - - default: - return VLC_EGENERIC; } - httpd_MsgAdd( answer, "Server", "VLC Server" ); - httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); - 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" ); + vlc_mutex_unlock( &id->lock_sink ); - if( psz_session ) - { - httpd_MsgAdd( answer, "Session", "%s"/*;timeout=5*/, psz_session ); - } - return VLC_SUCCESS; + CloseRTCP( sink.rtcp ); + net_Close( sink.rtp_fd ); } /**************************************************************************** @@ -1866,35 +1454,12 @@ static void rtp_packetize_common( sout_stream_id_t *id, block_t *out, out->p_buffer[6] = ( i_timestamp >> 8 )&0xff; out->p_buffer[7] = ( i_timestamp )&0xff; - out->p_buffer[ 8] = id->ssrc[0]; - out->p_buffer[ 9] = id->ssrc[1]; - out->p_buffer[10] = id->ssrc[2]; - out->p_buffer[11] = id->ssrc[3]; + memcpy( out->p_buffer + 8, id->ssrc, 4 ); out->i_buffer = 12; id->i_sequence++; } -static void rtp_packetize_send( sout_stream_id_t *id, block_t *out ) -{ - int i; - vlc_mutex_lock( &id->lock_rtsp ); - for( i = 0; i < id->i_rtsp_access; i++ ) - { - sout_AccessOutWrite( id->rtsp_access[i], block_Duplicate( out ) ); - } - vlc_mutex_unlock( &id->lock_rtsp ); - - if( id->p_access ) - { - sout_AccessOutWrite( id->p_access, out ); - } - else - { - block_Release( out ); - } -} - static int rtp_packetize_mpa( sout_stream_t *p_stream, sout_stream_id_t *id, block_t *in ) { @@ -2228,6 +1793,7 @@ static int rtp_packetize_l8( sout_stream_t *p_stream, sout_stream_id_t *id, return VLC_SUCCESS; } + static int rtp_packetize_mp4a( sout_stream_t *p_stream, sout_stream_id_t *id, block_t *in ) { @@ -2334,6 +1900,118 @@ 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; + + /* 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 ) { @@ -2372,3 +2050,137 @@ static int rtp_packetize_amr( sout_stream_t *p_stream, sout_stream_id_t *id, return VLC_SUCCESS; } + +/***************************************************************************** + * Non-RTP mux + *****************************************************************************/ + +/** Add an ES to a non-RTP muxed stream */ +static sout_stream_id_t *MuxAdd( sout_stream_t *p_stream, es_format_t *p_fmt ) +{ + sout_input_t *p_input; + sout_mux_t *p_mux = p_stream->p_sys->p_mux; + assert( p_mux != NULL ); + + p_input = sout_MuxAddStream( p_mux, p_fmt ); + if( p_input == NULL ) + { + msg_Err( p_stream, "cannot add this stream to the muxer" ); + return NULL; + } + + return (sout_stream_id_t *)p_input; +} + + +static int MuxSend( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *p_buffer ) +{ + sout_mux_t *p_mux = p_stream->p_sys->p_mux; + assert( p_mux != NULL ); + + sout_MuxSendBuffer( p_mux, (sout_input_t *)id, p_buffer ); + return VLC_SUCCESS; +} + + +/** Remove an ES from a non-RTP muxed stream */ +static int MuxDel( sout_stream_t *p_stream, sout_stream_id_t *id ) +{ + sout_mux_t *p_mux = p_stream->p_sys->p_mux; + assert( p_mux != NULL ); + + sout_MuxDeleteStream( p_mux, (sout_input_t *)id ); + return VLC_SUCCESS; +} + + +static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, + const block_t *p_buffer ) +{ + sout_stream_sys_t *p_sys = p_stream->p_sys; + sout_stream_id_t *id = p_sys->es[0]; + + int64_t i_dts = p_buffer->i_dts; + + uint8_t *p_data = p_buffer->p_buffer; + unsigned int i_data = p_buffer->i_buffer; + unsigned int i_max = id->i_mtu - 12; + + unsigned i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max; + + while( i_data > 0 ) + { + unsigned int i_size; + + /* output complete packet */ + if( p_sys->packet && + p_sys->packet->i_buffer + i_data > i_max ) + { + rtp_packetize_send( id, p_sys->packet ); + p_sys->packet = NULL; + } + + if( p_sys->packet == NULL ) + { + /* allocate a new packet */ + p_sys->packet = block_New( p_stream, id->i_mtu ); + rtp_packetize_common( id, p_sys->packet, 1, i_dts ); + p_sys->packet->i_dts = i_dts; + p_sys->packet->i_length = p_buffer->i_length / i_packet; + i_dts += p_sys->packet->i_length; + } + + i_size = __MIN( i_data, + (unsigned)(id->i_mtu - p_sys->packet->i_buffer) ); + + memcpy( &p_sys->packet->p_buffer[p_sys->packet->i_buffer], + p_data, i_size ); + + p_sys->packet->i_buffer += i_size; + p_data += i_size; + i_data -= i_size; + } + + return VLC_SUCCESS; +} + + +static int AccessOutGrabberWrite( sout_access_out_t *p_access, + block_t *p_buffer ) +{ + sout_stream_t *p_stream = (sout_stream_t*)p_access->p_sys; + + while( p_buffer ) + { + block_t *p_next; + + AccessOutGrabberWriteBuffer( p_stream, p_buffer ); + + p_next = p_buffer->p_next; + block_Release( p_buffer ); + p_buffer = p_next; + } + + return VLC_SUCCESS; +} + + +static sout_access_out_t *GrabberCreate( sout_stream_t *p_stream ) +{ + sout_access_out_t *p_grab; + + p_grab = vlc_object_create( p_stream->p_sout, sizeof( *p_grab ) ); + if( p_grab == NULL ) + return NULL; + + p_grab->p_module = NULL; + p_grab->p_sout = p_stream->p_sout; + p_grab->psz_access = strdup( "grab" ); + p_grab->p_cfg = NULL; + 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; + return p_grab; +}