]> git.sesse.net Git - vlc/blobdiff - modules/misc/rtsp.c
Removes trailing spaces. Removes tabs.
[vlc] / modules / misc / rtsp.c
index 05078e28699d78bdd83098ba3fea15be496aa661..566966678926c723180945b9e1ba088eeccb4d03 100644 (file)
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * rtsp.c: rtsp VoD server module
  *****************************************************************************
- * Copyright (C) 2003-2004 VideoLAN
+ * Copyright (C) 2003-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
  * 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 <stdlib.h>
-
-#include <errno.h>
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#include <vlc_input.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
 
 #include "vlc_httpd.h"
 #include "vlc_vod.h"
-#include "network.h"
+#include "vlc_url.h"
+#include <vlc_network.h>
+#include <vlc_charset.h>
+#include <vlc_strings.h>
+
+#include <errno.h>
 
 /*****************************************************************************
  * Module descriptor
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define HOST_TEXT N_( "Host address" )
+#define HOST_TEXT N_( "RTSP host address" )
 #define HOST_LONGTEXT N_( \
-    "You can set the address, port and path the rtsp interface will bind to." \
-    ".\n Syntax is address:port/path. Default is to bind to localhost address"\
-    "on port 554, with no path. Use 0.0.0.0 to bind to all addresses." )
+    "This defines the address, port and path the RTSP VOD server will listen " \
+    "on.\nSyntax is address:port/path. The default is to listen on all "\
+    "interfaces (address 0.0.0.0), on port 554, with no path.\nTo listen " \
+    "only on the local interface, use \"localhost\" as address." )
+
+#define THROTLE_TEXT N_( "Maximum number of connections" )
+#define THROTLE_LONGTEXT N_( "This limits the maximum number of clients " \
+    "that can connect to the RTSP VOD. 0 means no limit."  )
+
+#define RAWMUX_TEXT N_( "MUX for RAW RTSP transport" )
+
+#define SESSION_TIMEOUT_TEXT N_( "Sets the timeout option in the RTSP " \
+    "session string" )
+#define SESSION_TIMEOUT_LONGTEXT N_( "Defines what timeout option to add " \
+    "to the RTSP session ID string. Setting it to a negative number removes " \
+    "the timeout option entirely. This is needed by some IPTV STBs (such as " \
+    "those made by HansunTech) which get confused by it. The default is 5." )
+
 vlc_module_begin();
     set_shortname( _("RTSP VoD" ) );
     set_description( _("RTSP VoD server") );
@@ -57,6 +75,12 @@ vlc_module_begin();
     set_callbacks( Open, Close );
     add_shortcut( "rtsp" );
     add_string ( "rtsp-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE );
+    add_string( "rtsp-raw-mux", "ts", NULL, RAWMUX_TEXT,
+                RAWMUX_TEXT, VLC_TRUE );
+    add_integer( "rtsp-throttle-users", 0, NULL, THROTLE_TEXT,
+                                           THROTLE_LONGTEXT, VLC_TRUE );
+    add_integer( "rtsp-session-timeout", 5, NULL, SESSION_TIMEOUT_TEXT,
+                 SESSION_TIMEOUT_LONGTEXT, VLC_TRUE );
 vlc_module_end();
 
 /*****************************************************************************
@@ -106,15 +130,17 @@ struct media_es_t
 
 struct vod_media_t
 {
+    int id;
+
     /* VoD server */
     vod_t *p_vod;
 
     /* RTSP server */
     httpd_url_t  *p_rtsp_url;
-    char         *psz_rtsp_control;
+    char         *psz_rtsp_control_v4;
+    char         *psz_rtsp_control_v6;
     char         *psz_rtsp_path;
 
-    char *psz_destination;
     int  i_port;
     int  i_port_audio;
     int  i_port_video;
@@ -132,6 +158,7 @@ struct vod_media_t
     int        i_es;
     media_es_t **es;
     char       *psz_mux;
+    vlc_bool_t  b_raw;
 
     /* RTSP client */
     int           i_rtsp;
@@ -149,30 +176,57 @@ struct vod_sys_t
 {
     /* RTSP server */
     httpd_host_t *p_rtsp_host;
-    char *psz_host;
     char *psz_path;
     int i_port;
+    int i_throttle_users;
+    int i_connections;
+
+    char *psz_raw_mux;
+
+    int i_session_timeout;
 
     /* List of media */
+    vlc_mutex_t lock_media;
+    int i_media_id;
     int i_media;
     vod_media_t **media;
+
+    /* */
+    block_fifo_t *p_fifo_cmd;
 };
 
-static vod_media_t *MediaNew( vod_t *, char *, input_item_t * );
+/* rtsp delayed command (to avoid deadlock between vlm/httpd) */
+typedef enum
+{
+    RTSP_CMD_TYPE_NONE,  /* Exit requested */
+
+    RTSP_CMD_TYPE_PLAY,
+    RTSP_CMD_TYPE_PAUSE,
+    RTSP_CMD_TYPE_STOP,
+    RTSP_CMD_TYPE_SEEK,
+    RTSP_CMD_TYPE_REWIND,
+    RTSP_CMD_TYPE_FORWARD,
+} rtsp_cmd_type_t;
+
+static vod_media_t *MediaNew( vod_t *, const char *, input_item_t * );
 static void         MediaDel( vod_t *, vod_media_t * );
 static int          MediaAddES( vod_t *, vod_media_t *, es_format_t * );
 static void         MediaDelES( vod_t *, vod_media_t *, es_format_t * );
 
+static void CommandThread( vlc_object_t *p_this );
+static void CommandPush( vod_t *, rtsp_cmd_type_t, vod_media_t *, const char *psz_session,
+                         double f_arg, const char *psz_arg );
+
 static rtsp_client_t *RtspClientNew( vod_media_t *, char * );
-static rtsp_client_t *RtspClientGet( vod_media_t *, char * );
+static rtsp_client_t *RtspClientGet( vod_media_t *, const char * );
 static void           RtspClientDel( vod_media_t *, rtsp_client_t * );
 
 static int RtspCallback( httpd_callback_sys_t *, httpd_client_t *,
-                         httpd_message_t *, httpd_message_t * );
+                         httpd_message_t *, const httpd_message_t * );
 static int RtspCallbackES( httpd_callback_sys_t *, httpd_client_t *,
-                           httpd_message_t *, httpd_message_t * );
+                           httpd_message_t *, const httpd_message_t * );
 
