]> git.sesse.net Git - vlc/blobdiff - modules/stream_out/rtp.c
Removes trailing spaces. Removes tabs.
[vlc] / modules / stream_out / rtp.c
index 5aca6493230befc9adf7962c0f5616b41de05d0b..878e5fb9f387dc873abd9aee580df8d6fbe73e95 100644 (file)
 #include "rtp.h"
 
 #ifdef HAVE_UNISTD_H
+#   include <sys/types.h>
 #   include <unistd.h>
+#   include <fcntl.h>
+#   include <sys/stat.h>
 #endif
 
 #include <errno.h>
     "the multicast packets sent by the stream output (0 = use operating " \
     "system built-in default).")
 
+#define DCCP_TEXT N_("DCCP transport")
+#define DCCP_LONGTEXT N_( \
+    "This enables DCCP instead of UDP as a transport for RTP." )
+#define TCP_TEXT N_("TCP transport")
+#define TCP_LONGTEXT N_( \
+    "This enables TCP instead of UDP as a transport for RTP." )
+#define UDP_LITE_TEXT N_("UDP-Lite transport")
+#define UDP_LITE_LONGTEXT N_( \
+    "This enables UDP-Lite instead of UDP as a transport for RTP." )
+
 #define RFC3016_TEXT N_("MP4A LATM")
 #define RFC3016_LONGTEXT N_( \
     "This allows you to stream MPEG4 LATM audio streams (see RFC3016)." )
@@ -103,6 +116,7 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 #define SOUT_CFG_PREFIX "sout-rtp-"
+#define MAX_EMPTY_BLOCKS 200
 
 vlc_module_begin();
     set_shortname( _("RTP"));
@@ -138,6 +152,13 @@ vlc_module_begin();
     add_integer( SOUT_CFG_PREFIX "ttl", 0, NULL, TTL_TEXT,
                  TTL_LONGTEXT, VLC_TRUE );
 
+    add_bool( SOUT_CFG_PREFIX "dccp", 0, NULL,
+              DCCP_TEXT, DCCP_LONGTEXT, VLC_FALSE );
+    add_bool( SOUT_CFG_PREFIX "tcp", 0, NULL,
+              TCP_TEXT, TCP_LONGTEXT, VLC_FALSE );
+    add_bool( SOUT_CFG_PREFIX "udplite", 0, NULL,
+              UDP_LITE_TEXT, UDP_LITE_LONGTEXT, VLC_FALSE );
+
     add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT,
                  RFC3016_LONGTEXT, VLC_FALSE );
 
@@ -149,7 +170,9 @@ vlc_module_end();
  *****************************************************************************/
 static const char *ppsz_sout_options[] = {
     "dst", "name", "port", "port-audio", "port-video", "*sdp", "ttl", "mux",
-    "description", "url","email", "mp4a-latm", NULL
+    "description", "url", "email",
+    "dccp", "tcp", "udplite",
+    "mp4a-latm", NULL
 };
 
 static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
@@ -162,6 +185,7 @@ static int               MuxSend( sout_stream_t *, sout_stream_id_t *,
                                   block_t* );
 
 static sout_access_out_t *GrabberCreate( sout_stream_t *p_sout );
+static void ThreadSend( vlc_object_t *p_this );
 
 static void SDPHandleUrl( sout_stream_t *, char * );
 
@@ -171,7 +195,7 @@ static int HttpSetup( sout_stream_t *p_stream, vlc_url_t * );
 
 struct sout_stream_sys_t
 {
-    /* sdp */
+    /* SDP */
     int64_t i_sdp_id;
     int     i_sdp_version;
     char    *psz_sdp;
@@ -182,24 +206,28 @@ struct sout_stream_sys_t
     char        *psz_session_url;
     char        *psz_session_email;
 
-    /* */
+    /* SDP to disk */
     vlc_bool_t b_export_sdp_file;
     char *psz_sdp_file;
-    /* sap */
+
+    /* SDP via SAP */
     vlc_bool_t b_export_sap;
     session_descriptor_t *p_session;
 
+    /* SDP via HTTP */
     httpd_host_t *p_httpd_host;
     httpd_file_t *p_httpd_file;
 
+    /* RTSP */
     rtsp_stream_t *rtsp;
 
     /* */
-    char *psz_destination;
-    int  i_port;
-    int  i_port_audio;
-    int  i_port_video;
-    int  i_ttl;
+    char     *psz_destination;
+    uint8_t   proto;
+    uint8_t   i_ttl;
+    uint16_t  i_port;
+    uint16_t  i_port_audio;
+    uint16_t  i_port_video;
     vlc_bool_t b_latm;
 
     /* when need to use a private one or when using muxer */
@@ -219,8 +247,16 @@ struct sout_stream_sys_t
 typedef int (*pf_rtp_packetizer_t)( sout_stream_t *, sout_stream_id_t *,
                                     block_t * );
 
+typedef struct rtp_sink_t
+{
+    int rtp_fd;
+    rtcp_sender_t *rtcp;
+} rtp_sink_t;
+
 struct sout_stream_id_t
 {
+    VLC_COMMON_MEMBERS
+
     sout_stream_t *p_stream;
     /* rtp field */
     uint32_t    i_timestamp_start;
@@ -240,13 +276,14 @@ struct sout_stream_id_t
     pf_rtp_packetizer_t pf_packetize;
     int          i_mtu;
 
-    /* for sending the packets */
-    sout_access_out_t *p_access;
-
+    /* Packets sinks */
     vlc_mutex_t       lock_sink;
-    int               i_sink;
-    sout_access_out_t **sink;
-    rtsp_stream_id_t  *rtsp_id;
+    int               sinkc;
+    rtp_sink_t       *sinkv;
+    rtsp_stream_id_t *rtsp_id;
+
+    block_fifo_t     *p_fifo;
+    int64_t           i_caching;
 };
 
 
@@ -298,13 +335,12 @@ static int Open( vlc_object_t *p_this )
 
     for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )
     {
-        if( !strcmp( p_cfg->psz_name, "sdp" ) )
+        if( !strcmp( p_cfg->psz_name, "sdp" )
+         && ( p_cfg->psz_value != NULL )
+         && !strncasecmp( p_cfg->psz_value, "rtsp:", 5 ) )
         {
-            if( p_cfg->psz_value && !strncasecmp( p_cfg->psz_value, "rtsp", 4 ) )
-            {
-                b_rtsp = VLC_TRUE;
-                break;
-            }
+            b_rtsp = VLC_TRUE;
+            break;
         }
     }
     if( !b_rtsp )
