X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Frtp.c;h=e03ea10f8e5dfe9cd687f847647ff6026a30d3fb;hb=4ad888b98b97ba5d0d2d3b181d83e3cf3cd500b3;hp=e16374862079fbcc5f190d50078a780cae91e535;hpb=c43fd0523b9c234cc39c5fef62e78fe151adb0aa;p=vlc diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index e163748620..97b25f3d3b 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -1,8 +1,8 @@ /***************************************************************************** - * rtp.c + * rtp.c: rtp stream output module ***************************************************************************** - * Copyright (C) 2003 VideoLAN - * $Id: rtp.c,v 1.4 2003/11/01 06:57:51 fenrir Exp $ + * Copyright (C) 2003-2004 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * @@ -18,95 +18,153 @@ * * 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 "rtp.h" /***************************************************************************** * Module descriptor *****************************************************************************/ + +#define MTU_REDUCE 50 + +#define DST_TEXT N_("Destination") +#define DST_LONGTEXT N_( \ + "This is the output URL that will be used." ) +#define SDP_TEXT N_("SDP") +#define SDP_LONGTEXT N_( \ + "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_( \ + "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_( \ + "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_( \ + "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_( \ + "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_( \ + "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_( \ + "This allows you to specify the base port for the RTP streaming." ) +#define PORT_AUDIO_TEXT N_("Audio port") +#define PORT_AUDIO_LONGTEXT N_( \ + "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_( \ + "This allows you to specify the default video port for the RTP streaming." ) + +#define TTL_TEXT N_("Hop limit (TTL)") +#define TTL_LONGTEXT N_( \ + "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 * ); +#define SOUT_CFG_PREFIX "sout-rtp-" + vlc_module_begin(); - set_description( _("RTP stream") ); + set_shortname( _("RTP")); + set_description( _("RTP stream output") ); set_capability( "sout stream", 0 ); add_shortcut( "rtp" ); + set_category( CAT_SOUT ); + set_subcategory( SUBCAT_SOUT_STREAM ); + + add_string( SOUT_CFG_PREFIX "dst", "", NULL, DST_TEXT, + DST_LONGTEXT, VLC_TRUE ); + add_string( SOUT_CFG_PREFIX "sdp", "", NULL, SDP_TEXT, + SDP_LONGTEXT, VLC_TRUE ); + add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT, + MUX_LONGTEXT, VLC_TRUE ); + + add_string( SOUT_CFG_PREFIX "name", "NONE", NULL, NAME_TEXT, + NAME_LONGTEXT, VLC_TRUE ); + add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT, + DESC_LONGTEXT, VLC_TRUE ); + add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT, + URL_LONGTEXT, VLC_TRUE ); + add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT, + EMAIL_LONGTEXT, VLC_TRUE ); + + add_integer( SOUT_CFG_PREFIX "port", 1234, NULL, PORT_TEXT, + PORT_LONGTEXT, VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "port-audio", 1230, NULL, PORT_AUDIO_TEXT, + PORT_AUDIO_LONGTEXT, VLC_TRUE ); + add_integer( SOUT_CFG_PREFIX "port-video", 1232, NULL, PORT_VIDEO_TEXT, + PORT_VIDEO_LONGTEXT, VLC_TRUE ); + + add_integer( SOUT_CFG_PREFIX "ttl", 0, NULL, TTL_TEXT, + TTL_LONGTEXT, VLC_TRUE ); + + add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT, + RFC3016_LONGTEXT, VLC_FALSE ); + set_callbacks( Open, Close ); vlc_module_end(); /***************************************************************************** * Exported prototypes *****************************************************************************/ -static sout_stream_id_t *Add ( sout_stream_t *, sout_format_t * ); +static const char *ppsz_sout_options[] = { + "dst", "name", "port", "port-audio", "port-video", "*sdp", "ttl", "mux", + "description", "url","email", "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 *, sout_buffer_t* ); +static int Send( sout_stream_t *, sout_stream_id_t *, + block_t* ); +static int AccessOutGrabberWrite( sout_access_out_t *, block_t * ); -struct sout_stream_sys_t -{ - /* sdp */ - int64_t i_sdp_id; - int i_sdp_version; +static void SDPHandleUrl( sout_stream_t *, char * ); - /* */ - char *psz_destination; - int i_port; - 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]; - sout_buffer_t *packet; - - /* */ - int i_es; - sout_stream_id_t **es; - char *psz_sdp; -}; - -typedef int (*pf_rtp_packetizer_t)( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * ); -struct sout_stream_id_t -{ - /* 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; - sout_input_t *p_input; -}; -static int AccessOutGrabberWrite( sout_access_out_t *, sout_buffer_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 * ); /***************************************************************************** * Open: @@ -115,54 +173,154 @@ 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; - char *val; + config_ChainParse( p_stream, SOUT_CFG_PREFIX, + ppsz_sout_options, p_stream->p_cfg ); p_sys = malloc( sizeof( sout_stream_sys_t ) ); - p_sys->psz_destination = sout_cfg_find_value( p_stream->p_cfg, "dst" ); - if( ( val = sout_cfg_find_value( p_stream->p_cfg, "port" ) ) ) + if( p_sys == NULL ) + return VLC_ENOMEM; + + 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" ); + p_sys->psz_session_email = var_GetString( p_stream, SOUT_CFG_PREFIX "email" ); + + p_sys->i_port = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port" ); + p_sys->i_port_audio = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port-audio" ); + p_sys->i_port_video = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port-video" ); + + p_sys->psz_sdp_file = NULL; + + if( p_sys->i_port_audio == p_sys->i_port_video ) { - p_sys->i_port = atoi( val ); + msg_Err( p_stream, "audio and video port cannot be the same" ); + p_sys->i_port_audio = 0; + p_sys->i_port_video = 0; } - if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' || p_sys->i_port <= 0 ) + + if( !p_sys->psz_session_name ) { - msg_Err( p_stream, "invalid/missing dst or port" ); - free( p_sys ); - return VLC_EGENERIC; + if( p_sys->psz_destination ) + p_sys->psz_session_name = strdup( p_sys->psz_destination ); + else + p_sys->psz_session_name = strdup( "NONE" ); + } + + for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next ) + { + if( !strcmp( p_cfg->psz_name, "sdp" ) ) + { + if( p_cfg->psz_value && !strncasecmp( p_cfg->psz_value, "rtsp", 4 ) ) + { + b_rtsp = VLC_TRUE; + break; + } + } } - if( ( val = sout_cfg_find_value( p_stream->p_cfg, "ttl" ) ) ) + if( !b_rtsp ) { - p_sys->i_ttl = atoi( val ); + 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 ); } - else + + 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; + } + } + else if( p_sys->i_port <= 0 ) { + msg_Err( p_stream, "invalid port" ); + free( p_sys ); + return VLC_EGENERIC; + } + + 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. */ p_sys->i_ttl = config_GetInt( p_stream, "ttl" ); } + 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; p_sys->es = NULL; + p_sys->i_rtsp = 0; + p_sys->rtsp = NULL; p_sys->psz_sdp = NULL; p_sys->i_sdp_id = mdate(); p_sys->i_sdp_version = 1; p_sys->psz_sdp = NULL; - if( ( val = sout_cfg_find_value( p_stream->p_cfg, "mux" ) ) ) + p_sys->b_export_sap = VLC_FALSE; + p_sys->b_export_sdp_file = VLC_FALSE; + p_sys->p_session = NULL; + + 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; + + 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 ) { sout_access_out_t *p_grab; + const char *psz_rtpmap; + char url[NI_MAXHOST + 8], access[22], psz_ttl[5], ipv; - char *psz_rtpmap; - char access[100]; - char url[strlen( p_sys->psz_destination ) + 1 + 12 + 1]; + 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 == NULL ) + { + msg_Err( p_stream, "RTP needs a destination when muxing" ); + free( p_sys ); + return VLC_EGENERIC; + } /* Check muxer type */ - if( !strncasecmp( val, "ps", 2 ) || !strncasecmp( val, "mpeg1", 5 ) ) + if( !strncasecmp( val.psz_string, "ps", 2 ) + || !strncasecmp( val.psz_string, "mpeg1", 5 ) ) { psz_rtpmap = "MP2P/90000"; } - else if( !strncasecmp( val, "ts", 2 ) ) + else if( !strncasecmp( val.psz_string, "ts", 2 ) ) { psz_rtpmap = "MP2T/90000"; p_sys->i_payload_type = 33; @@ -170,20 +328,35 @@ static int Open( vlc_object_t *p_this ) else { msg_Err( p_stream, "unsupported muxer type with rtp (only ts/ps)" ); + free( p_sys ); return VLC_EGENERIC; } /* 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}" ); } - sprintf( url, "%s:%d", p_sys->psz_destination, p_sys->i_port ); - if( ( p_sys->p_access = sout_AccessOutNew( p_sout, access, url ) ) == NULL ) + + /* 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", access, url ); @@ -191,49 +364,79 @@ 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 = vlc_object_create( p_sout, sizeof( sout_access_out_t ) ); + 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->psz_path = 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, p_sys->p_grab ) ) == NULL ) + if( !( p_sys->p_mux = sout_MuxNew( p_sout, val.psz_string, p_sys->p_grab ) ) ) { - msg_Err( p_stream, "cannot create the muxer (%s)", val ); + msg_Err( p_stream, "cannot create the muxer (%s)", val.psz_string ); sout_AccessOutDelete( p_sys->p_grab ); sout_AccessOutDelete( p_sys->p_access ); free( p_sys ); return VLC_EGENERIC; } - p_sout->i_preheader = __MAX( p_sout->i_preheader, p_sys->p_mux->i_preheader ); - /* create the SDP only once */ - p_sys->psz_sdp = malloc( 200 + 20 + 10 + strlen( p_sys->psz_destination ) + 10 + 10 + 10 + 10 + strlen( psz_rtpmap ) ); - sprintf( p_sys->psz_sdp, - "v=0\n" - "o=- "I64Fd" %d IN IP4 127.0.0.1\n" - "s=NONE\n" - "c=IN IP4 %s/%d\n" - "m=video %d RTP/AVP %d\n" - "a=rtpmap:%d %s\n", - p_sys->i_sdp_id, p_sys->i_sdp_version, - p_sys->psz_destination, p_sys->i_ttl, - p_sys->i_port, p_sys->i_payload_type, - p_sys->i_payload_type, psz_rtpmap ); + /* create the SDP for a muxed stream (only once) */ + /* 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 garantee uniqueness + o= don't use the localhost address. use fully qualified domain name or IP4 address + a= source-filter: we need our source address + a= x-plgroup: (missing) + RTP packets need to get the correct src IP address */ + if( ipv == '4' + && net_AddressIsMulticast( VLC_OBJECT(p_stream), p_sys->psz_destination ) ) + { + snprintf( psz_ttl, sizeof( psz_ttl ), "/%d", p_sys->i_ttl ); + psz_ttl[sizeof( psz_ttl ) - 1] = '\0'; + } + else + { + psz_ttl[0] = '\0'; + } - fprintf( stderr, "sdp=%s", p_sys->psz_sdp ); + asprintf( &p_sys->psz_sdp, + "v=0\r\n" + /* FIXME: source address not known :( */ + "o=- "I64Fd" %d IN IP%c %s\r\n" + "s=%s\r\n" + "i=%s\r\n" + "u=%s\r\n" + "e=%s\r\n" + "c=IN IP%c %s%s\r\n" + "t=0 0\r\n" /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */ + "a=tool:"PACKAGE_STRING"\r\n" + "a=recvonly\r\n" + "a=type:broadcast\r\n" + "m=video %d RTP/AVP %d\r\n" + "a=rtpmap:%d %s\r\n", + p_sys->i_sdp_id, p_sys->i_sdp_version, + ipv, ipv == '6' ? "::1" : "127.0.0.1" /* FIXME */, + p_sys->psz_session_name, + p_sys->psz_session_description, + p_sys->psz_session_url, + p_sys->psz_session_email, + ipv, p_sys->psz_destination, psz_ttl, + p_sys->i_port, p_sys->i_payload_type, + p_sys->i_payload_type, psz_rtpmap ); + msg_Dbg( p_stream, "sdp=%s", p_sys->psz_sdp ); /* create the rtp context */ p_sys->ssrc[0] = rand()&0xff; @@ -250,12 +453,35 @@ static int Open( vlc_object_t *p_this ) 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; - p_stream->p_sys = p_sys; + var_Get( p_stream, SOUT_CFG_PREFIX "sdp", &val ); + if( *val.psz_string ) + { + config_chain_t *p_cfg; + + SDPHandleUrl( p_stream, val.psz_string ); + + for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next ) + { + if( !strcmp( p_cfg->psz_name, "sdp" ) ) + { + if( p_cfg->psz_value == NULL || *p_cfg->psz_value == '\0' ) + continue; + + /* 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 ); + } + } + } + free( val.psz_string ); + + /* update p_sout->i_out_pace_nocontrol */ + p_stream->p_sout->i_out_pace_nocontrol++; return VLC_SUCCESS; } @@ -268,6 +494,9 @@ static void Close( vlc_object_t * p_this ) sout_stream_t *p_stream = (sout_stream_t*)p_this; sout_stream_sys_t *p_sys = p_stream->p_sys; + /* update p_sout->i_out_pace_nocontrol */ + p_stream->p_sout->i_out_pace_nocontrol--; + if( p_sys->p_mux ) { sout_MuxDelete( p_sys->p_mux ); @@ -275,54 +504,209 @@ static void Close( vlc_object_t * p_this ) sout_AccessOutDelete( p_sys->p_grab ); if( p_sys->packet ) { - sout_BufferDelete( p_stream->p_sout, p_sys->packet ); + block_Release( p_sys->packet ); + } + if( p_sys->b_export_sap ) + { + p_sys->p_mux = NULL; + SapSetup( p_stream ); } } + 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->psz_session_name ) + free( p_sys->psz_session_name ); + + if( p_sys->psz_session_description ) + free( p_sys->psz_session_description ); + + if( p_sys->psz_session_url ) + free( p_sys->psz_session_url ); + + if( p_sys->psz_session_email ) + free( p_sys->psz_session_email ); + 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 ); } +/***************************************************************************** + * SDPHandleUrl: + *****************************************************************************/ +static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url ) +{ + sout_stream_sys_t *p_sys = p_stream->p_sys; + vlc_url_t url; + + vlc_UrlParse( &url, psz_url, 0 ); + if( url.psz_protocol && !strcasecmp( url.psz_protocol, "http" ) ) + { + if( p_sys->p_httpd_file ) + { + msg_Err( p_stream, "you can use sdp=http:// only once" ); + return; + } + + if( HttpSetup( p_stream, &url ) ) + { + 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 ) + { + msg_Err( p_stream, "you can use sdp=rtsp:// only once" ); + return; + } + + /* FIXME test if destination is multicast or no destination at all FIXME */ + if( RtspSetup( p_stream, &url ) ) + { + msg_Err( p_stream, "cannot export sdp as rtsp" ); + } + } + 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; + SapSetup( p_stream ); + } + else if( url.psz_protocol && !strcasecmp( url.psz_protocol, "file" ) ) + { + if( p_sys->b_export_sdp_file ) + { + msg_Err( p_stream, "you can use sdp=file:// only once" ); + return; + } + p_sys->b_export_sdp_file = VLC_TRUE; + psz_url = &psz_url[5]; + if( psz_url[0] == '/' && psz_url[1] == '/' ) + psz_url += 2; + p_sys->psz_sdp_file = strdup( psz_url ); + } + else + { + msg_Warn( p_stream, "unknown protocol for SDP (%s)", + url.psz_protocol ); + } + vlc_UrlClean( &url ); +} + /***************************************************************************** * SDPGenerate *****************************************************************************/ -static void SDPGenerate( sout_stream_t *p_stream ) + /* 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 */ +/*static*/ char *SDPGenerate( const sout_stream_t *p_stream, + const char *psz_destination, vlc_bool_t b_rtsp ) { sout_stream_sys_t *p_sys = p_stream->p_sys; int i_size; - char *psz_sdp, *p; + char *psz_sdp, *p, ipv; int i; - i_size = strlen( "v=0\n" ) + - strlen( "o=- * * IN IP4 127.0.0.1\n" ) + - strlen( "s=NONE\n" ) + - strlen( "c=IN IP4 */*\n" ) + - strlen( p_sys->psz_destination ) + - 20 + 10 + 10 + 1; + /* FIXME: breaks IP version check on unknown destination */ + if( psz_destination == NULL ) + psz_destination = "0.0.0.0"; + + i_size = sizeof( "v=0\r\n" ) + + sizeof( "o=- * * IN IP4 127.0.0.1\r\n" ) + 10 + 10 + + sizeof( "s=*\r\n" ) + strlen( p_sys->psz_session_name ) + + sizeof( "i=*\r\n" ) + strlen( p_sys->psz_session_description ) + + sizeof( "u=*\r\n" ) + strlen( p_sys->psz_session_url ) + + sizeof( "e=*\r\n" ) + strlen( p_sys->psz_session_email ) + + sizeof( "t=0 0\r\n" ) + /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */ + sizeof( "b=RR:0\r\n" ) + + sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) + + sizeof( "c=IN IP4 */*\r\n" ) + 20 + 10 + + strlen( psz_destination ) ; for( i = 0; i < p_sys->i_es; i++ ) { sout_stream_id_t *id = p_sys->es[i]; - i_size += strlen( "m=**d*o * RTP/AVP *\n" ) + 10 + 10; - + 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:* *\n" ) + strlen( id->psz_rtpmap )+10; + i_size += strlen( "a=rtpmap:* *\r\n" ) + strlen( id->psz_rtpmap )+10; } if( id->psz_fmtp ) { - i_size += strlen( "a=fmtp:* *\n" ) + strlen( id->psz_fmtp ) + 10; + i_size += strlen( "a=fmtp:* *\r\n" ) + strlen( id->psz_fmtp ) + 10; + } + if( b_rtsp ) + { + i_size += strlen( "a=control:*/trackID=*\r\n" ) + strlen( p_sys->psz_rtsp_control ) + 10; } } + if( p_sys->p_mux ) + { + i_size += strlen( "m=video %d RTP/AVP %d\r\n" ) +10 +10; + } + + ipv = ( strchr( psz_destination, ':' ) != NULL ) ? '6' : '4'; p = psz_sdp = malloc( i_size ); - p += sprintf( p, "v=0\n" ); - p += sprintf( p, "o=- "I64Fd" %d IN IP4 127.0.0.1\n", p_sys->i_sdp_id, p_sys->i_sdp_version ); - p += sprintf( p, "s=NONE\n" ); - p += sprintf( p, "c=IN IP4 %s/%d\n", p_sys->psz_destination, p_sys->i_ttl ); + 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' ? "::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 ) + p += sprintf( p, "i=%s\r\n", p_sys->psz_session_description ); + if( *p_sys->psz_session_url ) + p += sprintf( p, "u=%s\r\n", p_sys->psz_session_url ); + 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, "a=tool:"PACKAGE_STRING"\r\n" ); + + p += sprintf( p, "c=IN IP%c %s", ipv, psz_destination ); + + if( ( ipv == 4 ) + && net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) ) + { + /* Add the deprecated TTL field if it is an IPv4 multicast address */ + p += sprintf( p, "/%d", p_sys->i_ttl ?: 1 ); + } + p += sprintf( p, "\r\n" ); + p += sprintf( p, "b=RR:0\r\n" ); for( i = 0; i < p_sys->i_es; i++ ) { @@ -330,74 +714,82 @@ static void SDPGenerate( sout_stream_t *p_stream ) if( id->i_cat == AUDIO_ES ) { - p += sprintf( p, "m=audio %d RTP/AVP %d\n", + 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\n", + p += sprintf( p, "m=video %d RTP/AVP %d\r\n", id->i_port, id->i_payload_type ); } else { 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\n", id->i_payload_type, id->psz_rtpmap ); + p += sprintf( p, "a=rtpmap:%d %s\r\n", id->i_payload_type, + id->psz_rtpmap ); } if( id->psz_fmtp ) { - p += sprintf( p, "a=fmtp:%d %s\n", id->i_payload_type, id->psz_fmtp ); + p += sprintf( p, "a=fmtp:%d %s\r\n", id->i_payload_type, + id->psz_fmtp ); + } + if( b_rtsp ) + { + p += sprintf( p, "a=control:/trackID=%d\r\n", i ); } } - - p = p_sys->psz_sdp; - p_sys->psz_sdp = psz_sdp; /* I hope this avoid a lock (when we export it by http) */ - - if( p ) + if( p_sys->p_mux ) { - free( p ); + p += sprintf( p, "m=video %d RTP/AVP %d\r\n", + p_sys->i_port, p_sys->i_payload_type ); } - p_sys->i_sdp_version++; - fprintf( stderr, "sdp=%s", p_sys->psz_sdp ); + return psz_sdp; } /***************************************************************************** * *****************************************************************************/ - -static int rtp_packetize_l16 ( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * ); -static int rtp_packetize_l8 ( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * ); -static int rtp_packetize_mpa ( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * ); -static int rtp_packetize_mpv ( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * ); -static int rtp_packetize_ac3 ( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * ); -static int rtp_packetize_split( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * ); -static int rtp_packetize_mp4a ( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * ); +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 * ); +static int rtp_packetize_mpa ( sout_stream_t *, sout_stream_id_t *, block_t * ); +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 ) { - static const char hex[16] = "0123456789ABCDEF"; + static const char hex[16] = "0123456789abcdef"; int i; for( i = 0; i < i_data; i++ ) { - s[2*i+0] = hex[(p_data[i]>>8)&0xf]; + s[2*i+0] = hex[(p_data[i]>>4)&0xf]; s[2*i+1] = hex[(p_data[i] )&0xf]; } s[2*i_data] = '\0'; } -static sout_stream_id_t * Add ( sout_stream_t *p_stream, sout_format_t *p_fmt ) +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; sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_t *id; sout_access_out_t *p_access = NULL; - - char access[100]; - char url[strlen( p_sys->psz_destination ) + 1 + 12 + 1]; + int i_port; + char *psz_sdp; if( p_sys->p_mux != NULL ) { @@ -409,47 +801,92 @@ static sout_stream_id_t * Add ( sout_stream_t *p_stream, sout_format_t *p_f } 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; } - /* first try to create the access out */ - if( p_sys->i_ttl > 0 ) + + /* Choose the port */ + i_port = 0; + if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 ) { - sprintf( access, "udp{raw,ttl=%d}", p_sys->i_ttl ); + i_port = p_sys->i_port_audio; + p_sys->i_port_audio = 0; } - else + else if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 ) { - sprintf( access, "udp{raw}" ); + 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 ) + { + i_port = p_sys->i_port; + p_sys->i_port += 2; + break; + } + p_sys->i_port += 2; } - sprintf( url, "%s:%d", p_sys->psz_destination, p_sys->i_port ); - if( ( p_access = sout_AccessOutNew( p_sout, access, url ) ) == NULL ) + + if( p_sys->psz_destination ) { - msg_Err( p_stream, "cannot create the access out for %s://%s", - access, url ); - return NULL; + 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,rtcp,ttl=%d}", + p_sys->i_ttl ); + access[sizeof( access ) - 1] = '\0'; + } + else + strcpy( access, "udp{raw,rtcp}" ); + + snprintf( url, sizeof( url ), (( p_sys->psz_destination[0] != '[' ) && + strchr( p_sys->psz_destination, ':' )) ? "[%s]:%d" : "%s:%d", + p_sys->psz_destination, i_port ); + url[sizeof( url ) - 1] = '\0'; + + if( ( p_access = sout_AccessOutNew( p_sout, access, url ) ) == NULL ) + { + msg_Err( p_stream, "cannot create the access out for %s://%s", + access, url ); + return NULL; + } + msg_Dbg( p_stream, "access out %s:%s", access, url ); } /* 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 = strdup( p_sys->psz_destination ); - id->i_port = p_sys->i_port; + id->i_port = i_port; + id->p_rtsp_url = NULL; - switch( p_fmt->i_fourcc ) + vlc_mutex_init( p_stream, &id->lock_sink ); + id->i_sink = 0; + id->sink = NULL; + + switch( p_fmt->i_codec ) { case VLC_FOURCC( 's', '1', '6', 'b' ): - if( p_fmt->i_channels == 1 && p_fmt->i_sample_rate == 44100 ) + if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 44100 ) { id->i_payload_type = 11; } - else if( p_fmt->i_channels == 2 && p_fmt->i_sample_rate == 44100 ) + else if( p_fmt->audio.i_channels == 2 && + p_fmt->audio.i_rate == 44100 ) { id->i_payload_type = 10; } @@ -458,15 +895,17 @@ static sout_stream_id_t * Add ( sout_stream_t *p_stream, sout_format_t *p_f 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->i_sample_rate, p_fmt->i_channels ); - id->i_clock_rate = p_fmt->i_sample_rate; + sprintf( id->psz_rtpmap, "L16/%d/%d", p_fmt->audio.i_rate, + p_fmt->audio.i_channels ); + 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->i_sample_rate, p_fmt->i_channels ); - id->i_clock_rate = p_fmt->i_sample_rate; + sprintf( id->psz_rtpmap, "L8/%d/%d", p_fmt->audio.i_rate, + p_fmt->audio.i_channels ); + id->i_clock_rate = p_fmt->audio.i_rate; id->pf_packetize = rtp_packetize_l8; break; case VLC_FOURCC( 'm', 'p', 'g', 'a' ): @@ -487,42 +926,160 @@ static sout_stream_id_t * Add ( sout_stream_t *p_stream, sout_format_t *p_f 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->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' ): { - char hexa[2*p_fmt->i_extra_data +1]; + 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_data > 0 ) + if( p_fmt->i_extra > 0 ) { - id->psz_fmtp = malloc( 100 + 2 * p_fmt->i_extra_data ); - sprintf_hexa( hexa, p_fmt->p_extra_data, p_fmt->i_extra_data ); + 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 ); + "profile-level-id=3; config=%s;", hexa ); } break; } case VLC_FOURCC( 'm', 'p', '4', 'a' ): { - char hexa[2*p_fmt->i_extra_data +1]; - id->i_payload_type = p_sys->i_payload_type++; - id->i_clock_rate = p_fmt->i_sample_rate; - id->psz_rtpmap = malloc( strlen( "mpeg4-generic/" ) + 12 ); - sprintf( id->psz_rtpmap, "mpeg4-generic/%d", p_fmt->i_sample_rate ); - id->pf_packetize = rtp_packetize_mp4a; - id->psz_fmtp = malloc( 200 + 2 * p_fmt->i_extra_data ); - sprintf_hexa( hexa, p_fmt->p_extra_data, p_fmt->i_extra_data ); - sprintf( id->psz_fmtp, - "streamtype=5; profile-level-id=15; mode=AAC-hbr; config=%s; " - "SizeLength=13; IndexLength=3; IndexDeltaLength=3; Profile=1;", hexa ); + 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 ); + id->pf_packetize = rtp_packetize_mp4a; + id->psz_fmtp = malloc( 200 + 2 * p_fmt->i_extra ); + sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra ); + sprintf( id->psz_fmtp, + "streamtype=5; profile-level-id=15; mode=AAC-hbr; " + "config=%s; SizeLength=13;IndexLength=3; " + "IndexDeltaLength=3; Profile=1;", hexa ); + } + else + { + char hexa[13]; + int i; + unsigned char config[6]; + unsigned int aacsrates[15] = { + 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, + 16000, 12000, 11025, 8000, 7350, 0, 0 }; + + for( i = 0; i < 15; i++ ) + if( p_fmt->audio.i_rate == aacsrates[i] ) + break; + + config[0]=0x40; + config[1]=0; + config[2]=0x20|i; + config[3]=p_fmt->audio.i_channels<<4; + config[4]=0x3f; + config[5]=0xc0; + + asprintf( &id->psz_rtpmap, "MP4A-LATM/%d/%d", + p_fmt->audio.i_rate, p_fmt->audio.i_channels ); + id->pf_packetize = rtp_packetize_mp4a_latm; + sprintf_hexa( hexa, config, 6 ); + asprintf( &id->psz_fmtp, "profile-level-id=15; " + "object=2; cpresent=0; config=%s", hexa ); + } break; } + case VLC_FOURCC( 's', 'a', 'm', 'r' ): + id->i_payload_type = p_sys->i_payload_type++; + id->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ? + "AMR/8000/2" : "AMR/8000" ); + id->psz_fmtp = strdup( "octet-align=1" ); + id->i_clock_rate = p_fmt->audio.i_rate; + id->pf_packetize = rtp_packetize_amr; + break; + case VLC_FOURCC( 's', 'a', 'w', 'b' ): + id->i_payload_type = p_sys->i_payload_type++; + id->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ? + "AMR-WB/16000/2" : "AMR-WB/16000" ); + id->psz_fmtp = strdup( "octet-align=1" ); + id->i_clock_rate = p_fmt->audio.i_rate; + id->pf_packetize = rtp_packetize_amr; + break; default: - msg_Err( p_stream, "cannot add this stream (unsupported codec:%4.4s)", (char*)&p_fmt->i_fourcc ); + msg_Err( p_stream, "cannot add this stream (unsupported " + "codec:%4.4s)", (char*)&p_fmt->i_codec ); + if( p_access ) + { + sout_AccessOutDelete( p_access ); + } free( id ); return NULL; } @@ -534,33 +1091,59 @@ static sout_stream_id_t * Add ( sout_stream_t *p_stream, sout_format_t *p_f 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; } + id->i_mtu -= MTU_REDUCE; + msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu ); - msg_Dbg( p_stream, "access out %s:%s mtu=%d", access, url, id->i_mtu ); + if( p_sys->p_rtsp_url ) + RtspAddId( p_stream, id ); /* Update p_sys context */ - /* update port used (2 -> 1 rtp, 1 rtcp )*/ + vlc_mutex_lock( &p_sys->lock_es ); TAB_APPEND( p_sys->i_es, p_sys->es, id ); - if( p_sys->p_mux == NULL ) - { - p_sys->i_port += 2; - SDPGenerate( p_stream ); - } + vlc_mutex_unlock( &p_sys->lock_es ); + + psz_sdp = SDPGenerate( p_stream, p_sys->psz_destination, VLC_FALSE ); + + vlc_mutex_lock( &p_sys->lock_sdp ); + free( p_sys->psz_sdp ); + p_sys->psz_sdp = psz_sdp; + vlc_mutex_unlock( &p_sys->lock_sdp ); + + p_sys->i_sdp_version++; + + msg_Dbg( p_stream, "sdp=%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 ); return id; } -static int Del ( sout_stream_t *p_stream, sout_stream_id_t *id ) +static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) { sout_stream_sys_t *p_sys = p_stream->p_sys; + vlc_mutex_lock( &p_sys->lock_es ); TAB_REMOVE( p_sys->i_es, p_sys->es, id ); + vlc_mutex_unlock( &p_sys->lock_es ); + + /* Release port */ + if( id->i_port > 0 ) + { + if( id->i_cat == AUDIO_ES && p_sys->i_port_audio == 0 ) + p_sys->i_port_audio = id->i_port; + else if( id->i_cat == VIDEO_ES && p_sys->i_port_video == 0 ) + p_sys->i_port_video = id->i_port; + } if( id->p_access ) { @@ -572,20 +1155,30 @@ static int Del ( sout_stream_t *p_stream, sout_stream_id_t *id ) { free( id->psz_fmtp ); } - 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 ) + RtspDelId( p_stream, id ); + + vlc_mutex_destroy( &id->lock_sink ); + free( id->sink ); + + /* 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 ); return VLC_SUCCESS; } -static int Send ( sout_stream_t *p_stream, sout_stream_id_t *id, sout_buffer_t *p_buffer ) +static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *p_buffer ) { - sout_buffer_t *p_next; + block_t *p_next; if( p_stream->p_sys->p_mux ) { @@ -600,14 +1193,16 @@ static int Send ( sout_stream_t *p_stream, sout_stream_id_t *id, sout_bu { break; } - sout_BufferDelete( p_stream->p_sout, p_buffer ); + block_Release( p_buffer ); p_buffer = p_next; } } return VLC_SUCCESS; } -static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, sout_buffer_t *p_buffer ) + +static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, + block_t *p_buffer ) { sout_stream_sys_t *p_sys = p_stream->p_sys; @@ -615,10 +1210,10 @@ static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, sout_buffer_t * uint32_t i_timestamp = i_dts * 9 / 100; uint8_t *p_data = p_buffer->p_buffer; - unsigned int i_data = p_buffer->i_size; + unsigned int i_data = p_buffer->i_buffer; unsigned int i_max = p_sys->i_mtu - 12; - int i_packet = ( p_buffer->i_size + i_max - 1 ) / i_max; + unsigned i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max; while( i_data > 0 ) { @@ -626,7 +1221,7 @@ static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, sout_buffer_t * /* output complete packet */ if( p_sys->packet && - p_sys->packet->i_size + i_data > i_max ) + p_sys->packet->i_buffer + i_data > i_max ) { sout_AccessOutWrite( p_sys->p_access, p_sys->packet ); p_sys->packet = NULL; @@ -635,9 +1230,9 @@ static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, sout_buffer_t * if( p_sys->packet == NULL ) { /* allocate a new packet */ - p_sys->packet = sout_BufferNew( p_stream->p_sout, p_sys->i_mtu ); + p_sys->packet = block_New( p_stream, p_sys->i_mtu ); p_sys->packet->p_buffer[ 0] = 0x80; - p_sys->packet->p_buffer[ 1] = p_sys->i_payload_type; + 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; @@ -648,7 +1243,7 @@ static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, sout_buffer_t * 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_size = 12; + p_sys->packet->i_buffer = 12; p_sys->packet->i_dts = i_dts; p_sys->packet->i_length = p_buffer->i_length / i_packet; @@ -657,13 +1252,13 @@ static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, sout_buffer_t * p_sys->i_sequence++; } - i_size = __MIN( i_data, p_sys->i_mtu - p_sys->packet->i_size ); + 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_size], - p_data, - i_size ); + memcpy( &p_sys->packet->p_buffer[p_sys->packet->i_buffer], + p_data, i_size ); - p_sys->packet->i_size += i_size; + p_sys->packet->i_buffer += i_size; p_data += i_size; i_data -= i_size; } @@ -671,31 +1266,134 @@ static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream, sout_buffer_t * return VLC_SUCCESS; } -static int AccessOutGrabberWrite( sout_access_out_t *p_access, sout_buffer_t *p_buffer ) +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_size ); - - + //fprintf( stderr, "received buffer size=%d\n", p_buffer->i_buffer ); + // while( p_buffer ) { - sout_buffer_t *p_next; + block_t *p_next; AccessOutGrabberWriteBuffer( p_stream, p_buffer ); p_next = p_buffer->p_next; - sout_BufferDelete( p_access->p_sout, p_buffer ); + block_Release( p_buffer ); p_buffer = p_next; } return VLC_SUCCESS; } +/**************************************************************************** + * SAP: + ****************************************************************************/ +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_SAPMethod(); + + /* Remove the previous session */ + if( p_sys->p_session != NULL) + { + sout_AnnounceUnRegister( p_sout, p_sys->p_session); + sout_AnnounceSessionDestroy( p_sys->p_session ); + p_sys->p_session = NULL; + } + + 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, SOUT_CFG_PREFIX, + p_sys->psz_sdp, + p_sys->psz_destination, + p_method ); + } + + sout_MethodRelease( p_method ); + return VLC_SUCCESS; +} + +/**************************************************************************** +* File: +****************************************************************************/ +static int FileSetup( sout_stream_t *p_stream ) +{ + sout_stream_sys_t *p_sys = p_stream->p_sys; + FILE *f; + + 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) ); + return VLC_EGENERIC; + } + + fprintf( f, "%s", p_sys->psz_sdp ); + fclose( f ); + + return VLC_SUCCESS; +} + +/**************************************************************************** + * HTTP: + ****************************************************************************/ +static int HttpCallback( httpd_file_sys_t *p_args, + httpd_file_t *, uint8_t *p_request, + uint8_t **pp_data, int *pi_data ); + +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 ); + if( p_sys->p_httpd_host ) + { + p_sys->p_httpd_file = httpd_FileNew( p_sys->p_httpd_host, + url->psz_path ? url->psz_path : "/", + "application/sdp", + NULL, NULL, NULL, + HttpCallback, (void*)p_sys ); + } + if( p_sys->p_httpd_file == NULL ) + { + return VLC_EGENERIC; + } + return VLC_SUCCESS; +} + +static int HttpCallback( httpd_file_sys_t *p_args, + httpd_file_t *f, uint8_t *p_request, + uint8_t **pp_data, int *pi_data ) +{ + sout_stream_sys_t *p_sys = (sout_stream_sys_t*)p_args; + + vlc_mutex_lock( &p_sys->lock_sdp ); + if( p_sys->psz_sdp && *p_sys->psz_sdp ) + { + *pi_data = strlen( p_sys->psz_sdp ); + *pp_data = malloc( *pi_data ); + memcpy( *pp_data, p_sys->psz_sdp, *pi_data ); + } + else + { + *pp_data = NULL; + *pi_data = 0; + } + vlc_mutex_unlock( &p_sys->lock_sdp ); + + return VLC_SUCCESS; +} -static void rtp_packetize_common( sout_stream_id_t *id, sout_buffer_t *out, int b_marker, int64_t i_pts ) +/**************************************************************************** + * rtp_packetize_*: + ****************************************************************************/ +static void rtp_packetize_common( sout_stream_id_t *id, block_t *out, + int b_marker, int64_t i_pts ) { - uint32_t i_timestamp = i_pts * (int64_t)id->i_clock_rate / (int64_t)1000000; + uint32_t i_timestamp = i_pts * (int64_t)id->i_clock_rate / I64C(1000000); out->p_buffer[0] = 0x80; out->p_buffer[1] = (b_marker?0x80:0x00)|id->i_payload_type; @@ -711,23 +1409,58 @@ static void rtp_packetize_common( sout_stream_id_t *id, sout_buffer_t *out, int out->p_buffer[10] = id->ssrc[2]; out->p_buffer[11] = id->ssrc[3]; - out->i_size = 12; + out->i_buffer = 12; id->i_sequence++; } -static int rtp_packetize_mpa( sout_stream_t *p_stream, sout_stream_id_t *id, sout_buffer_t *in ) +static void rtp_packetize_send( sout_stream_id_t *id, block_t *out ) +{ + int i; + vlc_mutex_lock( &id->lock_sink ); + for( i = 0; i < id->i_sink; i++ ) + { + sout_AccessOutWrite( id->sink[i], block_Duplicate( out ) ); + } + vlc_mutex_unlock( &id->lock_sink ); + + if( id->p_access ) + { + sout_AccessOutWrite( id->p_access, out ); + } + else + { + block_Release( 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 ) { int i_max = id->i_mtu - 12 - 4; /* payload max in one packet */ - int i_count = ( in->i_size + i_max - 1 ) / i_max; + int i_count = ( in->i_buffer + i_max - 1 ) / i_max; uint8_t *p_data = in->p_buffer; - int i_data = in->i_size; + int i_data = in->i_buffer; int i; for( i = 0; i < i_count; i++ ) { int i_payload = __MIN( i_max, i_data ); - sout_buffer_t *out = sout_BufferNew( p_stream->p_sout, 16 + i_payload ); + block_t *out = block_New( p_stream, 16 + i_payload ); /* rtp common header */ rtp_packetize_common( id, out, (i == i_count - 1)?1:0, in->i_pts ); @@ -739,11 +1472,11 @@ static int rtp_packetize_mpa( sout_stream_t *p_stream, sout_stream_id_t *id, sou out->p_buffer[15] = ( (i*i_max) )&0xff; memcpy( &out->p_buffer[16], p_data, i_payload ); - out->i_size = 16 + i_payload; + out->i_buffer = 16 + i_payload; out->i_dts = in->i_dts + i * in->i_length / i_count; out->i_length = in->i_length / i_count; - sout_AccessOutWrite( id->p_access, out ); + rtp_packetize_send( id, out ); p_data += i_payload; i_data -= i_payload; @@ -753,13 +1486,14 @@ static int rtp_packetize_mpa( sout_stream_t *p_stream, sout_stream_id_t *id, sou } /* rfc2250 */ -static int rtp_packetize_mpv( sout_stream_t *p_stream, sout_stream_id_t *id, sout_buffer_t *in ) +static int rtp_packetize_mpv( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *in ) { int i_max = id->i_mtu - 12 - 4; /* payload max in one packet */ - int i_count = ( in->i_size + i_max - 1 ) / i_max; + int i_count = ( in->i_buffer + i_max - 1 ) / i_max; uint8_t *p_data = in->p_buffer; - int i_data = in->i_size; + int i_data = in->i_buffer; int i; int b_sequence_start = 0; int i_temporal_ref = 0; @@ -768,10 +1502,10 @@ static int rtp_packetize_mpv( sout_stream_t *p_stream, sout_stream_id_t *id, sou int b_start_slice = 0; /* preparse this packet to get some info */ - if( in->i_size > 4 ) + if( in->i_buffer > 4 ) { uint8_t *p = p_data; - int i_rest = in->i_size; + int i_rest = in->i_buffer; for( ;; ) { @@ -799,11 +1533,12 @@ static int rtp_packetize_mpv( sout_stream_t *p_stream, sout_stream_id_t *id, sou i_temporal_ref = ( p[1] << 2) |((p[2]>>6)&0x03); i_picture_coding_type = (p[2] >> 3)&0x07; - if( i_rest > 4 && ( i_picture_coding_type == 2 || i_picture_coding_type == 3 ) ) + if( i_rest >= 4 && ( i_picture_coding_type == 2 || + i_picture_coding_type == 3 ) ) { - i_ffc = (p[3] >> 2)&0x01; - i_bfc = ((p[3]&0x03) << 1)|((p[4]>>7)&0x01); - if( i_picture_coding_type == 3 ) + i_ffv = (p[3] >> 2)&0x01; + i_ffc = ((p[3]&0x03) << 1)|((p[4]>>7)&0x01); + if( i_rest > 4 && i_picture_coding_type == 3 ) { i_fbv = (p[4]>>6)&0x01; i_bfc = (p[4]>>3)&0x07; @@ -820,7 +1555,8 @@ static int rtp_packetize_mpv( sout_stream_t *p_stream, sout_stream_id_t *id, sou for( i = 0; i < i_count; i++ ) { int i_payload = __MIN( i_max, i_data ); - sout_buffer_t *out = sout_BufferNew( p_stream->p_sout, 16 + i_payload ); + block_t *out = block_New( p_stream, + 16 + i_payload ); uint32_t h = ( i_temporal_ref << 16 )| ( b_sequence_start << 13 )| ( b_start_slice << 12 )| @@ -829,7 +1565,8 @@ static int rtp_packetize_mpv( sout_stream_t *p_stream, sout_stream_id_t *id, sou ( i_fbv << 7 )|( i_bfc << 4 )|( i_ffv << 3 )|i_ffc; /* rtp common header */ - rtp_packetize_common( id, out, (i == i_count - 1)?1:0, in->i_pts ); + rtp_packetize_common( id, out, (i == i_count - 1)?1:0, + in->i_pts > 0 ? in->i_pts : in->i_dts ); /* MBZ:5 T:1 TR:10 AN:1 N:1 S:1 B:1 E:1 P:3 FBV:1 BFC:3 FFV:1 FFC:3 */ out->p_buffer[12] = ( h >> 24 )&0xff; @@ -839,11 +1576,11 @@ static int rtp_packetize_mpv( sout_stream_t *p_stream, sout_stream_id_t *id, sou memcpy( &out->p_buffer[16], p_data, i_payload ); - out->i_size = 16 + i_payload; + out->i_buffer = 16 + i_payload; out->i_dts = in->i_dts + i * in->i_length / i_count; out->i_length = in->i_length / i_count; - sout_AccessOutWrite( id->p_access, out ); + rtp_packetize_send( id, out ); p_data += i_payload; i_data -= i_payload; @@ -851,19 +1588,21 @@ static int rtp_packetize_mpv( sout_stream_t *p_stream, sout_stream_id_t *id, sou return VLC_SUCCESS; } -static int rtp_packetize_ac3( sout_stream_t *p_stream, sout_stream_id_t *id, sout_buffer_t *in ) + +static int rtp_packetize_ac3( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *in ) { int i_max = id->i_mtu - 12 - 2; /* payload max in one packet */ - int i_count = ( in->i_size + i_max - 1 ) / i_max; + int i_count = ( in->i_buffer + i_max - 1 ) / i_max; uint8_t *p_data = in->p_buffer; - int i_data = in->i_size; + int i_data = in->i_buffer; int i; for( i = 0; i < i_count; i++ ) { int i_payload = __MIN( i_max, i_data ); - sout_buffer_t *out = sout_BufferNew( p_stream->p_sout, 14 + i_payload ); + block_t *out = block_New( p_stream, 14 + i_payload ); /* rtp common header */ rtp_packetize_common( id, out, (i == i_count - 1)?1:0, in->i_pts ); @@ -874,11 +1613,11 @@ static int rtp_packetize_ac3( sout_stream_t *p_stream, sout_stream_id_t *id, sou /* data */ memcpy( &out->p_buffer[14], p_data, i_payload ); - out->i_size = 14 + i_payload; + out->i_buffer = 14 + i_payload; out->i_dts = in->i_dts + i * in->i_length / i_count; out->i_length = in->i_length / i_count; - sout_AccessOutWrite( id->p_access, out ); + rtp_packetize_send( id, out ); p_data += i_payload; i_data -= i_payload; @@ -887,29 +1626,85 @@ static int rtp_packetize_ac3( sout_stream_t *p_stream, sout_stream_id_t *id, sou return VLC_SUCCESS; } -static int rtp_packetize_split( sout_stream_t *p_stream, sout_stream_id_t *id, sout_buffer_t *in ) +static int rtp_packetize_split( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *in ) { int i_max = id->i_mtu - 12; /* payload max in one packet */ - int i_count = ( in->i_size + i_max - 1 ) / i_max; + int i_count = ( in->i_buffer + i_max - 1 ) / i_max; uint8_t *p_data = in->p_buffer; - int i_data = in->i_size; + int i_data = in->i_buffer; int i; for( i = 0; i < i_count; i++ ) { int i_payload = __MIN( i_max, i_data ); - sout_buffer_t *out = sout_BufferNew( p_stream->p_sout, 12 + i_payload ); + block_t *out = block_New( p_stream, 12 + 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) ); + rtp_packetize_common( id, out, ((i == i_count - 1)?1:0), + (in->i_pts > 0 ? in->i_pts : in->i_dts) ); memcpy( &out->p_buffer[12], p_data, i_payload ); - out->i_size = 12 + i_payload; + out->i_buffer = 12 + i_payload; out->i_dts = in->i_dts + i * in->i_length / i_count; out->i_length = in->i_length / i_count; - sout_AccessOutWrite( id->p_access, out ); + rtp_packetize_send( id, out ); + + p_data += i_payload; + i_data -= i_payload; + } + + 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; @@ -918,29 +1713,31 @@ static int rtp_packetize_split( sout_stream_t *p_stream, sout_stream_id_t *id, s return VLC_SUCCESS; } -static int rtp_packetize_l16( sout_stream_t *p_stream, sout_stream_id_t *id, sout_buffer_t *in ) +static int rtp_packetize_l16( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *in ) { int i_max = id->i_mtu - 12; /* payload max in one packet */ - int i_count = ( in->i_size + i_max - 1 ) / i_max; + int i_count = ( in->i_buffer + i_max - 1 ) / i_max; uint8_t *p_data = in->p_buffer; - int i_data = in->i_size; + int i_data = in->i_buffer; int i_packet = 0; while( i_data > 0 ) { int i_payload = (__MIN( i_max, i_data )/4)*4; - sout_buffer_t *out = sout_BufferNew( p_stream->p_sout, 12 + i_payload ); + block_t *out = block_New( p_stream, 12 + i_payload ); /* rtp common header */ - rtp_packetize_common( id, out, 0, (in->i_pts > 0 ? in->i_pts : in->i_dts) ); + rtp_packetize_common( id, out, 0, + (in->i_pts > 0 ? in->i_pts : in->i_dts) ); memcpy( &out->p_buffer[12], p_data, i_payload ); - out->i_size = 12 + i_payload; + out->i_buffer = 12 + i_payload; out->i_dts = in->i_dts + i_packet * in->i_length / i_count; out->i_length = in->i_length / i_count; - sout_AccessOutWrite( id->p_access, out ); + rtp_packetize_send( id, out ); p_data += i_payload; i_data -= i_payload; @@ -950,29 +1747,31 @@ static int rtp_packetize_l16( sout_stream_t *p_stream, sout_stream_id_t *id, sou return VLC_SUCCESS; } -static int rtp_packetize_l8( sout_stream_t *p_stream, sout_stream_id_t *id, sout_buffer_t *in ) +static int rtp_packetize_l8( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *in ) { int i_max = id->i_mtu - 12; /* payload max in one packet */ - int i_count = ( in->i_size + i_max - 1 ) / i_max; + int i_count = ( in->i_buffer + i_max - 1 ) / i_max; uint8_t *p_data = in->p_buffer; - int i_data = in->i_size; + int i_data = in->i_buffer; int i_packet = 0; while( i_data > 0 ) { int i_payload = (__MIN( i_max, i_data )/2)*2; - sout_buffer_t *out = sout_BufferNew( p_stream->p_sout, 12 + i_payload ); + block_t *out = block_New( p_stream, 12 + i_payload ); /* rtp common header */ - rtp_packetize_common( id, out, 0, (in->i_pts > 0 ? in->i_pts : in->i_dts) ); + rtp_packetize_common( id, out, 0, + (in->i_pts > 0 ? in->i_pts : in->i_dts) ); memcpy( &out->p_buffer[12], p_data, i_payload ); - out->i_size = 12 + i_payload; + out->i_buffer = 12 + i_payload; out->i_dts = in->i_dts + i_packet * in->i_length / i_count; out->i_length = in->i_length / i_count; - sout_AccessOutWrite( id->p_access, out ); + rtp_packetize_send( id, out ); p_data += i_payload; i_data -= i_payload; @@ -981,37 +1780,259 @@ static int rtp_packetize_l8( sout_stream_t *p_stream, sout_stream_id_t *id, sout return VLC_SUCCESS; } -static int rtp_packetize_mp4a( sout_stream_t *p_stream, sout_stream_id_t *id, sout_buffer_t *in ) +static int rtp_packetize_mp4a( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *in ) { int i_max = id->i_mtu - 16; /* payload max in one packet */ - int i_count = ( in->i_size + i_max - 1 ) / i_max; + int i_count = ( in->i_buffer + i_max - 1 ) / i_max; uint8_t *p_data = in->p_buffer; - int i_data = in->i_size; + int i_data = in->i_buffer; int i; for( i = 0; i < i_count; i++ ) { int i_payload = __MIN( i_max, i_data ); - sout_buffer_t *out = sout_BufferNew( p_stream->p_sout, 16 + i_payload ); + block_t *out = block_New( p_stream, 16 + 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) ); + rtp_packetize_common( id, out, ((i == i_count - 1)?1:0), + (in->i_pts > 0 ? in->i_pts : in->i_dts) ); /* AU headers */ /* AU headers length (bits) */ out->p_buffer[12] = 0; out->p_buffer[13] = 2*8; /* for each AU length 13 bits + idx 3bits, */ - out->p_buffer[14] = ( in->i_size >> 5 )&&0xff; - out->p_buffer[15] = ( (in->i_size&&0xff)<<3 )|0; + out->p_buffer[14] = ( in->i_buffer >> 5 )&0xff; + out->p_buffer[15] = ( (in->i_buffer&0xff)<<3 )|0; memcpy( &out->p_buffer[16], p_data, i_payload ); - out->i_size = 16 + i_payload; + out->i_buffer = 16 + i_payload; out->i_dts = in->i_dts + i * in->i_length / i_count; out->i_length = in->i_length / i_count; - sout_AccessOutWrite( id->p_access, out ); + rtp_packetize_send( id, out ); + + p_data += i_payload; + i_data -= i_payload; + } + + return VLC_SUCCESS; +} + + +/* rfc2429 */ +#define RTP_H263_HEADER_SIZE (2) // plen = 0 +#define RTP_H263_PAYLOAD_START (14) // plen = 0 +static int rtp_packetize_h263( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *in ) +{ + uint8_t *p_data = in->p_buffer; + int i_data = in->i_buffer; + int i; + int i_max = id->i_mtu - 12 - RTP_H263_HEADER_SIZE; /* payload max in one packet */ + int i_count; + int b_p_bit; + int b_v_bit = 0; // no pesky error resilience + int i_plen = 0; // normally plen=0 for PSC packet + int i_pebit = 0; // because plen=0 + uint16_t h; + + if( i_data < 2 ) + { + return VLC_EGENERIC; + } + if( p_data[0] || p_data[1] ) + { + return VLC_EGENERIC; + } + /* remove 2 leading 0 bytes */ + p_data += 2; + i_data -= 2; + i_count = ( i_data + i_max - 1 ) / i_max; + + for( i = 0; i < i_count; i++ ) + { + int i_payload = __MIN( i_max, i_data ); + block_t *out = block_New( p_stream, + RTP_H263_PAYLOAD_START + i_payload ); + b_p_bit = (i == 0) ? 1 : 0; + h = ( b_p_bit << 10 )| + ( b_v_bit << 9 )| + ( i_plen << 3 )| + i_pebit; + + /* rtp common header */ + //b_m_bit = 1; // always contains end of frame + rtp_packetize_common( id, out, (i == i_count - 1)?1:0, + in->i_pts > 0 ? in->i_pts : in->i_dts ); + + /* h263 header */ + out->p_buffer[12] = ( h >> 8 )&0xff; + out->p_buffer[13] = ( h )&0xff; + memcpy( &out->p_buffer[RTP_H263_PAYLOAD_START], p_data, i_payload ); + + out->i_buffer = RTP_H263_PAYLOAD_START + 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; +} + +/* rfc3984 */ +static int rtp_packetize_h264_nal( sout_stream_t *p_stream, sout_stream_id_t *id, + const uint8_t *p_data, int i_data, int64_t i_pts, int64_t i_dts, vlc_bool_t b_last, int64_t i_length ) +{ + const int i_max = id->i_mtu - 12; /* payload max in one packet */ + int i_nal_hdr; + int i_nal_type; + + if( i_data < 5 ) + return VLC_SUCCESS; + + i_nal_hdr = p_data[3]; + i_nal_type = i_nal_hdr&0x1f; + if( i_nal_type == 7 || i_nal_type == 8 ) + { + /* XXX Why do you want to remove them ? It will break streaming with + * SPS/PPS change (broadcast) ? */ + return VLC_SUCCESS; + } + + /* Skip start code */ + p_data += 3; + i_data -= 3; + + /* */ + if( i_data <= i_max ) + { + /* Single NAL unit packet */ + block_t *out = block_New( p_stream, 12 + i_data ); + out->i_dts = i_dts; + out->i_length = i_length; + + /* */ + rtp_packetize_common( id, out, b_last, i_pts ); + out->i_buffer = 12 + i_data; + + memcpy( &out->p_buffer[12], p_data, i_data ); + + rtp_packetize_send( id, out ); + } + else + { + /* FU-A Fragmentation Unit without interleaving */ + const int i_count = ( i_data-1 + i_max-2 - 1 ) / (i_max-2); + int i; + + p_data++; + i_data--; + + for( i = 0; i < i_count; i++ ) + { + const int i_payload = __MIN( i_data, i_max-2 ); + block_t *out = block_New( p_stream, 12 + 2 + i_payload ); + out->i_dts = i_dts + i * i_length / i_count; + out->i_length = i_length / i_count; + + /* */ + rtp_packetize_common( id, out, (b_last && i_payload == i_data), i_pts ); + out->i_buffer = 14 + i_payload; + + /* FU indicator */ + out->p_buffer[12] = 0x00 | (i_nal_hdr & 0x60) | 28; + /* FU header */ + out->p_buffer[13] = ( i == 0 ? 0x80 : 0x00 ) | ( (i == i_count-1) ? 0x40 : 0x00 ) | i_nal_type; + memcpy( &out->p_buffer[14], p_data, i_payload ); + + rtp_packetize_send( id, out ); + + i_data -= i_payload; + p_data += i_payload; + } + } + return VLC_SUCCESS; +} + +static int rtp_packetize_h264( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *in ) +{ + const uint8_t *p_buffer = in->p_buffer; + int i_buffer = in->i_buffer; + + while( i_buffer > 4 && ( p_buffer[0] != 0 || p_buffer[1] != 0 || p_buffer[2] != 1 ) ) + { + i_buffer--; + p_buffer++; + } + + /* Split nal units */ + while( i_buffer > 4 ) + { + int i_offset; + int i_size = i_buffer; + int i_skip = i_buffer; + + /* search nal end */ + for( i_offset = 4; i_offset+2 < i_buffer ; i_offset++) + { + if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 1 ) + { + /* we found another startcode */ + i_size = i_offset - ( p_buffer[i_offset-1] == 0 ? 1 : 0); + i_skip = i_offset; + break; + } + } + /* TODO add STAP-A to remove a lot of overhead with small slice/sei/... */ + rtp_packetize_h264_nal( p_stream, id, p_buffer, i_size, + (in->i_pts > 0 ? in->i_pts : in->i_dts), in->i_dts, + (i_size >= i_buffer), in->i_length * i_size / in->i_buffer ); + + i_buffer -= i_skip; + p_buffer += i_skip; + } + return VLC_SUCCESS; +} + +static int rtp_packetize_amr( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *in ) +{ + int i_max = id->i_mtu - 14; /* payload max in one packet */ + int i_count = ( in->i_buffer + i_max - 1 ) / i_max; + + uint8_t *p_data = in->p_buffer; + int i_data = in->i_buffer; + int i; + + /* Only supports octet-aligned mode */ + for( i = 0; i < i_count; i++ ) + { + int i_payload = __MIN( i_max, i_data ); + block_t *out = block_New( p_stream, 14 + i_payload ); + + /* rtp common header */ + rtp_packetize_common( id, out, ((i == i_count - 1)?1:0), + (in->i_pts > 0 ? in->i_pts : in->i_dts) ); + /* Payload header */ + out->p_buffer[12] = 0xF0; /* CMR */ + out->p_buffer[13] = p_data[0]&0x7C; /* ToC */ /* FIXME: frame type */ + + /* FIXME: are we fed multiple frames ? */ + memcpy( &out->p_buffer[14], p_data+1, i_payload-1 ); + + out->i_buffer = 14 + i_payload-1; + out->i_dts = in->i_dts + i * in->i_length / i_count; + out->i_length = in->i_length / i_count; + + rtp_packetize_send( id, out ); p_data += i_payload; i_data -= i_payload;