-static char *SDPGenerate( vod_media_t *, char * );
+static char *SDPGenerate( const vod_media_t *, httpd_client_t *cl );
 
 static void sprintf_hexa( char *s, uint8_t *p_data, int i_data )
 {
@@ -201,46 +255,62 @@ static int Open( vlc_object_t *p_this )
     vlc_UrlParse( &url, psz_url, 0 );
     if( psz_url ) free( psz_url );
 
-    if( !url.psz_host || !*url.psz_host )
-    {
-        if( url.psz_host ) free( url.psz_host );
-        url.psz_host = strdup( "localhost" );
-    }
     if( url.i_port <= 0 ) url.i_port = 554;
 
     p_vod->p_sys = p_sys = malloc( sizeof( vod_sys_t ) );
     if( !p_sys ) goto error;
     p_sys->p_rtsp_host = 0;
 
+    p_sys->i_session_timeout = var_CreateGetInteger( p_this, "rtsp-session-timeout" );
+
+    p_sys->i_throttle_users = var_CreateGetInteger( p_this, "rtsp-throttle-users" );
+    msg_Dbg( p_this, "allowing up to %d connections", p_sys->i_throttle_users );
+    p_sys->i_connections = 0;
+
+    p_sys->psz_raw_mux = var_CreateGetString( p_this, "rtsp-raw-mux" );
+
     p_sys->p_rtsp_host =
         httpd_HostNew( VLC_OBJECT(p_vod), url.psz_host, url.i_port );
     if( !p_sys->p_rtsp_host )
     {
-        msg_Err( p_vod, "cannot create http server (%s:%i)",
+        msg_Err( p_vod, "cannot create RTSP server (%s:%i)",
                  url.psz_host, url.i_port );
         goto error;
     }
 
-    p_sys->psz_host = strdup( url.psz_host );
     p_sys->psz_path = strdup( url.psz_path ? url.psz_path : "/" );
     p_sys->i_port = url.i_port;
 
     vlc_UrlClean( &url );
-    p_sys->media = 0;
-    p_sys->i_media = 0;
+
+    vlc_mutex_init( p_vod, &p_sys->lock_media );
+
+    TAB_INIT( p_sys->i_media, p_sys->media );
+    p_sys->i_media_id = 0;
 
     p_vod->pf_media_new = MediaNew;
     p_vod->pf_media_del = MediaDel;
     p_vod->pf_media_add_es = MediaAddES;
     p_vod->pf_media_del_es = MediaDelES;
 
-    return VLC_SUCCESS;
+    p_sys->p_fifo_cmd = block_FifoNew( p_vod );
+    if( vlc_thread_create( p_vod, "rtsp vod thread", CommandThread,
+                           VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
+    {
+        msg_Err( p_vod, "cannot spawn rtsp vod thread" );
+        block_FifoRelease( p_sys->p_fifo_cmd );
+        free( p_sys->psz_path );
+        goto error;
+    }
 
- error:
+    return VLC_SUCCESS;
 
+error:
     if( p_sys && p_sys->p_rtsp_host ) httpd_HostDelete( p_sys->p_rtsp_host );
+    if( p_sys && p_sys->psz_raw_mux ) free( p_sys->psz_raw_mux );
     if( p_sys ) free( p_sys );
     vlc_UrlClean( &url );
+
     return VLC_EGENERIC;
 }
 
@@ -252,57 +322,97 @@ static void Close( vlc_object_t * p_this )
     vod_t *p_vod = (vod_t *)p_this;
     vod_sys_t *p_sys = p_vod->p_sys;
 
+    /* Stop command thread */
+    vlc_object_kill( p_vod );
+    CommandPush( p_vod, RTSP_CMD_TYPE_NONE, NULL, NULL, 0.0, NULL );
+    vlc_thread_join( p_vod );
+
+    block_FifoRelease( p_sys->p_fifo_cmd );
+
     httpd_HostDelete( p_sys->p_rtsp_host );
+    var_Destroy( p_this, "rtsp-session-timeout" );
+    var_Destroy( p_this, "rtsp-throttle-users" );
+    var_Destroy( p_this, "rtsp-raw-mux" );
+
+    /* Check VLM is not buggy */
+    if( p_sys->i_media > 0 )
+        msg_Err( p_vod, "rtsp vod leaking %d medias", p_sys->i_media );
+    TAB_CLEAN( p_sys->i_media, p_sys->media );
 
-    /* TODO delete medias */
+    vlc_mutex_destroy( &p_sys->lock_media );
 
+    free( p_sys->psz_path );
+    free( p_sys->psz_raw_mux );
     free( p_sys );
 }
 
 /*****************************************************************************
  * Media handling
  *****************************************************************************/
-static vod_media_t *MediaNew( vod_t *p_vod, char *psz_name,
+static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name,
                               input_item_t *p_item )
 {
     vod_sys_t *p_sys = p_vod->p_sys;
     vod_media_t *p_media = malloc( sizeof(vod_media_t) );
     int i;
 
+    if( !p_media )
+    {
+        msg_Err( p_vod, "not enough memory" );
+        return NULL;
+    }
+
     memset( p_media, 0, sizeof(vod_media_t) );
-    p_media->es = 0;
+    p_media->id = p_sys->i_media_id++;
+    TAB_INIT( p_media->i_es, p_media->es );
     p_media->psz_mux = 0;
-    p_media->rtsp = 0;
+    TAB_INIT( p_media->i_rtsp, p_media->rtsp );
+    p_media->b_raw = VLC_FALSE;
 
-    asprintf( &p_media->psz_rtsp_path, "%s%s", p_sys->psz_path, psz_name );
+    if( asprintf( &p_media->psz_rtsp_path, "%s%s",
+                  p_sys->psz_path, psz_name ) <0 )
+        return NULL;
     p_media->p_rtsp_url =
-        httpd_UrlNewUnique( p_sys->p_rtsp_host, p_media->psz_rtsp_path, 0, 0 );
+        httpd_UrlNewUnique( p_sys->p_rtsp_host, p_media->psz_rtsp_path, NULL,
+                            NULL, NULL );
 
     if( !p_media->p_rtsp_url )
     {
-        msg_Err( p_vod, "cannot create http url (%s)", p_media->psz_rtsp_path);
+        msg_Err( p_vod, "cannot create RTSP url (%s)", p_media->psz_rtsp_path);
         free( p_media->psz_rtsp_path );
         free( p_media );
-        return 0;
+        return NULL;
     }
 
-    msg_Dbg( p_vod, "created rtsp url: %s", p_media->psz_rtsp_path );
+    msg_Dbg( p_vod, "created RTSP url: %s", p_media->psz_rtsp_path );
 
-    asprintf( &p_media->psz_rtsp_control, "rtsp://%s:%d%s",
-              p_sys->psz_host, p_sys->i_port, p_media->psz_rtsp_path );
+    if( asprintf( &p_media->psz_rtsp_control_v4,
+               "a=control:rtsp://%%s:%d%s/trackID=%%d\r\n",
+               p_sys->i_port, p_media->psz_rtsp_path ) < 0 )
+        return NULL;
+    if( asprintf( &p_media->psz_rtsp_control_v6,
+               "a=control:rtsp://[%%s]:%d%s/trackID=%%d\r\n",
+              p_sys->i_port, p_media->psz_rtsp_path ) < 0 )
+        return NULL;
 
+    httpd_UrlCatch( p_media->p_rtsp_url, HTTPD_MSG_SETUP,
+                    RtspCallback, (void*)p_media );
     httpd_UrlCatch( p_media->p_rtsp_url, HTTPD_MSG_DESCRIBE,
                     RtspCallback, (void*)p_media );
     httpd_UrlCatch( p_media->p_rtsp_url, HTTPD_MSG_PLAY,
                     RtspCallback, (void*)p_media );
     httpd_UrlCatch( p_media->p_rtsp_url, HTTPD_MSG_PAUSE,
                     RtspCallback, (void*)p_media );
+    httpd_UrlCatch( p_media->p_rtsp_url, HTTPD_MSG_GETPARAMETER,
+                    RtspCallback, (void*)p_media );
     httpd_UrlCatch( p_media->p_rtsp_url, HTTPD_MSG_TEARDOWN,
                     RtspCallback, (void*)p_media );
 
     p_media->p_vod = p_vod;
 
+    vlc_mutex_lock( &p_sys->lock_media );
     TAB_APPEND( p_sys->i_media, p_sys->media, p_media );
+    vlc_mutex_unlock( &p_sys->lock_media );
 
     vlc_mutex_init( p_vod, &p_media->lock );
     p_media->psz_session_name = strdup("");
@@ -317,7 +427,7 @@ static vod_media_t *MediaNew( vod_t *p_vod, char *psz_name,
 
     p_media->i_sdp_id = mdate();
     p_media->i_sdp_version = 1;
-    p_media->i_length = p_item->i_duration;
+    p_media->i_length = input_item_GetDuration( p_item );
 
     vlc_mutex_lock( &p_item->lock );
     msg_Dbg( p_vod, "media has %i declared ES", p_item->i_es );
@@ -336,16 +446,31 @@ static void MediaDel( vod_t *p_vod, vod_media_t *p_media )
 
     msg_Dbg( p_vod, "deleting media: %s", p_media->psz_rtsp_path );
 
-    while( p_media->i_rtsp > 0 ) RtspClientDel( p_media, p_media->rtsp[0] );
+    vlc_mutex_lock( &p_sys->lock_media );
+    TAB_REMOVE( p_sys->i_media, p_sys->media, p_media );
+    vlc_mutex_unlock( &p_sys->lock_media );
+
+    while( p_media->i_rtsp > 0 )
+        RtspClientDel( p_media, p_media->rtsp[0] );
+    TAB_CLEAN( p_media->i_rtsp, p_media->rtsp );
+
     httpd_UrlDelete( p_media->p_rtsp_url );
     if( p_media->psz_rtsp_path ) free( p_media->psz_rtsp_path );
-    if( p_media->psz_rtsp_control ) free( p_media->psz_rtsp_control );
-
-    TAB_REMOVE( p_sys->i_media, p_sys->media, p_media );
+    if( p_media->psz_rtsp_control_v6 ) free( p_media->psz_rtsp_control_v6 );
+    if( p_media->psz_rtsp_control_v4 ) free( p_media->psz_rtsp_control_v4 );
 
-    while( p_media->i_es ) MediaDelES( p_vod, p_media, &p_media->es[0]->fmt );
+    while( p_media->i_es )
+        MediaDelES( p_vod, p_media, &p_media->es[0]->fmt );
+    TAB_CLEAN( p_media->i_es, p_media->es );
 
     vlc_mutex_destroy( &p_media->lock );
+
+    if( p_media->psz_session_name ) free( p_media->psz_session_name );
+    if( p_media->psz_session_description )
+        free( p_media->psz_session_description );
+    if( p_media->psz_session_url ) free( p_media->psz_session_url );
+    if( p_media->psz_session_email ) free( p_media->psz_session_email );
+    if( p_media->psz_mux ) free( p_media->psz_mux );
     free( p_media );
 }
 
@@ -354,109 +479,184 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
     media_es_t *p_es = malloc( sizeof(media_es_t) );
     char *psz_urlc;
 
+    if( !p_es ) return VLC_ENOMEM;
     memset( p_es, 0, sizeof(media_es_t) );
+
+    if( p_media->psz_mux ) free( p_media->psz_mux );
     p_media->psz_mux = NULL;
 
     /* TODO: update SDP, etc... */
-    asprintf( &psz_urlc, "%s/trackid=%d",
-              p_media->psz_rtsp_path, p_media->i_es );
+    if( asprintf( &psz_urlc, "%s/trackID=%d",
+              p_media->psz_rtsp_path, p_media->i_es ) < 0 )
+        return VLC_ENOMEM;
     msg_Dbg( p_vod, "  - ES %4.4s (%s)", (char *)&p_fmt->i_codec, psz_urlc );
 
     switch( p_fmt->i_codec )
     {
-    case VLC_FOURCC( 's', '1', '6', 'b' ):
-        if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 44100 )
-        {
-            p_es->i_payload_type = 11;
-        }
-        else if( p_fmt->audio.i_channels == 2 && p_fmt->audio.i_rate == 44100 )
-        {
-            p_es->i_payload_type = 10;
-        }
-        else
-        {
+        case VLC_FOURCC( 's', '1', '6', 'b' ):
+            if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 44100 )
+            {
+                p_es->i_payload_type = 11;
+            }
+            else if( p_fmt->audio.i_channels == 2 &&
+                     p_fmt->audio.i_rate == 44100 )
+            {
+                p_es->i_payload_type = 10;
+            }
+            else
+            {
+                p_es->i_payload_type = p_media->i_payload_type++;
+            }
+            p_es->psz_rtpmap = malloc( strlen( "L16/*/*" ) + 20+1 );
+            sprintf( p_es->psz_rtpmap, "L16/%d/%d", p_fmt->audio.i_rate,
+                    p_fmt->audio.i_channels );
+            break;
+        case VLC_FOURCC( 'u', '8', ' ', ' ' ):
             p_es->i_payload_type = p_media->i_payload_type++;
-        }
+            p_es->psz_rtpmap = malloc( strlen( "L8/*/*" ) + 20+1 );
+            sprintf( p_es->psz_rtpmap, "L8/%d/%d", p_fmt->audio.i_rate,
+                    p_fmt->audio.i_channels );
+            break;
+        case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+            p_es->i_payload_type = 14;
+            p_es->psz_rtpmap = strdup( "MPA/90000" );
+            break;
+        case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
+            p_es->i_payload_type = 32;
+            p_es->psz_rtpmap = strdup( "MPV/90000" );
+            break;
+        case VLC_FOURCC( 'a', '5', '2', ' ' ):
+            p_es->i_payload_type = p_media->i_payload_type++;
+            p_es->psz_rtpmap = strdup( "ac3/90000" );
+            break;
+        case VLC_FOURCC( 'H', '2', '6', '3' ):
+            p_es->i_payload_type = p_media->i_payload_type++;
+            p_es->psz_rtpmap = strdup( "H263-1998/90000" );
+            break;
+        case VLC_FOURCC( 'h', '2', '6', '4' ):
+            p_es->i_payload_type = p_media->i_payload_type++;
+            p_es->psz_rtpmap = strdup( "H264/90000" );
+            p_es->psz_fmtp = NULL;
+            /* FIXME AAAAAAAAAAAARRRRRRRRGGGG copied from stream_out/rtp.c */
+            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;
+
+                    i_size = i_buffer;
+                    for( i_offset = 4; i_offset+3 < i_buffer ; i_offset++)
+                    {
+                        if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 )
+                        {
+                            /* we found another startcode */
+                            i_size = i_offset;
+                            break;
+                        }
+                    }
+                    if( i_nal_type == 7 )
+                    {
+                        p_64_sps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
+                        sprintf_hexa( hexa, &p_buffer[5], 3 );
+                    }
+                    else if( i_nal_type == 8 )
+                    {
+                        p_64_pps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
+                    }
+                    i_buffer -= i_size;
+                    p_buffer += i_size;
+                }
+                /* */
+                if( p_64_sps && p_64_pps )
+                    if( asprintf( &p_es->psz_fmtp,
+                                  "packetization-mode=1;profile-level-id=%s;"
+                                  "sprop-parameter-sets=%s,%s;", hexa, p_64_sps,
+                                  p_64_pps ) < 0 )
+                        return VLC_ENOMEM;
+                if( p_64_sps )
+                    free( p_64_sps );
+                if( p_64_pps )
+                    free( p_64_pps );
+            }
+            if( !p_es->psz_fmtp )
+                p_es->psz_fmtp = strdup( "packetization-mode=1" );
+            break;
+        case VLC_FOURCC( 'm', 'p', '4', 'v' ):
+            p_es->i_payload_type = p_media->i_payload_type++;
+            p_es->psz_rtpmap = strdup( "MP4V-ES/90000" );
+            if( p_fmt->i_extra > 0 )
+            {
+                char *p_hexa = malloc( 2 * p_fmt->i_extra + 1 );
+                p_es->psz_fmtp = malloc( 100 + 2 * p_fmt->i_extra );
+                sprintf_hexa( p_hexa, p_fmt->p_extra, p_fmt->i_extra );
+                sprintf( p_es->psz_fmtp,
+                        "profile-level-id=3; config=%s;", p_hexa );
+                free( p_hexa );
+            }
+            break;
+        case VLC_FOURCC( 'm', 'p', '4', 'a' ):
+            p_es->i_payload_type = p_media->i_payload_type++;
+            p_es->psz_rtpmap = malloc( strlen( "mpeg4-generic/" ) + 12 );
+            sprintf( p_es->psz_rtpmap, "mpeg4-generic/%d", p_fmt->audio.i_rate );
+            if( p_fmt->i_extra > 0 )
+            {
+                char *p_hexa = malloc( 2 * p_fmt->i_extra + 1 );
+                p_es->psz_fmtp = malloc( 200 + 2 * p_fmt->i_extra );
+                sprintf_hexa( p_hexa, p_fmt->p_extra, p_fmt->i_extra );
+                sprintf( p_es->psz_fmtp,
+                        "streamtype=5; profile-level-id=15; mode=AAC-hbr; "
+                        "config=%s; SizeLength=13;IndexLength=3; "
+                        "IndexDeltaLength=3; Profile=1;", p_hexa );
+                free( p_hexa );
+            }
+            break;
+        case VLC_FOURCC( 'm', 'p', '2', 't' ):
+            p_media->psz_mux = strdup("ts");
+            p_es->i_payload_type = 33;
+            p_es->psz_rtpmap = strdup( "MP2T/90000" );
+            break;
+        case VLC_FOURCC( 'm', 'p', '2', 'p' ):
+            p_media->psz_mux = strdup("ps");
+            p_es->i_payload_type = p_media->i_payload_type++;
+            p_es->psz_rtpmap = strdup( "MP2P/90000" );
+            break;
+        case VLC_FOURCC( 's', 'a', 'm', 'r' ):
+            p_es->i_payload_type = p_media->i_payload_type++;
+            p_es->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ?
+                                    "AMR/8000/2" : "AMR/8000" );
+            p_es->psz_fmtp = strdup( "octet-align=1" );
+            break;
+        case VLC_FOURCC( 's', 'a', 'w', 'b' ):
+            p_es->i_payload_type = p_media->i_payload_type++;
+            p_es->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ?
+                                    "AMR-WB/16000/2" : "AMR-WB/16000" );
+            p_es->psz_fmtp = strdup( "octet-align=1" );
+            break;
 