@@ -312,24 +348,35 @@ static int Open( vlc_object_t *p_this )
         psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "sdp" );
         if( psz != NULL )
         {
-            if( !strncasecmp( psz, "rtsp", 4 ) )
+            if( !strncasecmp( psz, "rtsp:", 5 ) )
                 b_rtsp = VLC_TRUE;
             free( psz );
         }
     }
 
-    if( p_sys->psz_destination == NULL )
+    /* Transport protocol */
+    p_sys->proto = IPPROTO_UDP;
+
+#if 0
+    if( var_GetBool( p_stream, SOUT_CFG_PREFIX "dccp" ) )
     {
-        if( !b_rtsp )
-        {
-            msg_Err( p_stream, "missing destination and not in rtsp mode" );
-            free( p_sys );
-            return VLC_EGENERIC;
-        }
+        p_sys->sotype = SOCK_DCCP;
+        p_sys->proto = 33 /*IPPROTO_DCCP*/;
     }
-    else if( p_sys->i_port <= 0 )
+    else
+    if( var_GetBool( p_stream, SOUT_CFG_PREFIX "tcp" ) )
     {
-        msg_Err( p_stream, "invalid port" );
+        p_sys->sotype = SOCK_STREAM;
+        p_sys->proto = IPPROTO_TCP;
+    }
+    else
+#endif
+    if( var_GetBool( p_stream, SOUT_CFG_PREFIX "udplite" ) )
+        p_sys->proto = 136 /*IPPROTO_UDPLITE*/;
+
+    if( ( p_sys->psz_destination == NULL ) && !b_rtsp )
+    {
+        msg_Err( p_stream, "missing destination and not in RTSP mode" );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -343,9 +390,6 @@ static int Open( vlc_object_t *p_this )
          * 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" );
 
@@ -368,134 +412,81 @@ static int Open( vlc_object_t *p_this )
 
     p_stream->p_sys     = p_sys;
 
+    vlc_mutex_init( p_stream, &p_sys->lock_sdp );
+    vlc_mutex_init( p_stream, &p_sys->lock_es );
+
     psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" );
     if( psz != NULL )
     {
-        /* TODO: factorize code with Add() */
-        sout_stream_id_t  *id;
-
-        p_stream->pf_add  = MuxAdd;
-        p_stream->pf_del  = MuxDel;
-        p_stream->pf_send = MuxSend;
-
-        id = malloc( sizeof( *id ) );
-
-        /* We have one and only one "ES" from RTP perspective */
-        TAB_APPEND( p_sys->i_es, p_sys->es, id );
-
-        //p_sys->pr_rtp_packetizer = abort;
-        id->p_stream = p_stream;
-
-        vlc_mutex_init( p_stream, &id->lock_sink );
-        id->i_sink = 0;
-        id->sink = NULL;
-        id->rtsp_id = NULL;
+        sout_stream_id_t *id;
+        const char *psz_rtpmap;
+        int i_payload_type;
 
         /* Check muxer type */
         if( !strncasecmp( psz, "ps", 2 )
          || !strncasecmp( psz, "mpeg1", 5 ) )
         {
-            id->psz_rtpmap = strdup( "MP2P/90000" );
-            id->i_payload_type = p_sys->i_payload_type++;
+            psz_rtpmap = "MP2P/90000";
         }
         else if( !strncasecmp( psz, "ts", 2 ) )
         {
-            id->psz_rtpmap = strdup( "MP2T/90000" );
-            id->i_payload_type = 33;
+            psz_rtpmap = "MP2T/90000";
+            i_payload_type = 33;
         }
         else
         {
-            msg_Err( p_stream, "unsupported muxer type with rtp (only ts/ps)" );
+            msg_Err( p_stream, "unsupported muxer type for RTP (only TS/PS)" );
             free( psz );
+            vlc_mutex_destroy( &p_sys->lock_sdp );
+            vlc_mutex_destroy( &p_sys->lock_es );
             free( p_sys );
             return VLC_EGENERIC;
         }
 
-        id->i_clock_rate = 90000;
-        id->psz_fmtp = NULL;
-        id->i_port = p_sys->i_port;
-        id->i_cat = VIDEO_ES;
-        id->i_bitrate = 0;
-
-        /* create the access out */
-        if( p_sys->psz_destination == NULL )
-            id->p_access = NULL;
-        else
-        {
-            char url[NI_MAXHOST + 8], access[22];
-
-            if( p_sys->i_ttl > 0 )
-                sprintf( access, "udp{raw,rtcp,ttl=%d}", p_sys->i_ttl );
-            else
-                strcpy( access, "udp{raw,rtcp}" );
-
-            /* IPv6 needs brackets if not already present */
-            if (strchr( p_sys->psz_destination, ':' ) != NULL )
-                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);
-
-            id->p_access = sout_AccessOutNew( p_sout, access, url );
-            if( id->p_access == NULL )
-            {
-                msg_Err( p_stream, "cannot create the access out for %s://%s",
-                        access, url );
-                free( psz );
-                free( p_sys );
-                return VLC_EGENERIC;
-            }
-        }
+        p_sys->p_grab = GrabberCreate( p_stream );
+        p_sys->p_mux = sout_MuxNew( p_sout, psz, p_sys->p_grab );
+        free( psz );
 
-        id->i_mtu = config_GetInt( p_stream, "mtu" );  /* XXX beurk */
-        if( id->i_mtu <= 12 + 16 )
+        if( p_sys->p_mux == NULL )
         {
-            /* better than nothing */
-            id->i_mtu = 576 - 20 - 8;
+            msg_Err( p_stream, "cannot create muxer" );
+            sout_AccessOutDelete( p_sys->p_grab );
+            vlc_mutex_destroy( &p_sys->lock_sdp );
+            vlc_mutex_destroy( &p_sys->lock_es );
+            free( p_sys );
+            return VLC_EGENERIC;
         }
 
-        p_sys->p_grab = GrabberCreate( p_stream );
-
-        /* the muxer */
-        if( !( p_sys->p_mux = sout_MuxNew( p_sout, psz, p_sys->p_grab ) ) )
+        id = Add( p_stream, NULL );
+        if( id == NULL )
         {
-            msg_Err( p_stream, "cannot create the muxer (%s)", psz );
+            sout_MuxDelete( p_sys->p_mux );
             sout_AccessOutDelete( p_sys->p_grab );
-            sout_AccessOutDelete( id->p_access );
-            free( psz );
+            vlc_mutex_destroy( &p_sys->lock_sdp );
+            vlc_mutex_destroy( &p_sys->lock_es );
             free( p_sys );
             return VLC_EGENERIC;
         }
 
-        /* create the SDP for a muxed stream (only once) */
-        p_sys->psz_sdp = SDPGenerate( p_stream, NULL );
-        msg_Dbg( p_stream, "sdp=\n%s", p_sys->psz_sdp );
-
-        /* create the rtp context */
-        id->ssrc[0] = rand()&0xff;
-        id->ssrc[1] = rand()&0xff;
-        id->ssrc[2] = rand()&0xff;
-        id->ssrc[3] = rand()&0xff;
-        id->i_sequence = rand()&0xffff;
-        id->i_timestamp_start = rand()&0xffffffff;
+        id->psz_rtpmap = strdup( psz_rtpmap );
+        id->i_payload_type = i_payload_type;
+
         p_sys->packet = NULL;
 
-        free( psz );
+        p_stream->pf_add  = MuxAdd;
+        p_stream->pf_del  = MuxDel;
+        p_stream->pf_send = MuxSend;
     }
     else
     {
+        p_sys->p_mux    = NULL;
+        p_sys->p_grab   = NULL;
+
         p_stream->pf_add    = Add;
         p_stream->pf_del    = Del;
         p_stream->pf_send   = Send;
-
-        p_sys->p_mux    = NULL;
-        p_sys->p_grab   = NULL;
     }
 
