X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fstream_out%2Frtp.c;h=97b25f3d3b21e4073aa417c537cf30d55fcc164d;hb=4ad888b98b97ba5d0d2d3b181d83e3cf3cd500b3;hp=2d422af0a9e9db3884a75af7d7c680991fc13095;hpb=b1f091085c1e83553865d8daf0dc1b71a233adfd;p=vlc diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index 2d422af0a9..97b25f3d3b 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -18,65 +18,87 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#include "config.h" +#ifdef HAVE_UNISTD_H +# include +#endif #include #include -#include -#include +#include +#include + +#include +#include +#include +#include +#include -#include "vlc_httpd.h" -#include "network.h" +#include "rtp.h" /***************************************************************************** * 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 * ); @@ -114,9 +136,12 @@ vlc_module_begin(); add_integer( SOUT_CFG_PREFIX "port-video", 1232, NULL, PORT_VIDEO_TEXT, PORT_VIDEO_LONGTEXT, VLC_TRUE ); - add_integer( SOUT_CFG_PREFIX "ttl", 1, NULL, TTL_TEXT, + 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(); @@ -125,7 +150,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 * ); @@ -133,118 +158,6 @@ static int Del ( sout_stream_t *, sout_stream_id_t * ); static int Send( sout_stream_t *, sout_stream_id_t *, block_t* ); -/* For unicast/interleaved streaming */ -typedef struct -{ - char *psz_session; - int64_t i_last; /* for timeout */ - - /* is it in "play" state */ - vlc_bool_t b_playing; - - /* output (id-access) */ - int i_id; - sout_stream_id_t **id; - int i_access; - sout_access_out_t **access; -} rtsp_client_t; - -struct sout_stream_sys_t -{ - /* sdp */ - int64_t i_sdp_id; - int i_sdp_version; - char *psz_sdp; - vlc_mutex_t lock_sdp; - - char *psz_session_name; - char *psz_session_description; - char *psz_session_url; - char *psz_session_email; - - /* */ - vlc_bool_t b_export_sdp_file; - char *psz_sdp_file; - /* sap */ - vlc_bool_t b_export_sap; - session_descriptor_t *p_session; - - 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; - - /* */ - char *psz_destination; - int i_port; - int i_port_audio; - int i_port_video; - int i_ttl; - - /* when need to use a private one or when using muxer */ - int i_payload_type; - - /* 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 * ); - -struct sout_stream_id_t -{ - sout_stream_t *p_stream; - /* rtp field */ - uint8_t i_payload_type; - uint16_t i_sequence; - uint32_t i_timestamp_start; - 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; - - /* Packetizer specific fields */ - pf_rtp_packetizer_t pf_packetize; - int i_mtu; - - /* for sending the packets */ - sout_access_out_t *p_access; - - 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; -}; - static int AccessOutGrabberWrite( sout_access_out_t *, block_t * ); static void SDPHandleUrl( sout_stream_t *, char * ); @@ -252,17 +165,6 @@ 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: @@ -271,20 +173,19 @@ 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 ) ); + 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" ); @@ -311,38 +212,34 @@ 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 == NULL ) + { + 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; } else if( p_sys->i_port <= 0 ) { @@ -351,14 +248,20 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } - var_Get( p_stream, SOUT_CFG_PREFIX "ttl", &val ); - if( ( val.i_int > 255 ) || ( val.i_int < 0 ) ) + p_sys->i_ttl = var_GetInteger( p_stream, SOUT_CFG_PREFIX "ttl" ); + if( p_sys->i_ttl == 0 ) { - msg_Err( p_stream, "illegal TTL %d", val.i_int ); - free( p_sys ); - return VLC_EGENERIC; + /* 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. */ + p_sys->i_ttl = config_GetInt( p_stream, "ttl" ); } - p_sys->i_ttl = val.i_int; + if( p_sys->i_ttl > 255 ) + p_sys->i_ttl = 255; + /* must not exceed 999 once formatted */ + + p_sys->b_latm = var_GetBool( p_stream, SOUT_CFG_PREFIX "mp4a-latm" ); p_sys->i_payload_type = 96; p_sys->i_es = 0; @@ -395,17 +298,25 @@ static int Open( vlc_object_t *p_this ) if( *val.psz_string ) { sout_access_out_t *p_grab; - char *psz_rtpmap, url[NI_MAXHOST + 8], access[17], psz_ttl[5], ipv; + const char *psz_rtpmap; + char url[NI_MAXHOST + 8], access[22], psz_ttl[5], ipv; - if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' ) + if( b_rtsp ) { - msg_Err( p_stream, "rtp needs a destination when muxing" ); + msg_Err( p_stream, "muxing is not supported in RTSP mode" ); + free( p_sys ); + return VLC_EGENERIC; + } + else if( p_sys->psz_destination == NULL ) + { + 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 ) ) + if( !strncasecmp( val.psz_string, "ps", 2 ) + || !strncasecmp( val.psz_string, "mpeg1", 5 ) ) { psz_rtpmap = "MP2P/90000"; } @@ -424,25 +335,27 @@ static int Open( vlc_object_t *p_this ) /* create the access out */ if( p_sys->i_ttl > 0 ) { - sprintf( access, "udp{raw,ttl=%d}", p_sys->i_ttl ); + sprintf( access, "udp{raw,rtcp,ttl=%d}", p_sys->i_ttl ); } else { - sprintf( access, "udp{raw}" ); + strcat( access, "udp{raw,rtcp}" ); } - /* 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'; + /* IPv6 needs brackets if not already present */ + if ((ipv == '6') && (p_sys->psz_destination[0] != '[')) + snprintf (url, sizeof (url), "[%s]:%d",p_sys->psz_destination, + p_sys->i_port); + else + snprintf (url, sizeof (url), "%s:%d",p_sys->psz_destination, + p_sys->i_port); + if( !( p_sys->p_access = sout_AccessOutNew( p_sout, access, url ) ) ) { msg_Err( p_stream, "cannot create the access out for %s://%s", @@ -451,11 +364,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 = @@ -464,7 +378,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; @@ -480,20 +394,15 @@ 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 - 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 */ - if( net_AddressIsMulticast( (vlc_object_t *)p_stream, p_sys->psz_destination ) ) + 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'; @@ -511,9 +420,11 @@ static int Open( vlc_object_t *p_this ) "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" - "c=IN IP%c %s%s\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, @@ -525,7 +436,7 @@ static int Open( vlc_object_t *p_this ) ipv, p_sys->psz_destination, psz_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 ); + msg_Dbg( p_stream, "sdp=%s", p_sys->psz_sdp ); /* create the rtp context */ p_sys->ssrc[0] = rand()&0xff; @@ -548,7 +459,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 ); @@ -559,7 +470,8 @@ 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, val.psz_string ) ) continue; SDPHandleUrl( p_stream, p_cfg->psz_value ); @@ -594,58 +506,46 @@ 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] ); - } + RtspUnsetup( p_stream ); 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 ); } + free( p_sys->psz_destination ); free( p_sys ); } @@ -662,7 +562,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; } @@ -675,7 +575,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; } @@ -695,7 +595,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; @@ -728,7 +628,7 @@ 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, +/*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; @@ -747,6 +647,7 @@ static char *SDPGenerate( const sout_stream_t *p_stream, 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( "b=RR:0\r\n" ) + sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) + sizeof( "c=IN IP4 */*\r\n" ) + 20 + 10 + strlen( psz_destination ) ; @@ -755,6 +656,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; @@ -765,9 +670,13 @@ static char *SDPGenerate( const sout_stream_t *p_stream, } 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'; @@ -775,7 +684,7 @@ static char *SDPGenerate( const sout_stream_t *p_stream, p += sprintf( p, "v=0\r\n" ); 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' ? "::" : "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 ) @@ -790,15 +699,14 @@ static char *SDPGenerate( const sout_stream_t *p_stream, p += sprintf( p, "c=IN IP%c %s", ipv, psz_destination ); - if( net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) ) + if( ( ipv == 4 ) + && net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) ) { - /* Add the ttl if it is a multicast address */ - p += sprintf( p, "/%d\r\n", p_sys->i_ttl ); - } - else - { - 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++ ) { @@ -818,6 +726,10 @@ static char *SDPGenerate( const sout_stream_t *p_stream, { 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, @@ -830,9 +742,14 @@ static char *SDPGenerate( const sout_stream_t *p_stream, } 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; } @@ -847,7 +764,9 @@ 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 ) @@ -917,18 +836,18 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) if( p_sys->psz_destination ) { - char access[17]; + char access[22]; char url[NI_MAXHOST + 8]; /* first try to create the access out */ if( p_sys->i_ttl > 0 ) { - snprintf( access, sizeof( access ), "udp{raw,ttl=%d}", + snprintf( access, sizeof( access ), "udp{raw,rtcp,ttl=%d}", p_sys->i_ttl ); access[sizeof( access ) - 1] = '\0'; } else - strcpy( access, "udp{raw}" ); + strcpy( access, "udp{raw,rtcp}" ); snprintf( url, sizeof( url ), (( p_sys->psz_destination[0] != '[' ) && strchr( p_sys->psz_destination, ':' )) ? "[%s]:%d" : "%s:%d", @@ -952,12 +871,12 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) 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; + + vlc_mutex_init( p_stream, &id->lock_sink ); + id->i_sink = 0; + id->sink = NULL; switch( p_fmt->i_codec ) { @@ -1013,6 +932,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( !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 ); + 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' ): { @@ -1033,19 +1010,50 @@ 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' ): @@ -1083,31 +1091,19 @@ 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, NULL ); - - 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 ); - } - } - + RtspAddId( p_stream, id ); /* Update p_sys context */ vlc_mutex_lock( &p_sys->lock_es ); @@ -1123,7 +1119,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 ); @@ -1159,8 +1155,6 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) { free( id->psz_fmtp ); } - if( id->psz_destination ) - free( id->psz_destination ); sout_AccessOutDelete( id->p_access ); } else if( id->p_input ) @@ -1168,14 +1162,13 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) 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 ); + RtspDelId( p_stream, id ); + + vlc_mutex_destroy( &id->lock_sink ); + free( id->sink ); /* 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 ); @@ -1301,7 +1294,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) @@ -1313,12 +1306,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; } @@ -1330,7 +1324,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) ); @@ -1393,359 +1387,6 @@ static int HttpCallback( httpd_file_sys_t *p_args, return VLC_SUCCESS; } -/**************************************************************************** - * RTSP: - ****************************************************************************/ -static rtsp_client_t *RtspClientNew( sout_stream_t *p_stream, char *psz_session ) -{ - 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; - - TAB_APPEND( p_stream->p_sys->i_rtsp, p_stream->p_sys->rtsp, rtsp ); - - return rtsp; -} -static rtsp_client_t *RtspClientGet( sout_stream_t *p_stream, char *psz_session ) -{ - int i; - for( i = 0; i < p_stream->p_sys->i_rtsp; i++ ) - { - if( !strcmp( p_stream->p_sys->rtsp[i]->psz_session, psz_session ) ) - { - return p_stream->p_sys->rtsp[i]; - } - } - return NULL; -} - -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] ); - } - if( rtsp->id ) free( rtsp->id ); - if( rtsp->access ) free( rtsp->access ); - - free( rtsp->psz_session ); - free( rtsp ); -} - -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 ); - - 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; -} - -static int RtspCallback( httpd_callback_sys_t *p_args, - httpd_client_t *cl, - httpd_message_t *answer, httpd_message_t *query ) -{ - 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; - - 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", "VLC Server" ); - httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); - httpd_MsgAdd( answer, "Cseq", "%d", atoi( httpd_MsgGet( query, "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, - 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; - - 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_SETUP: - { - 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 == 0 ) - { - 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 == 0 ) - { - 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 > 0 ) - snprintf( psz_access, sizeof( psz_access ), - "udp{raw,ttl=%d}", p_sys->i_ttl ); - else - strncpy( psz_access, "udp{raw}", sizeof( psz_access ) ); - psz_access[sizeof( psz_access ) - 1] = '\0'; - - 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; - } - break; - } - - default: - return VLC_EGENERIC; - } - 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" ) ) ); - httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" ); - - if( psz_session ) - { - httpd_MsgAdd( answer, "Session", "%s"/*;timeout=5*/, psz_session ); - } - return VLC_SUCCESS; -} - /**************************************************************************** * rtp_packetize_*: ****************************************************************************/ @@ -1775,12 +1416,12 @@ static void rtp_packetize_common( sout_stream_id_t *id, block_t *out, 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++ ) + vlc_mutex_lock( &id->lock_sink ); + for( i = 0; i < id->i_sink; i++ ) { - sout_AccessOutWrite( id->rtsp_access[i], block_Duplicate( out ) ); + sout_AccessOutWrite( id->sink[i], block_Duplicate( out ) ); } - vlc_mutex_unlock( &id->lock_rtsp ); + vlc_mutex_unlock( &id->lock_sink ); if( id->p_access ) { @@ -1792,6 +1433,20 @@ static void rtp_packetize_send( sout_stream_id_t *id, block_t *out ) } } +int rtp_add_sink( sout_stream_id_t *id, sout_access_out_t *access ) +{ + vlc_mutex_lock( &id->lock_sink ); + TAB_APPEND( id->i_sink, id->sink, access ); + vlc_mutex_unlock( &id->lock_sink ); +} + +void rtp_del_sink( sout_stream_id_t *id, sout_access_out_t *access ) +{ + vlc_mutex_lock( &id->lock_sink ); + TAB_REMOVE( id->i_sink, id->sink, access ); + vlc_mutex_unlock( &id->lock_sink ); +} + static int rtp_packetize_mpa( sout_stream_t *p_stream, sout_stream_id_t *id, block_t *in ) { @@ -1933,6 +1588,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 ) { @@ -2003,6 +1659,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 ) { @@ -2176,6 +1886,122 @@ 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 ) { @@ -2197,12 +2023,12 @@ static int rtp_packetize_amr( sout_stream_t *p_stream, sout_stream_id_t *id, (in->i_pts > 0 ? in->i_pts : in->i_dts) ); /* Payload header */ out->p_buffer[12] = 0xF0; /* CMR */ - out->p_buffer[13] = 0x00; /* ToC */ /* FIXME: frame type */ + 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, i_payload ); + memcpy( &out->p_buffer[14], p_data+1, i_payload-1 ); - out->i_buffer = 14 + i_payload; + 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;