-        p_es->psz_rtpmap = malloc( strlen( "L16/*/*" ) + 20+1 );
-        sprintf( p_es->psz_rtpmap, "L16/%d/%d", p_fmt->audio.i_rate,
-                 p_fmt->audio.i_channels );
-        break;
-    case VLC_FOURCC( 'u', '8', ' ', ' ' ):
-        p_es->i_payload_type = p_media->i_payload_type++;
-        p_es->psz_rtpmap = malloc( strlen( "L8/*/*" ) + 20+1 );
-        sprintf( p_es->psz_rtpmap, "L8/%d/%d", p_fmt->audio.i_rate,
-                 p_fmt->audio.i_channels );
-        break;
-    case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
-        p_es->i_payload_type = 14;
-        p_es->psz_rtpmap = strdup( "MPA/90000" );
-        break;
-    case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
-        p_es->i_payload_type = 32;
-        p_es->psz_rtpmap = strdup( "MPV/90000" );
-        break;
-    case VLC_FOURCC( 'a', '5', '2', ' ' ):
-        p_es->i_payload_type = p_media->i_payload_type++;
-        p_es->psz_rtpmap = strdup( "ac3/90000" );
-        break;
-    case VLC_FOURCC( 'H', '2', '6', '3' ):
-        p_es->i_payload_type = p_media->i_payload_type++;
-        p_es->psz_rtpmap = strdup( "H263-1998/90000" );
-        break;
-    case VLC_FOURCC( 'm', 'p', '4', 'v' ):
-        p_es->i_payload_type = p_media->i_payload_type++;
-        p_es->psz_rtpmap = strdup( "MP4V-ES/90000" );
-        if( p_fmt->i_extra > 0 )
-        {
-            char *p_hexa = malloc( 2 * p_fmt->i_extra + 1 );
-            p_es->psz_fmtp = malloc( 100 + 2 * p_fmt->i_extra );
-            sprintf_hexa( p_hexa, p_fmt->p_extra, p_fmt->i_extra );
-            sprintf( p_es->psz_fmtp,
-                     "profile-level-id=3; config=%s;", p_hexa );
-            free( p_hexa );
-        }
-        break;
-    case VLC_FOURCC( 'm', 'p', '4', 'a' ):
-        p_es->i_payload_type = p_media->i_payload_type++;
-        p_es->psz_rtpmap = malloc( strlen( "mpeg4-generic/" ) + 12 );
-        sprintf( p_es->psz_rtpmap, "mpeg4-generic/%d", p_fmt->audio.i_rate );
-        if( p_fmt->i_extra > 0 )
-        {
-            char *p_hexa = malloc( 2 * p_fmt->i_extra + 1 );
-            p_es->psz_fmtp = malloc( 200 + 2 * p_fmt->i_extra );
-            sprintf_hexa( p_hexa, p_fmt->p_extra, p_fmt->i_extra );
-            sprintf( p_es->psz_fmtp,
-                     "streamtype=5; profile-level-id=15; mode=AAC-hbr; "
-                     "config=%s; SizeLength=13;IndexLength=3; "
-                     "IndexDeltaLength=3; Profile=1;", p_hexa );
-            free( p_hexa );
-        }
-        break;
-    case VLC_FOURCC( 'm', 'p', '2', 't' ):
-        p_media->psz_mux = "ts";
-        p_es->i_payload_type = 33;
-        p_es->psz_rtpmap = strdup( "MP2T/90000" );
-        break;
-    case VLC_FOURCC( 'm', 'p', '2', 'p' ):
-        p_media->psz_mux = "ps";
-        p_es->i_payload_type = p_media->i_payload_type++;
-        p_es->psz_rtpmap = strdup( "MP2P/90000" );
-        break;
-
-    default:
-        msg_Err( p_vod, "cannot add this stream (unsupported "
-                 "codec: %4.4s)", (char*)&p_fmt->i_codec );
-        free( p_es );
-        return VLC_EGENERIC;
+        default:
+            msg_Err( p_vod, "cannot add this stream (unsupported "
+                    "codec: %4.4s)", (char*)&p_fmt->i_codec );
+            free( p_es );
+            return VLC_EGENERIC;
     }
 
     p_es->p_rtsp_url =