-    vlc_mutex_init( p_stream, &p_sys->lock_sdp );
-    vlc_mutex_init( p_stream, &p_sys->lock_es );
-
     psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "sdp" );
     if( psz != NULL )
     {
@@ -511,7 +502,7 @@ static int Open( vlc_object_t *p_this )
                     continue;
 
                 /* needed both :sout-rtp-sdp= and rtp{sdp=} can be used */
-                if( !strcmp( p_cfg->psz_value, psz ) ) 
+                if( !strcmp( p_cfg->psz_value, psz ) )
                     continue;
 
                 SDPHandleUrl( p_stream, p_cfg->psz_value );
@@ -541,7 +532,6 @@ static void Close( vlc_object_t * p_this )
     {
         assert( p_sys->i_es == 1 );
         Del( p_stream, p_sys->es[0] );
-        free( p_sys->es);
 
         sout_MuxDelete( p_sys->p_mux );
         sout_AccessOutDelete( p_sys->p_grab );
@@ -615,7 +605,7 @@ static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url )
             goto out;
         }
 
-        /* FIXME test if destination is multicast or no destination at all FIXME */
+        /* FIXME test if destination is multicast or no destination at all */
         p_sys->rtsp = RtspSetup( p_stream, &url );
         if( p_sys->rtsp == NULL )
         {
@@ -630,7 +620,7 @@ static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url )
                                      id->i_port, id->i_port + 1 );
         }
     }
-    else if( ( url.psz_protocol && !strcasecmp( url.psz_protocol, "sap" ) ) || 
+    else if( ( url.psz_protocol && !strcasecmp( url.psz_protocol, "sap" ) ) ||
              ( url.psz_host && !strcasecmp( url.psz_host, "sap" ) ) )
     {
         p_sys->b_export_sap = VLC_TRUE;
@@ -710,7 +700,7 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url )
              sizeof( "i=*\r\n" ) + strlen( p_sys->psz_session_description ) +
              sizeof( "u=*\r\n" ) + strlen( p_sys->psz_session_url ) +
              sizeof( "e=*\r\n" ) + strlen( p_sys->psz_session_email ) +
-             sizeof( "t=0 0\r\n" ) + /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */
+             sizeof( "t=0 0\r\n" ) +
              sizeof( "b=RR:0\r\n" ) +
              sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) +
              sizeof( "a=recvonly\r\n" ) +
@@ -756,7 +746,8 @@ char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_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, "t=0 0\r\n" ); /* permanent stream */
+        /* when scheduled from vlm, we should set this info correctly */
     p += sprintf( p, "a=tool:"PACKAGE_STRING"\r\n" );
     p += sprintf( p, "a=recvonly\r\n" );
     p += sprintf( p, "a=type:broadcast\r\n" );
@@ -843,30 +834,38 @@ static void sprintf_hexa( char *s, uint8_t *p_data, int i_data )
 /** Add an ES as a new RTP stream */
 static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 {
-    sout_instance_t   *p_sout = p_stream->p_sout;
+    /* NOTE: As a special case, if we use a non-RTP
+     * mux (TS/PS), then p_fmt is NULL. */
     sout_stream_sys_t *p_sys = p_stream->p_sys;
     sout_stream_id_t  *id;
-    sout_access_out_t *p_access;
-    int               i_port;
+    int               i_port, cscov = -1;
     char              *psz_sdp;
 
-    assert( p_sys->p_mux == NULL );
+    id = vlc_object_create( p_stream, sizeof( sout_stream_id_t ) );
+    if( id == NULL )
+        return NULL;
 
     /* Choose the port */
     i_port = 0;
+    if( p_fmt == NULL )
+        ;
+    else
     if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 )
     {
         i_port = p_sys->i_port_audio;
         p_sys->i_port_audio = 0;
     }
-    else if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 )
+    else
+    if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 )
     {
         i_port = p_sys->i_port_video;
         p_sys->i_port_video = 0;
     }
+
     while( i_port == 0 )
     {
-        if( p_sys->i_port != p_sys->i_port_audio && p_sys->i_port != p_sys->i_port_video )
+        if( p_sys->i_port != p_sys->i_port_audio
+         && p_sys->i_port != p_sys->i_port_video )
         {
             i_port = p_sys->i_port;
             p_sys->i_port += 2;
@@ -875,52 +874,75 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
         p_sys->i_port += 2;
     }
 
-    if( p_sys->psz_destination == NULL )
-        p_access = NULL;
+    id->p_stream   = p_stream;
+
+    id->i_timestamp_start = rand()&0xffffffff;
+    id->i_sequence = rand()&0xffff;
+    id->i_payload_type = p_sys->i_payload_type;
+    id->ssrc[0] = rand()&0xff;
+    id->ssrc[1] = rand()&0xff;
+    id->ssrc[2] = rand()&0xff;
+    id->ssrc[3] = rand()&0xff;
+
+    id->psz_rtpmap = NULL;
+    id->psz_fmtp   = NULL;
+    id->i_clock_rate = 90000; /* most common case */
+    id->i_port     = i_port;
+    if( p_fmt != NULL )
+    {
+        id->i_cat  = p_fmt->i_cat;
+        id->i_bitrate = p_fmt->i_bitrate/1000; /* Stream bitrate in kbps */
+    }
     else
     {
-        char access[22];
-        char url[NI_MAXHOST + 8];
+        id->i_cat  = VIDEO_ES;
+        id->i_bitrate = 0;
+    }
 
-        /* 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}" );
+    id->pf_packetize = NULL;
+    id->i_mtu = config_GetInt( p_stream, "mtu" );
+    if( id->i_mtu <= 12 + 16 )
+        id->i_mtu = 576 - 20 - 8; /* pessimistic */
 
-        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';
+    msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu );
+
+    vlc_mutex_init( p_stream, &id->lock_sink );
+    id->sinkc = 0;
+    id->sinkv = NULL;
+    id->rtsp_id = NULL;
+
+    id->i_caching =
+        (int64_t)1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "caching");
+    id->p_fifo = block_FifoNew( p_stream );
 