-        httpd_UrlNewUnique( p_vod->p_sys->p_rtsp_host, psz_urlc, 0, 0 );
+        httpd_UrlNewUnique( p_vod->p_sys->p_rtsp_host, psz_urlc, NULL, NULL,
+                            NULL );
 
     if( !p_es->p_rtsp_url )
     {
-        msg_Err( p_vod, "cannot create http url (%s)", psz_urlc );
+        msg_Err( p_vod, "cannot create RTSP url (%s)", psz_urlc );
         free( psz_urlc );
         free( p_es );
         return VLC_EGENERIC;
@@ -515,7 +715,7 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
 
 static void MediaDelES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt)
 {
-    media_es_t *p_es = 0;
+    media_es_t *p_es = NULL;
     int i;
 
     /* Find the ES */
@@ -542,6 +742,115 @@ static void MediaDelES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt)
 
     if( p_es->p_rtsp_url ) httpd_UrlDelete( p_es->p_rtsp_url );
     es_format_Clean( &p_es->fmt );
+    free( p_es );
+}
+
+/* */
+typedef struct
+{
+    int i_type;
+    int i_media_id;
+    //vod_media_t *p_media;
+    char *psz_session;
+    char *psz_arg;
+    double f_arg;
+} rtsp_cmd_t;
+
+static void CommandPush( vod_t *p_vod, rtsp_cmd_type_t i_type, vod_media_t *p_media, const char *psz_session,
+                         double f_arg, const char *psz_arg )
+{
+    rtsp_cmd_t cmd;
+    block_t *p_cmd;
+
+    memset( &cmd, 0, sizeof(cmd) );
+    cmd.i_type = i_type;
+    if( p_media )
+        cmd.i_media_id = p_media->id;
+    if( psz_session )
+        cmd.psz_session = strdup(psz_session);
+    cmd.f_arg = f_arg;
+    if( psz_arg )
+        cmd.psz_arg = strdup(psz_arg);
+
+    p_cmd = block_New( p_vod, sizeof(rtsp_cmd_t) );
+    memcpy( p_cmd->p_buffer, &cmd, sizeof(cmd) );
+
+    block_FifoPut( p_vod->p_sys->p_fifo_cmd, p_cmd );
+}
+
+static void CommandThread( vlc_object_t *p_this )
+{
+    vod_t *p_vod = (vod_t*)p_this;
+    vod_sys_t *p_sys = p_vod->p_sys;
+
+    while( !p_vod->b_die )
+    {
+        block_t *p_block_cmd = block_FifoGet( p_sys->p_fifo_cmd );
+        rtsp_cmd_t cmd;
+        vod_media_t *p_media = NULL;
+        int i;
+
+        if( !p_block_cmd )
+            break;
+
+        memcpy( &cmd, p_block_cmd->p_buffer, sizeof(cmd) );
+        block_Release( p_block_cmd );
+
+        if( cmd.i_type == RTSP_CMD_TYPE_NONE )
+            break;
+
+        /* */
+        vlc_mutex_lock( &p_sys->lock_media );
+        for( i = 0; i < p_sys->i_media; i++ )
+        {
+            if( p_sys->media[i]->id == cmd.i_media_id )
+                break;
+        }
+        if( i >= p_sys->i_media )
+            goto next;
+        p_media = p_sys->media[i];
+
+        switch( cmd.i_type )
+        {
+        case RTSP_CMD_TYPE_PLAY:
+            vod_MediaControl( p_vod, p_media, cmd.psz_session,
+                              VOD_MEDIA_PLAY, cmd.psz_arg );
+            break;
+        case RTSP_CMD_TYPE_PAUSE:
+            vod_MediaControl( p_vod, p_media, cmd.psz_session,
+                              VOD_MEDIA_PAUSE );
+            break;
+
+        case RTSP_CMD_TYPE_STOP:
+            vod_MediaControl( p_vod, p_media, cmd.psz_session, VOD_MEDIA_STOP );
+            break;
+
+        case RTSP_CMD_TYPE_SEEK:
+            vod_MediaControl( p_vod, p_media, cmd.psz_session,
+                              VOD_MEDIA_SEEK, cmd.f_arg );
+            break;
+
+        case RTSP_CMD_TYPE_REWIND:
+            vod_MediaControl( p_vod, p_media, cmd.psz_session,
+                              VOD_MEDIA_REWIND, cmd.f_arg );
+            break;
+
+        case RTSP_CMD_TYPE_FORWARD:
+            vod_MediaControl( p_vod, p_media, cmd.psz_session,
+                              VOD_MEDIA_FORWARD, cmd.f_arg );
+            break;
+
+        default:
+            break;
+        }
+
+    next:
+        vlc_mutex_unlock( &p_sys->lock_media );
+        if( cmd.psz_session )
+            free( cmd.psz_session );
+        if( cmd.psz_arg )
+            free( cmd.psz_arg );
+    }
 }
 
 /****************************************************************************
@@ -550,27 +859,29 @@ static void MediaDelES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt)
 static rtsp_client_t *RtspClientNew( vod_media_t *p_media, char *psz_session )
 {
     rtsp_client_t *p_rtsp = malloc( sizeof(rtsp_client_t) );
+
+    if( !p_rtsp ) return NULL;
     memset( p_rtsp, 0, sizeof(rtsp_client_t) );
     p_rtsp->es = 0;
 
     p_rtsp->psz_session = psz_session;
     TAB_APPEND( p_media->i_rtsp, p_media->rtsp, p_rtsp );
 
-    msg_Dbg( p_media->p_vod, "new session: %s", psz_session );
+    p_media->p_vod->p_sys->i_connections++;
+    msg_Dbg( p_media->p_vod, "new session: %s, connections: %d",
+             psz_session, p_media->p_vod->p_sys->i_throttle_users );
 
     return p_rtsp;
 }
 
-static rtsp_client_t *RtspClientGet( vod_media_t *p_media, char *psz_session )
+static rtsp_client_t *RtspClientGet( vod_media_t *p_media, const char *psz_session )
 {
     int i;
 
     for( i = 0; psz_session && i < p_media->i_rtsp; i++ )
     {
         if( !strcmp( p_media->rtsp[i]->psz_session, psz_session ) )
-        {
             return p_media->rtsp[i];
-        }
     }
 
     return NULL;
@@ -578,7 +889,9 @@ static rtsp_client_t *RtspClientGet( vod_media_t *p_media, char *psz_session )
 
 static void RtspClientDel( vod_media_t *p_media, rtsp_client_t *p_rtsp )
 {
-    msg_Dbg( p_media->p_vod, "closing session: %s", p_rtsp->psz_session );
+    p_media->p_vod->p_sys->i_connections--;
+    msg_Dbg( p_media->p_vod, "closing session: %s, connections: %d",
+             p_rtsp->psz_session, p_media->p_vod->p_sys->i_throttle_users );
 
     while( p_rtsp->i_es-- )
     {
@@ -595,66 +908,235 @@ static void RtspClientDel( vod_media_t *p_media, rtsp_client_t *p_rtsp )
 }
 
 static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
-                         httpd_message_t *answer, httpd_message_t *query )
+                         httpd_message_t *answer, const httpd_message_t *query )
 {
     vod_media_t *p_media = (vod_media_t*)p_args;
     vod_t *p_vod = p_media->p_vod;
-    char *psz_destination = p_media->psz_destination;
-    char *psz_session = NULL;
+    const char *psz_transport = NULL;
+    const char *psz_playnow = NULL; /* support option: x-playNow */
+    const char *psz_session = NULL;
+    const char *psz_cseq = NULL;
     rtsp_client_t *p_rtsp;