-        p_access = sout_AccessOutNew( p_sout, access, url );
-        if( p_access == NULL )
+    if( vlc_thread_create( id, "RTP send thread", ThreadSend,
+                           VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) )
+    {
+        vlc_mutex_destroy( &id->lock_sink );
+        vlc_object_destroy( id );
+        return NULL;
+    }
+
+    if( p_sys->psz_destination != NULL )
+    {
+        int ttl = (p_sys->i_ttl > 0) ? p_sys->i_ttl : -1;
+        int fd = net_ConnectDgram( p_stream, p_sys->psz_destination,
+                                   i_port, ttl, p_sys->proto );
+
+        if( fd == -1 )
         {
-            msg_Err( p_stream, "cannot create the access out for %s://%s",
-                     access, url );
+            msg_Err( p_stream, "cannot create RTP socket" );
+            vlc_thread_join( id );
+            vlc_mutex_destroy( &id->lock_sink );
+            vlc_object_destroy( id );
             return NULL;
         }
-        msg_Dbg( p_stream, "access out %s:%s", access, url );
+        rtp_add_sink( id, fd );
     }
 
-    /* not create the rtp specific stuff */
-    id = malloc( sizeof( sout_stream_id_t ) );
-    memset( id, 0, sizeof( sout_stream_id_t ) );
-    id->p_stream   = p_stream;
-    id->p_access   = p_access;
-    id->psz_rtpmap = NULL;
-    id->psz_fmtp   = NULL;
-    id->i_port     = i_port;
-    id->rtsp_id    = NULL;
-
-    vlc_mutex_init( p_stream, &id->lock_sink );
-    id->i_sink = 0;
-    id->sink = NULL;
-
+    if( p_fmt == NULL )
+        ;
+    else
     switch( p_fmt->i_codec )
     {
         case VLC_FOURCC( 's', '1', '6', 'b' ):
@@ -933,49 +955,38 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
             {
                 id->i_payload_type = 10;
             }
-            else
-            {
-                id->i_payload_type = p_sys->i_payload_type++;
-            }
-            asprintf( &id->psz_rtpmap, "L16/%d/%d", p_fmt->audio.i_rate,
-                      p_fmt->audio.i_channels );
+            if( asprintf( &id->psz_rtpmap, "L16/%d/%d", p_fmt->audio.i_rate,
+                          p_fmt->audio.i_channels ) == -1 )
+                id->psz_rtpmap = NULL;
             id->i_clock_rate = p_fmt->audio.i_rate;
             id->pf_packetize = rtp_packetize_l16;
             break;
         case VLC_FOURCC( 'u', '8', ' ', ' ' ):
-            id->i_payload_type = p_sys->i_payload_type++;
-            asprintf( &id->psz_rtpmap, "L8/%d/%d", p_fmt->audio.i_rate,
-                      p_fmt->audio.i_channels );
+            if( asprintf( &id->psz_rtpmap, "L8/%d/%d", p_fmt->audio.i_rate,
+                          p_fmt->audio.i_channels ) == -1 )
+                id->psz_rtpmap = NULL;
             id->i_clock_rate = p_fmt->audio.i_rate;
             id->pf_packetize = rtp_packetize_l8;
             break;
         case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
             id->i_payload_type = 14;
-            id->i_clock_rate = 90000;
             id->psz_rtpmap = strdup( "MPA/90000" );
             id->pf_packetize = rtp_packetize_mpa;
             break;
         case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
             id->i_payload_type = 32;
-            id->i_clock_rate = 90000;
             id->psz_rtpmap = strdup( "MPV/90000" );
             id->pf_packetize = rtp_packetize_mpv;
             break;
         case VLC_FOURCC( 'a', '5', '2', ' ' ):
-            id->i_payload_type = p_sys->i_payload_type++;
-            id->i_clock_rate = 90000;
             id->psz_rtpmap = strdup( "ac3/90000" );
             id->pf_packetize = rtp_packetize_ac3;
             break;
         case VLC_FOURCC( 'H', '2', '6', '3' ):
-            id->i_payload_type = p_sys->i_payload_type++;
-            id->i_clock_rate = 90000;
             id->psz_rtpmap = strdup( "H263-1998/90000" );
             id->pf_packetize = rtp_packetize_h263;
             break;
         case VLC_FOURCC( 'h', '2', '6', '4' ):
-            id->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;
@@ -988,7 +999,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
                 char    *p_64_pps = NULL;
                 char    hexa[6+1];
 
-                while( i_buffer > 4 && 
+                while( i_buffer > 4 &&
                        p_buffer[0] == 0 && p_buffer[1] == 0 &&
                        p_buffer[2] == 0 && p_buffer[3] == 1 )
                 {
@@ -1021,15 +1032,14 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
                     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( p_64_sps && p_64_pps &&
+                    ( asprintf( &id->psz_fmtp,
+                                "packetization-mode=1;profile-level-id=%s;"
+                                "sprop-parameter-sets=%s,%s;", hexa, p_64_sps,
+                                p_64_pps ) == -1 ) )
+                    id->psz_fmtp = NULL;
+                free( p_64_sps );
+                free( p_64_pps );
             }
             if( !id->psz_fmtp )
                 id->psz_fmtp = strdup( "packetization-mode=1" );
@@ -1039,36 +1049,36 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
         {
             char hexa[2*p_fmt->i_extra +1];
 
-            id->i_payload_type = p_sys->i_payload_type++;
-            id->i_clock_rate = 90000;
             id->psz_rtpmap = strdup( "MP4V-ES/90000" );
             id->pf_packetize = rtp_packetize_split;
             if( p_fmt->i_extra > 0 )
             {
-                id->psz_fmtp = malloc( 100 + 2 * p_fmt->i_extra );
                 sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra );
-                sprintf( id->psz_fmtp,
-                         "profile-level-id=3; config=%s;", hexa );
+                if( asprintf( &id->psz_fmtp,
+                              "profile-level-id=3; config=%s;", hexa ) == -1 )
+                    id->psz_fmtp = NULL;
             }
             break;
         }
         case VLC_FOURCC( 'm', 'p', '4', 'a' ):
         {
-            id->i_payload_type = p_sys->i_payload_type++;
             id->i_clock_rate = p_fmt->audio.i_rate;
 
             if(!p_sys->b_latm)
             {
                 char hexa[2*p_fmt->i_extra +1];
 
-                asprintf( &id->psz_rtpmap, "mpeg4-generic/%d",
-                          p_fmt->audio.i_rate );
+                if( asprintf( &id->psz_rtpmap, "mpeg4-generic/%d",
+                              p_fmt->audio.i_rate ) == -1 )
+                    id->psz_rtpmap = NULL;
                 id->pf_packetize = rtp_packetize_mp4a;
                 sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra );
-                asprintf( &id->psz_fmtp,
-                         "streamtype=5; profile-level-id=15; mode=AAC-hbr; "
-                         "config=%s; SizeLength=13;IndexLength=3; "
-                         "IndexDeltaLength=3; Profile=1;", hexa );
+                if( asprintf( &id->psz_fmtp,
+                              "streamtype=5; profile-level-id=15; "
+                              "mode=AAC-hbr; config=%s; SizeLength=13; "
+                              "IndexLength=3; IndexDeltaLength=3; Profile=1;",
+                              hexa ) == -1 )
+                    id->psz_fmtp = NULL;
             }
             else
             {
@@ -1090,59 +1100,51 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
                 config[4]=0x3f;
                 config[5]=0xc0;
 
-                asprintf( &id->psz_rtpmap, "MP4A-LATM/%d/%d",
-                          p_fmt->audio.i_rate, p_fmt->audio.i_channels );
+                if( asprintf( &id->psz_rtpmap, "MP4A-LATM/%d/%d",
+                              p_fmt->audio.i_rate,
+                              p_fmt->audio.i_channels ) == -1)
+                    id->psz_rtpmap = NULL;
                 id->pf_packetize = rtp_packetize_mp4a_latm;
                 sprintf_hexa( hexa, config, 6 );
-                asprintf( &id->psz_fmtp, "profile-level-id=15; "
-                          "object=2; cpresent=0; config=%s", hexa );
+                if( asprintf( &id->psz_fmtp, "profile-level-id=15; "
+                              "object=2; cpresent=0; config=%s", hexa ) == -1 )
+                    id->psz_fmtp = NULL;
             }
             break;
         }
         case VLC_FOURCC( 's', 'a', 'm', 'r' ):
-            id->i_payload_type = p_sys->i_payload_type++;
             id->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ?
                                      "AMR/8000/2" : "AMR/8000" );
             id->psz_fmtp = strdup( "octet-align=1" );
             id->i_clock_rate = p_fmt->audio.i_rate;
             id->pf_packetize = rtp_packetize_amr;
-            break; 
+            break;
         case VLC_FOURCC( 's', 'a', 'w', 'b' ):
-            id->i_payload_type = p_sys->i_payload_type++;
             id->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ?
                                      "AMR-WB/16000/2" : "AMR-WB/16000" );
             id->psz_fmtp = strdup( "octet-align=1" );
             id->i_clock_rate = p_fmt->audio.i_rate;
             id->pf_packetize = rtp_packetize_amr;
-            break; 
+            break;
 
         default:
             msg_Err( p_stream, "cannot add this stream (unsupported "
                      "codec:%4.4s)", (char*)&p_fmt->i_codec );
-            if( p_access )
-            {
-                sout_AccessOutDelete( p_access );
-            }
-            free( id );
+            if( id->sinkc > 0 )
+                rtp_del_sink( id, id->sinkv[0].rtp_fd );
+            vlc_thread_join( id );
+            vlc_mutex_destroy( &id->lock_sink );
+            vlc_object_destroy( id );
             return NULL;
     }