+    int i_port = 0;
+    int i_cseq = 0;
 
     if( answer == NULL || query == NULL ) return VLC_SUCCESS;
 
-    fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type );
+    msg_Dbg( p_vod, "RtspCallback query: type=%d", query->i_type );
 
     answer->i_proto   = HTTPD_PROTO_RTSP;
     answer->i_version = query->i_version;
     answer->i_type    = HTTPD_MSG_ANSWER;
+    answer->i_body    = 0;
+    answer->p_body    = NULL;
 
     switch( query->i_type )
     {
-        case HTTPD_MSG_DESCRIBE:
+        case HTTPD_MSG_SETUP:
         {
-            char *psz_sdp =
-                SDPGenerate( p_media, psz_destination ?
-                             psz_destination : "0.0.0.0" );
+            psz_playnow = httpd_MsgGet( query, "x-playNow" );
+            psz_transport = httpd_MsgGet( query, "Transport" );
+            if( psz_transport == NULL )
+            {
+                answer->i_status = 400;
+                break;
+            }
+            msg_Dbg( p_vod, "HTTPD_MSG_SETUP: transport=%s", psz_transport );
 
-            answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
-            httpd_MsgAdd( answer, "Content-type",  "%s", "application/sdp" );
+            if( strstr( psz_transport, "unicast" ) &&
+                strstr( psz_transport, "client_port=" ) )
+            {
+                rtsp_client_t *p_rtsp = NULL;
+                char ip[NI_MAXNUMERICHOST];
+                i_port = atoi( strstr( psz_transport, "client_port=" ) +
+                                strlen("client_port=") );
 
-            answer->p_body = psz_sdp;
-            answer->i_body = strlen( psz_sdp );
-            break;
+                if( strstr( psz_transport, "MP2T/H2221/UDP" ) ||
+                    strstr( psz_transport, "RAW/RAW/UDP" ) )
+                {
+                    if( p_media->psz_mux ) free( p_media->psz_mux );
+                    p_media->psz_mux = NULL;
+                    p_media->psz_mux = strdup( p_vod->p_sys->psz_raw_mux );
+                    p_media->b_raw = VLC_TRUE;
+                }
+
+                if( httpd_ClientIP( cl, ip ) == NULL )
+                {
+                    answer->i_status = 500;
+                    answer->i_body = 0;
+                    answer->p_body = NULL;
+                    break;
+                }
+
+                msg_Dbg( p_vod, "HTTPD_MSG_SETUP: unicast ip=%s port=%d",
+                         ip, i_port );
+
+                psz_session = httpd_MsgGet( query, "Session" );
+                if( !psz_session || !*psz_session )
+                {
+                    char *psz_new;
+                    if( ( p_vod->p_sys->i_throttle_users > 0 ) &&
+                        ( p_vod->p_sys->i_connections >= p_vod->p_sys->i_throttle_users ) )
+                    {
+                        answer->i_status = 503;
+                        answer->i_body = 0;
+                        answer->p_body = NULL;
+                        break;
+                    }
+                    if( asprintf( &psz_new, "%d", rand() ) < 0 )
+                        return VLC_ENOMEM;
+                    psz_session = psz_new;
+
+                    p_rtsp = RtspClientNew( p_media, psz_new );
+                    if( !p_rtsp )
+                    {
+                        answer->i_status = 454;
+                        answer->i_body = 0;
+                        answer->p_body = NULL;
+                        break;
+                    }
+                }
+                else
+                {
+                    p_rtsp = RtspClientGet( p_media, psz_session );
+                    if( !p_rtsp )
+                    {
+                        answer->i_status = 454;
+                        answer->i_body = 0;
+                        answer->p_body = NULL;
+                        break;
+                    }
+                }
+
+                answer->i_status = 200;
+                answer->i_body = 0;
+                answer->p_body = NULL;
+
+                if( p_media->b_raw )
+                {
+                    if( strstr( psz_transport, "MP2T/H2221/UDP" ) )
+                    {
+                        httpd_MsgAdd( answer, "Transport",
+                                      "MP2T/H2221/UDP;client_port=%d-%d",
+                                      i_port, i_port + 1 );
+                    }
+                    else if( strstr( psz_transport, "RAW/RAW/UDP" ) )
+                    {
+                        httpd_MsgAdd( answer, "Transport",
+                                      "RAW/RAW/UDP;client_port=%d-%d",
+                                      i_port, i_port + 1 );
+                    }
+                }
+                else
+                    httpd_MsgAdd( answer, "Transport",
+                                  "RTP/AVP/UDP;client_port=%d-%d",
+                                  i_port, i_port + 1 );
+            }
+            else /* TODO  strstr( psz_transport, "interleaved" ) ) */
+            {
+                answer->i_status = 461;
+                answer->i_body = 0;
+                answer->p_body = NULL;
+            }
+
+            /* Intentional fall-through on x-playNow option in RTSP request */
+            if( !psz_playnow )
+                break;
         }
 
         case HTTPD_MSG_PLAY:
         {
-            char *psz_output, *ip;
+            char *psz_output, ip[NI_MAXNUMERICHOST];
             int i, i_port_audio = 0, i_port_video = 0;
 
             /* for now only multicast so easy */
-            answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
-            answer->i_body = 0;
-            answer->p_body = NULL;
+            if( !psz_playnow )
+            {
+                answer->i_status = 200;
+                answer->i_body = 0;
+                answer->p_body = NULL;
+            }
 
-            psz_session = httpd_MsgGet( query, "Session" );
+            if( !psz_session )
+                psz_session = httpd_MsgGet( query, "Session" );
             msg_Dbg( p_vod, "HTTPD_MSG_PLAY for session: %s", psz_session );
 
             p_rtsp = RtspClientGet( p_media, psz_session );
-            if( !p_rtsp ) break;
+            if( !p_rtsp )
+            {
+                answer->i_status = 500;
+                answer->i_body = 0;
+                answer->p_body = NULL;
+                break;
+            }
+
+            if( p_rtsp->b_playing )
+            {
+                const char *psz_position = httpd_MsgGet( query, "Range" );
+                const char *psz_scale = httpd_MsgGet( query, "Scale" );
+                if( psz_position )
+                    psz_position = strstr( psz_position, "npt=" );
+                if( psz_position && !psz_scale )
+                {
+                    double f_pos;
+                    char *end;
+
+                    msg_Dbg( p_vod, "seeking request: %s", psz_position );
+                    psz_position += 4;
+                    /* FIXME: npt= is not necessarily formatted as a float */
+                    f_pos = us_strtod( psz_position, &end );
+                    if( end > psz_position )
+                    {
+                        f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
+                        CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
+                                     psz_session, f_pos, NULL );
+                    }
+                    break;
+                }
+                if( psz_scale )
+                {
+                    double f_scale = 0.0;
+                    char *end;
+
+                    f_scale = us_strtod( psz_scale, &end );
+                    if( end > psz_scale )
+                    {
+                        f_scale = (f_scale * 30.0);
+                        if( psz_scale[0] == '-' ) /* rewind */
+                        {
+                            msg_Dbg( p_vod, "rewind request: %s", psz_scale );
+                            CommandPush( p_vod, RTSP_CMD_TYPE_REWIND, p_media,
+                                         psz_session, f_scale, NULL );
+                        }
+                        else if(psz_scale[0] != '1' ) /* fast-forward */
+                        {
+                            msg_Dbg( p_vod, "fastforward request: %s",
+                                     psz_scale );
+                            CommandPush( p_vod, RTSP_CMD_TYPE_FORWARD, p_media,
+                                         psz_session, f_scale, NULL );
+                        }
+
+                        if( p_rtsp->b_paused == VLC_TRUE )
+                        {
+                            p_rtsp->b_paused = VLC_FALSE;
+                            CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media,
+                                         psz_session, 0, NULL );
+                        }
+                    }
+                    break;
+                }
+            }
 
             if( p_rtsp->b_playing && p_rtsp->b_paused )
             {
-                vod_MediaControl( p_vod, p_media, psz_session,
-                                  VOD_MEDIA_PAUSE );
+                CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media,
+                             psz_session, 0, NULL );
                 p_rtsp->b_paused = VLC_FALSE;
                 break;
             }
             else if( p_rtsp->b_playing ) break;
 
-            if( !(ip = httpd_ClientIP( cl )) ) break;
+            if( httpd_ClientIP( cl, ip ) == NULL ) break;
 
             p_rtsp->b_playing = VLC_TRUE;
 
@@ -669,19 +1151,55 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
 
             if( p_media->psz_mux )
             {
-                asprintf( &psz_output, "rtp{dst=%s,port=%i,mux=%s}",
-                          ip, i_port_video, p_media->psz_mux );
+                if( p_media->b_raw )
+                {
+                    if( asprintf( &psz_output,
+                              "std{access=udp,dst=%s:%i,mux=%s}",
+                              ip, i_port, p_media->psz_mux ) < 0 )
+                        return VLC_ENOMEM;
+                }
+                else
+                {
+                    if( asprintf( &psz_output,
+                              "rtp{dst=%s,port=%i,mux=%s}",
+                              ip, i_port_video, p_media->psz_mux ) < 0 )
+                        return VLC_ENOMEM;
+                }
             }
             else
             {
-                asprintf( &psz_output, "rtp{dst=%s,port-video=%i,"
-                          "port-audio=%i}", ip, i_port_video, i_port_audio );
+                if( asprintf( &psz_output,
+                              "rtp{dst=%s,port-video=%i,port-audio=%i}",
+                              ip, i_port_video, i_port_audio ) < 0 )
+                    return VLC_ENOMEM;
             }
 
-            vod_MediaControl( p_vod, p_media, psz_session, VOD_MEDIA_PLAY,
-                              psz_output );
+            CommandPush( p_vod, RTSP_CMD_TYPE_PLAY, p_media, psz_session,
+                         0, psz_output );
             free( psz_output );
-            free( ip );
+            break;
+        }
+
+        case HTTPD_MSG_DESCRIBE:
+        {
+            char *psz_sdp =
+                SDPGenerate( p_media, cl );
+
+            if( psz_sdp != NULL )
+            {
+                answer->i_status = 200;
+                httpd_MsgAdd( answer, "Content-type",  "%s",
+                              "application/sdp" );
+
+                answer->p_body = (uint8_t *)psz_sdp;
+                answer->i_body = strlen( psz_sdp );
+            }
+            else
+            {
+                answer->i_status = 500;
+                answer->p_body = NULL;
+                answer->i_body = 0;
+            }
             break;
         }
 
@@ -692,11 +1210,11 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             p_rtsp = RtspClientGet( p_media, psz_session );
             if( !p_rtsp ) break;
 
-            vod_MediaControl( p_vod, p_media, psz_session, VOD_MEDIA_PAUSE );
+            CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session,
+                         0, NULL );
             p_rtsp->b_paused = VLC_TRUE;
 
             answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
             answer->i_body = 0;
             answer->p_body = NULL;
             break;
@@ -704,7 +1222,6 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
         case HTTPD_MSG_TEARDOWN:
             /* for now only multicast so easy again */
             answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
             answer->i_body = 0;
             answer->p_body = NULL;
 
@@ -714,167 +1231,173 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             p_rtsp = RtspClientGet( p_media, psz_session );
             if( !p_rtsp ) break;
 
-            vod_MediaControl( p_vod, p_media, psz_session, VOD_MEDIA_STOP );
+            CommandPush( p_vod, RTSP_CMD_TYPE_STOP, p_media, psz_session,
+                         0, NULL );
             RtspClientDel( p_media, p_rtsp );
             break;
 
+        case HTTPD_MSG_GETPARAMETER:
+            answer->i_status = 200;
+            answer->i_body = 0;
+            answer->p_body = NULL;
+            break;
+
         default:
             return VLC_EGENERIC;
     }
 
     httpd_MsgAdd( answer, "Server", "VLC Server" );
     httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
-    httpd_MsgAdd( answer, "Cseq", "%d",
-                  atoi( httpd_MsgGet( query, "Cseq" ) ) );
+    psz_cseq = httpd_MsgGet( query, "Cseq" );
+    psz_cseq ? i_cseq = atoi( psz_cseq ) : 0;
+    httpd_MsgAdd( answer, "CSeq", "%d", i_cseq );
     httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" );
 
     if( psz_session )
     {
-        httpd_MsgAdd( answer, "Session", "%s;timeout=5", psz_session );
+         if( p_media->p_vod->p_sys->i_session_timeout >= 0 )
+             httpd_MsgAdd( answer, "Session", "%s;timeout=%i", psz_session,
+               p_media->p_vod->p_sys->i_session_timeout );
+         else
+              httpd_MsgAdd( answer, "Session", "%s", psz_session );
     }
 
     return VLC_SUCCESS;
 }
 
 static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
-                           httpd_message_t *answer, httpd_message_t *query )
+                           httpd_message_t *answer,
+                           const httpd_message_t *query )
 {
     media_es_t *p_es = (media_es_t*)p_args;
     vod_media_t *p_media = p_es->p_media;
     vod_t *p_vod = p_media->p_vod;
     rtsp_client_t *p_rtsp = NULL;
-    char *psz_session = NULL;
-    char *psz_transport = NULL;
-    char *psz_position = NULL;
+    const char *psz_transport = NULL;
+    const char *psz_playnow = NULL; /* support option: x-playNow */
+    const char *psz_session = NULL;
+    const char *psz_position = NULL;
+    const char *psz_cseq = NULL;
+    int i_cseq = 0;
     int i;
 
     if( answer == NULL || query == NULL ) return VLC_SUCCESS;
 
-    fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type );
+    msg_Dbg( p_vod, "RtspCallback query: type=%d", query->i_type );
 
     answer->i_proto   = HTTPD_PROTO_RTSP;
     answer->i_version = query->i_version;
     answer->i_type    = HTTPD_MSG_ANSWER;