-    id->i_cat = p_fmt->i_cat;
 
-    id->ssrc[0] = rand()&0xff;
-    id->ssrc[1] = rand()&0xff;
-    id->ssrc[2] = rand()&0xff;
-    id->ssrc[3] = rand()&0xff;
-    id->i_sequence = rand()&0xffff;
-    id->i_timestamp_start = rand()&0xffffffff;
-    id->i_bitrate = p_fmt->i_bitrate/1000; /* Stream bitrate in kbps */
+    if( cscov != -1 )
+        cscov += 8 /* UDP */ + 12 /* RTP */;
+    if( id->sinkc > 0 )
+        net_SetCSCov( id->sinkv[0].rtp_fd, cscov, -1 );
 
-    id->i_mtu = config_GetInt( p_stream, "mtu" );  /* XXX beuk */
-    if( id->i_mtu <= 12 + 16 )
-    {
-        /* better than nothing */
-        id->i_mtu = 576 - 20 - 8;
-    }
-    msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu );
+    if( id->i_payload_type == p_sys->i_payload_type )
+        p_sys->i_payload_type++;
 
     if( p_sys->rtsp != NULL )
         id->rtsp_id = RtspAddId( p_sys->rtsp, id, p_sys->i_es,
@@ -1169,6 +1171,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     if( p_sys->b_export_sap ) SapSetup( p_stream );
     if( p_sys->b_export_sdp_file ) FileSetup( p_stream );
 
+    vlc_object_attach( id, p_stream );
     return id;
 }
 
@@ -1176,6 +1179,8 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
 
+    vlc_object_kill( id );
+
     vlc_mutex_lock( &p_sys->lock_es );
     TAB_REMOVE( p_sys->i_es, p_sys->es, id );
     vlc_mutex_unlock( &p_sys->lock_es );
@@ -1189,30 +1194,24 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
             p_sys->i_port_video = id->i_port;
     }
 
-    if( id->p_access )
-    {
-        if( id->psz_rtpmap )
-        {
-            free( id->psz_rtpmap );
-        }
-        if( id->psz_fmtp )
-        {
-            free( id->psz_fmtp );
-        }
-        sout_AccessOutDelete( id->p_access );
-    }
+    free( id->psz_rtpmap );
+    free( id->psz_fmtp );
 
     if( id->rtsp_id )
         RtspDelId( p_sys->rtsp, id->rtsp_id );
+    if( id->sinkc > 0 )
+        rtp_del_sink( id, id->sinkv[0].rtp_fd ); /* sink for explicit dst= */
 
+    vlc_thread_join( id );
     vlc_mutex_destroy( &id->lock_sink );
-    free( id->sink );
+    block_FifoRelease( id->p_fifo );
 
     /* Update SDP (sap/file) */
     if( p_sys->b_export_sap && !p_sys->p_mux ) SapSetup( p_stream );
     if( p_sys->b_export_sdp_file ) FileSetup( p_stream );
 
-    free( id );
+    vlc_object_detach( id );
+    vlc_object_destroy( id );
     return VLC_SUCCESS;
 }
 
@@ -1296,7 +1295,8 @@ static int HttpSetup( sout_stream_t *p_stream, vlc_url_t *url)
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
 