+    answer->i_body    = 0;
+    answer->p_body      = NULL;
 
     switch( query->i_type )
     {
-    case HTTPD_MSG_SETUP:
-        psz_transport = httpd_MsgGet( query, "Transport" );
-        fprintf( stderr, "HTTPD_MSG_SETUP: transport=%s\n", psz_transport );
+        case HTTPD_MSG_SETUP:
+            psz_playnow = httpd_MsgGet( query, "x-playNow" );
+            psz_transport = httpd_MsgGet( query, "Transport" );
 
-        if( strstr( psz_transport, "multicast" ) && p_media->psz_destination )
-        {
-            fprintf( stderr, "HTTPD_MSG_SETUP: multicast\n" );
-            answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
-            answer->i_body = 0;
-            answer->p_body = NULL;
+            msg_Dbg( p_vod, "HTTPD_MSG_SETUP: transport=%s", psz_transport );
 
-            psz_session = httpd_MsgGet( query, "Session" );
-            if( !psz_session || !*psz_session )
-            {
-                asprintf( &psz_session, "%d", rand() );
-            }
-
-            httpd_MsgAdd( answer, "Transport",
-                          "RTP/AVP/UDP;destination=%s;port=%d-%d;ttl=%d",
-                          p_media->psz_destination, p_media->i_port,
-                          p_media->i_port+1, p_media->i_ttl );
-        }
-        else if( strstr( psz_transport, "unicast" ) &&
-                 strstr( psz_transport, "client_port=" ) )
-        {
-            rtsp_client_t *p_rtsp;
-            rtsp_client_es_t *p_rtsp_es;
-            char *ip = httpd_ClientIP( cl );
-            int i_port = atoi( strstr( psz_transport, "client_port=" ) +
-                               strlen("client_port=") );
-
-            if( !ip )
+            if( strstr( psz_transport, "unicast" ) &&
+                strstr( psz_transport, "client_port=" ) )
             {
-                answer->i_status = 400;
-                answer->psz_status = strdup( "Internal server error" );
-                answer->i_body = 0;
-                answer->p_body = NULL;
-                break;
-            }
-
-            fprintf( stderr, "HTTPD_MSG_SETUP: unicast ip=%s port=%d\n",
-                     ip, i_port );
+                rtsp_client_t *p_rtsp = NULL;
+                rtsp_client_es_t *p_rtsp_es = NULL;
+                char ip[NI_MAXNUMERICHOST];
+                int i_port = atoi( strstr( psz_transport, "client_port=" ) +
+                                   strlen("client_port=") );
 
-            psz_session = httpd_MsgGet( query, "Session" );
-            if( !psz_session || !*psz_session )
-            {
-                asprintf( &psz_session, "%d", rand() );
-                p_rtsp = RtspClientNew( p_media, psz_session );
-            }
-            else
-            {
-                p_rtsp = RtspClientGet( p_media, psz_session );
-                if( !p_rtsp )
+                if( httpd_ClientIP( cl, ip ) == NULL )
                 {
-                    /* FIXME right error code */
-                    answer->i_status = 400;
-                    answer->psz_status = strdup( "Unknown session id" );
+                    answer->i_status = 500;
                     answer->i_body = 0;
                     answer->p_body = NULL;
-                    free( ip );
                     break;
                 }
-            }
 
-            p_rtsp_es = malloc( sizeof(rtsp_client_es_t) );
-            p_rtsp_es->i_port = i_port;
-            p_rtsp_es->psz_ip = strdup( ip );
-            p_rtsp_es->p_media_es = p_es;
-            TAB_APPEND( p_rtsp->i_es, p_rtsp->es, p_rtsp_es );
+                msg_Dbg( p_vod, "HTTPD_MSG_SETUP: unicast ip=%s port=%d",
+                        ip, i_port );
 
-            answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
-            answer->i_body = 0;
-            answer->p_body = NULL;
-
-            httpd_MsgAdd( answer, "Transport", "RTP/AVP/UDP;client_port=%d-%d",
-                          i_port, i_port + 1 );
-        }
-        else /* TODO  strstr( psz_transport, "interleaved" ) ) */
-        {
-            answer->i_status = 400;
-            answer->psz_status = strdup( "Bad Request" );
-            answer->i_body = 0;
-            answer->p_body = NULL;
-        }
-        break;
-
-        case HTTPD_MSG_TEARDOWN:
-            answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
-            answer->i_body = 0;
-            answer->p_body = NULL;
+                psz_session = httpd_MsgGet( query, "Session" );
+                if( !psz_session || !*psz_session )
+                {
+                    char *psz_new;
+                    if( ( p_vod->p_sys->i_throttle_users > 0 ) &&
+                        ( p_vod->p_sys->i_connections >= p_vod->p_sys->i_throttle_users ) )
+                    {
+                        answer->i_status = 503;
+                        answer->i_body = 0;
+                        answer->p_body = NULL;
+                        break;
+                    }
+                    if( asprintf( &psz_new, "%d", rand() ) < 0 )
+                        return VLC_ENOMEM;
+                    psz_session = psz_new;
+
+                    p_rtsp = RtspClientNew( p_media, psz_new );
+                }
+                else
+                {
+                    p_rtsp = RtspClientGet( p_media, psz_session );
+                    if( !p_rtsp )
+                    {
+                        answer->i_status = 454;
+                        answer->i_body = 0;
+                        answer->p_body = NULL;
+                        break;
+                    }
+                }
 
-            psz_session = httpd_MsgGet( query, "Session" );
-            msg_Dbg( p_vod, "HTTPD_MSG_TEARDOWN for session: %s", psz_session);
+                p_rtsp_es = malloc( sizeof(rtsp_client_es_t) );
+                if( !p_rtsp_es )
+                {
+                    answer->i_status = 500;
+                    answer->i_body = 0;
+                    answer->p_body = NULL;
+                    break;
+                }
+                p_rtsp_es->i_port = i_port;
+                p_rtsp_es->psz_ip = strdup( ip );
+                p_rtsp_es->p_media_es = p_es;
+                TAB_APPEND( p_rtsp->i_es, p_rtsp->es, p_rtsp_es );
 
-            p_rtsp = RtspClientGet( p_media, psz_session );
-            if( !p_rtsp ) break;
+                answer->i_status = 200;
+                answer->i_body = 0;
+                answer->p_body = NULL;
 
-            for( i = 0; i < p_rtsp->i_es; i++ )
-            {
-                if( p_rtsp->es[i]->p_media_es == p_es )
+                if( p_media->b_raw )
                 {
-                    if( p_rtsp->es[i]->psz_ip ) free( p_rtsp->es[i]->psz_ip );
-                    TAB_REMOVE( p_rtsp->i_es, p_rtsp->es, p_rtsp->es[i] );
-                    break;
+                    if( strstr( psz_transport, "MP2T/H2221/UDP" ) )
+                    {
+                        httpd_MsgAdd( answer, "Transport",
+                                     "MP2T/H2221/UDP;client_port=%d-%d",
+                                     p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
+                    }
+                    else if( strstr( psz_transport, "RAW/RAW/UDP" ) )
+                    {
+                        httpd_MsgAdd( answer, "Transport",
+                                     "RAW/RAW/UDP;client_port=%d-%d",
+                                     p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
+                    }
+                }
+                else
+                {
+                    httpd_MsgAdd( answer, "Transport",
+                                  "RTP/AVP/UDP;client_port=%d-%d",
+                                  p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
                 }
             }
-
-            if( !p_rtsp->i_es )
+            else /* TODO  strstr( psz_transport, "interleaved" ) ) */
             {
-                vod_MediaControl( p_vod, p_media, psz_session,
-                                  VOD_MEDIA_STOP );
-                RtspClientDel( p_media, p_rtsp );
+                answer->i_status = 461;
+                answer->i_body = 0;
+                answer->p_body = NULL;
             }
-            break;
+
+            /* Intentional fall-through on x-playNow option in RTSP request */
+            if( !psz_playnow )
+                break;
 
         case HTTPD_MSG_PLAY:
             /* This is kind of a kludge. Should we only support Aggregate
@@ -888,23 +1411,57 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             if( psz_position ) psz_position = strstr( psz_position, "npt=" );
             if( psz_position )
             {
-                float f_pos;
+                double f_pos;
+                char *end;
 
                 msg_Dbg( p_vod, "seeking request: %s", psz_position );
 
                 psz_position += 4;
-                if( sscanf( psz_position, "%f", &f_pos ) == 1 )
+                /* FIXME: npt= is not necessarily formatted as a float */
+                f_pos = us_strtod( psz_position, &end );
+                if( end > psz_position )
                 {
-                    f_pos /= ((float)(p_media->i_length/1000))/1000 / 100;
-                    vod_MediaControl( p_vod, p_media, psz_session,
-                                      VOD_MEDIA_SEEK, (double)f_pos );
+                    f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
+                    CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
+                                 psz_session, f_pos, NULL );
                 }
             }
 
+            if( !psz_playnow )
+            {
+                answer->i_status = 200;
+                answer->i_body = 0;
+                answer->p_body = NULL;
+            }
+            break;
+
+        case HTTPD_MSG_TEARDOWN:
             answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
             answer->i_body = 0;
             answer->p_body = NULL;
+
+            psz_session = httpd_MsgGet( query, "Session" );
+            msg_Dbg( p_vod, "HTTPD_MSG_TEARDOWN for session: %s", psz_session);
+
+            p_rtsp = RtspClientGet( p_media, psz_session );
+            if( !p_rtsp ) break;
+
+            for( i = 0; i < p_rtsp->i_es; i++ )
+            {
+                if( p_rtsp->es[i]->p_media_es == p_es )
+                {
+                    if( p_rtsp->es[i]->psz_ip ) free( p_rtsp->es[i]->psz_ip );
+                    TAB_REMOVE( p_rtsp->i_es, p_rtsp->es, p_rtsp->es[i] );
+                    break;
+                }
+            }
+
+            if( !p_rtsp->i_es )
+            {
+                CommandPush( p_vod, RTSP_CMD_TYPE_STOP, p_media, psz_session,
+                             0, NULL );
+                RtspClientDel( p_media, p_rtsp );
+            }
             break;
 
         case HTTPD_MSG_PAUSE:
@@ -916,11 +1473,11 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             p_rtsp = RtspClientGet( p_media, psz_session );
             if( !p_rtsp ) break;
 
-            vod_MediaControl( p_vod, p_media, psz_session, VOD_MEDIA_PAUSE );
+            CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session,
+                         0, NULL );
             p_rtsp->b_paused = VLC_TRUE;
 
             answer->i_status = 200;
-            answer->psz_status = strdup( "OK" );
             answer->i_body = 0;
             answer->p_body = NULL;
             break;
@@ -932,14 +1489,16 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
 
     httpd_MsgAdd( answer, "Server", "VLC Server" );
     httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
-    httpd_MsgAdd( answer, "Cseq", "%d",
-                  atoi( httpd_MsgGet( query, "Cseq" ) ) );
+    psz_cseq = httpd_MsgGet( query, "Cseq" );
+    if (psz_cseq)
+        i_cseq = atoi( psz_cseq );
+    else
+        i_cseq = 0;
+    httpd_MsgAdd( answer, "Cseq", "%d", i_cseq );
     httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" );
 
     if( psz_session )
-    {
         httpd_MsgAdd( answer, "Session", "%s"/*;timeout=5*/, psz_session );
-    }
 
     return VLC_SUCCESS;
 }