-    p_sys->p_httpd_host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host, url->i_port > 0 ? url->i_port : 80 );
+    p_sys->p_httpd_host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host,
+                                         url->i_port > 0 ? url->i_port : 80 );
     if( p_sys->p_httpd_host )
     {
         p_sys->p_httpd_file = httpd_FileNew( p_sys->p_httpd_host,
@@ -1336,62 +1336,128 @@ static int  HttpCallback( httpd_file_sys_t *p_args,
 }
 
 /****************************************************************************
- * rtp_packetize_*:
+ * RTP send
  ****************************************************************************/
-static void rtp_packetize_common( sout_stream_id_t *id, block_t *out,
-                                  int b_marker, int64_t i_pts )
+static void ThreadSend( vlc_object_t *p_this )
 {
-    uint32_t i_timestamp = i_pts * (int64_t)id->i_clock_rate / I64C(1000000);
+    sout_stream_id_t *id = (sout_stream_id_t *)p_this;
+    unsigned i_caching = id->i_caching;
+#ifdef HAVE_TEE
+    int fd[5] = { -1, -1, -1, -1, -1 };
 
-    out->p_buffer[0] = 0x80;
-    out->p_buffer[1] = (b_marker?0x80:0x00)|id->i_payload_type;
-    out->p_buffer[2] = ( id->i_sequence >> 8)&0xff;
-    out->p_buffer[3] = ( id->i_sequence     )&0xff;
-    out->p_buffer[4] = ( i_timestamp >> 24 )&0xff;
-    out->p_buffer[5] = ( i_timestamp >> 16 )&0xff;
-    out->p_buffer[6] = ( i_timestamp >>  8 )&0xff;
-    out->p_buffer[7] = ( i_timestamp       )&0xff;
+    if( pipe( fd ) )
+        fd[0] = fd[1] = -1;
+    else
+    if( pipe( fd ) )
+        fd[2] = fd[3] = -1;
+    else
+        fd[4] = open( "/dev/null", O_WRONLY );
+#endif
 
-    memcpy( out->p_buffer + 8, id->ssrc, 4 );
+    while( !id->b_die )
+    {
+        block_t *out = block_FifoGet( id->p_fifo );
+        mtime_t  i_date = out->i_dts + i_caching;
+        ssize_t  len = out->i_buffer;
+
+#ifdef HAVE_TEE
+        if( fd[4] != -1 )
+            len = write( fd[1], out->p_buffer, len);
+        if( len == -1 )
+            continue; /* Uho - should not happen */
+#endif
+        mwait( i_date );
 
-    out->i_buffer = 12;
-    id->i_sequence++;
-}
+        vlc_mutex_lock( &id->lock_sink );
+        for( int i = 0; i < id->sinkc; i++ )
+        {
+            SendRTCP( id->sinkv[i].rtcp, out );
 
-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 );
+#ifdef HAVE_TEE
+            tee( fd[0], fd[3], len, 0 );
+            if( splice( fd[2], NULL, id->sinkv[i].rtp_fd, NULL, len,
+                        SPLICE_F_NONBLOCK ) >= 0 )
+                continue;
+
+            /* splice failed */
+            splice( fd[2], NULL, fd[4], NULL, len, 0 );
+#endif
+            send( id->sinkv[i].rtp_fd, out->p_buffer, len, 0 );
+        }
+        vlc_mutex_unlock( &id->lock_sink );
 
-    if( id->p_access )
-    {
-        sout_AccessOutWrite( id->p_access, out );
-    }
-    else
-    {
         block_Release( out );
+#ifdef HAVE_TEE
+        splice( fd[0], NULL, fd[4], NULL, len, 0 );
+#endif
     }
+
+#ifdef HAVE_TEE
+    for( unsigned i = 0; i < 5; i++ )
+        close( fd[i] );
+#endif
+}
+
+static inline void rtp_packetize_send( sout_stream_id_t *id, block_t *out )
+{
+    block_FifoPut( id->p_fifo, out );
 }
 
-int rtp_add_sink( sout_stream_id_t *id, sout_access_out_t *access )
+int rtp_add_sink( sout_stream_id_t *id, int fd )
 {
+    rtp_sink_t sink = { fd, NULL };
+    sink.rtcp = OpenRTCP( VLC_OBJECT( id->p_stream ), fd, IPPROTO_UDP );
+    if( sink.rtcp == NULL )
+        msg_Err( id, "RTCP failed!" );
+
     vlc_mutex_lock( &id->lock_sink );
-    TAB_APPEND( id->i_sink, id->sink, access );
+    INSERT_ELEM( id->sinkv, id->sinkc, id->sinkc, sink );
     vlc_mutex_unlock( &id->lock_sink );
     return VLC_SUCCESS;
 }
 
-void rtp_del_sink( sout_stream_id_t *id, sout_access_out_t *access )
+void rtp_del_sink( sout_stream_id_t *id, int fd )
 {
-    /* NOTE: must be safe to use if access is not a sink to id */
+    rtp_sink_t sink = { fd, NULL };
+
+    /* NOTE: must be safe to use if fd is not included */
     vlc_mutex_lock( &id->lock_sink );
-    TAB_REMOVE( id->i_sink, id->sink, access );
+    for( int i = 0; i < id->sinkc; i++ )
+    {
+        if (id->sinkv[i].rtp_fd == fd)
+        {
+            sink = id->sinkv[i];
+            REMOVE_ELEM( id->sinkv, id->sinkc, i );
+            break;
+        }
+    }
     vlc_mutex_unlock( &id->lock_sink );
+
+    CloseRTCP( sink.rtcp );
+    net_Close( sink.rtp_fd );
+}
+
+/****************************************************************************
+ * 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 / I64C(1000000);
+
+    out->p_buffer[0] = 0x80;
+    out->p_buffer[1] = (b_marker?0x80:0x00)|id->i_payload_type;
+    out->p_buffer[2] = ( id->i_sequence >> 8)&0xff;
+    out->p_buffer[3] = ( id->i_sequence     )&0xff;
+    out->p_buffer[4] = ( i_timestamp >> 24 )&0xff;
+    out->p_buffer[5] = ( i_timestamp >> 16 )&0xff;
+    out->p_buffer[6] = ( i_timestamp >>  8 )&0xff;
+    out->p_buffer[7] = ( i_timestamp       )&0xff;
+
+    memcpy( out->p_buffer + 8, id->ssrc, 4 );
+
+    out->i_buffer = 12;
+    id->i_sequence++;
 }
 
 static int rtp_packetize_mpa( sout_stream_t *p_stream, sout_stream_id_t *id,
@@ -1849,12 +1915,6 @@ rtp_packetize_h264_nal( sout_stream_t *p_stream, sout_stream_id_t *id,
 
     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;
@@ -1939,7 +1999,7 @@ static int rtp_packetize_h264( sout_stream_t *p_stream, sout_stream_id_t *id,
                 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,