@@ -948,48 +1507,57 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
  * SDPGenerate: TODO
  * FIXME: need to be moved to a common place ?
  *****************************************************************************/
-static char *SDPGenerate( vod_media_t *p_media, char *psz_destination )
+static char *SDPGenerate( const vod_media_t *p_media, httpd_client_t *cl )
 {
     int i, i_size;
-    char *p, *psz_sdp;
+    char *p, *psz_sdp, ip[NI_MAXNUMERICHOST], ipv;
+    const char *psz_control;
 
-    /* Calculate size */
-    i_size = strlen( "v=0\r\n" ) +
-        strlen( "o=- * * IN IP4 127.0.0.1\r\n" ) + 10 + 10 +
-        strlen( "s=*\r\n" ) + strlen( p_media->psz_session_name ) +
-        strlen( "i=*\r\n" ) + strlen( p_media->psz_session_description ) +
-        strlen( "u=*\r\n" ) + strlen( p_media->psz_session_url ) +
-        strlen( "e=*\r\n" ) + strlen( p_media->psz_session_email ) +
-        strlen( "t=0 0\r\n" ) + /* FIXME */
-        strlen( "a=tool:"PACKAGE_STRING"\r\n" ) +
-        strlen( "c=IN IP4 */*\r\n" ) + 20 + 10 +
-        strlen( psz_destination ? psz_destination : "0.0.0.0" ) +
-        strlen( "a=range:npt=0-1000000000.000\r\n" );
+    if( httpd_ServerIP( cl, ip ) == NULL )
+        return NULL;
+
+    p = strchr( ip, '%' );
+    if( p != NULL )
+        *p = '\0'; /* remove scope if present */
+
+    ipv = ( strchr( ip, ':' ) != NULL ) ? '6' : '4';
 
+    /* Calculate size */
+    i_size = sizeof( "v=0\r\n" ) +
+        sizeof( "o=- * * IN IP4 \r\n" ) + 10 + NI_MAXNUMERICHOST +
+        sizeof( "s=*\r\n" ) + strlen( p_media->psz_session_name ) +
+        sizeof( "i=*\r\n" ) + strlen( p_media->psz_session_description ) +
+        sizeof( "u=*\r\n" ) + strlen( p_media->psz_session_url ) +
+        sizeof( "e=*\r\n" ) + strlen( p_media->psz_session_email ) +
+        sizeof( "c=IN IP4 0.0.0.0\r\n" ) + 20 + 10 +
+        sizeof( "t=0 0\r\n" ) + /* FIXME */
+        sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) +
+        sizeof( "a=range:npt=0-1000000000.000\r\n" );
+
+    psz_control = (ipv == '6') ? p_media->psz_rtsp_control_v6
+                               : p_media->psz_rtsp_control_v4;
     for( i = 0; i < p_media->i_es; i++ )
     {
         media_es_t *p_es = p_media->es[i];
 
-        i_size += strlen( "m=**d*o * RTP/AVP *\r\n" ) + 10 + 10;
+        i_size += sizeof( "m=**d*o * RTP/AVP *\r\n" ) + 19;
         if( p_es->psz_rtpmap )
         {
-            i_size += strlen( "a=rtpmap:* *\r\n" ) +
-                strlen( p_es->psz_rtpmap ) + 10;
+            i_size += sizeof( "a=rtpmap:* *\r\n" ) +
+                strlen( p_es->psz_rtpmap ) + 9;
         }
         if( p_es->psz_fmtp )
         {
-            i_size += strlen( "a=fmtp:* *\r\n" ) +
-                strlen( p_es->psz_fmtp ) + 10;
+            i_size += sizeof( "a=fmtp:* *\r\n" ) +
+                strlen( p_es->psz_fmtp ) + 9;
         }
-
-        i_size += strlen( "a=control:*/trackid=*\r\n" ) +
-            strlen( p_media->psz_rtsp_control ) + 10;
     }
+    i_size += (strlen( psz_control ) + strlen( ip ) + 9) * p_media->i_es;
 
     p = psz_sdp = malloc( i_size );
     p += sprintf( p, "v=0\r\n" );
-    p += sprintf( p, "o=- "I64Fd" %d IN IP4 127.0.0.1\r\n",
-                  p_media->i_sdp_id, p_media->i_sdp_version );
+    p += sprintf( p, "o=- "I64Fd" %d IN IP%c %s\r\n",
+                  p_media->i_sdp_id, p_media->i_sdp_version, ipv, ip );
     if( *p_media->psz_session_name )
         p += sprintf( p, "s=%s\r\n", p_media->psz_session_name );
     if( *p_media->psz_session_description )
@@ -999,15 +1567,16 @@ static char *SDPGenerate( vod_media_t *p_media, char *psz_destination )
     if( *p_media->psz_session_email )
         p += sprintf( p, "e=%s\r\n", p_media->psz_session_email );
 
+    p += sprintf( p, "c=IN IP%c %s\r\n", ipv, ipv == '6' ? "::" : "0.0.0.0" );
     p += sprintf( p, "t=0 0\r\n" ); /* FIXME */
     p += sprintf( p, "a=tool:"PACKAGE_STRING"\r\n" );
 
-    p += sprintf( p, "c=IN IP4 %s/%d\r\n", psz_destination ?
-                  psz_destination : "0.0.0.0", p_media->i_ttl );
-
     if( p_media->i_length > 0 )
-    p += sprintf( p, "a=range:npt=0-%.3f\r\n",
-                  ((float)(p_media->i_length/1000))/1000 );
+    {
+        lldiv_t d = lldiv( p_media->i_length / 1000, 1000 );
+        p += sprintf( p, "a=range:npt=0-%lld.%03u\r\n", d.quot,
+                      (unsigned)d.rem );
+    }
 
     for( i = 0; i < p_media->i_es; i++ )
     {
@@ -1039,10 +1608,8 @@ static char *SDPGenerate( vod_media_t *p_media, char *psz_destination )
                           p_es->psz_fmtp );
         }
 
-        p += sprintf( p, "a=control:%s/trackid=%d\r\n",
-                      p_media->psz_rtsp_control, i );
+        p += sprintf( p, psz_control, ip, i );
     }
 
-    fprintf( stderr, psz_sdp );
     return psz_sdp;
 }